Merge branch 'master' into feature/forbedring_workflows

# Conflicts: # apps/budpro-service/build.gradle
navikt · Jan 29, 2024 · a1a4f07 · a1a4f07
2 parents bf24407 + 4d62b12
commit a1a4f07
Show file tree

Hide file tree

Showing 117 changed files with 1,375 additions and 2,067 deletions.
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -11,15 +11,8 @@ test {
     jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -10,15 +10,8 @@ test {
     useJUnitPlatform()
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -10,15 +10,8 @@ test {
     useJUnitPlatform()
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -10,15 +10,8 @@ test {
     useJUnitPlatform()
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -10,15 +10,8 @@ test {
     useJUnitPlatform()
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -12,15 +12,8 @@ test {
     useJUnitPlatform()
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -19,15 +19,8 @@ def iTest = tasks.register("iTest", Test) {
     shouldRunAfter test
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
@@ -90,16 +90,8 @@ test {
     jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
 }
 
-//jacocoTestReport {
-//    reports {
-//        xml.required = true
-//    }
-//}
-
 sonarqube {
     properties {
-        //property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
-        //property "sonar.groovy.jacoco.reportPath", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -11,15 +11,8 @@ test {
     jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -4,10 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 
-@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class})
+@SpringBootApplication(exclude = { ElasticsearchDataAutoConfiguration.class })
 public class DollyBackendApplicationStarter {
     public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}
diff --git a/...d/src/main/java/no/nav/dolly/bestilling/krrstub/mapper/DigitalKontaktMappingStrategy.java b/...d/src/main/java/no/nav/dolly/bestilling/krrstub/mapper/DigitalKontaktMappingStrategy.java
@@ -34,6 +34,7 @@ public void mapAtoB(RsDigitalKontaktdata digitalKontaktdata, DigitalKontaktdata
                         if (isNotBlank(digitalKontaktdata.getMobil())) {
                             kontaktdataRequest.setMobilOppdatert(getDato(digitalKontaktdata));
                             kontaktdataRequest.setMobilVerifisert(getDato(digitalKontaktdata));
+                            kontaktdataRequest.setMobil(digdirFormatertTlfNummer(digitalKontaktdata.getMobil(), digitalKontaktdata.getLandkode()));
                         }
                         if (isNotBlank(digitalKontaktdata.getEpost())) {
                             kontaktdataRequest.setEpostOppdatert(getDato(digitalKontaktdata));
@@ -43,18 +44,23 @@ public void mapAtoB(RsDigitalKontaktdata digitalKontaktdata, DigitalKontaktdata
                             kontaktdataRequest.setSpraakOppdatert(getDato(digitalKontaktdata));
                         }
 
-                        kontaktdataRequest.setMobil(digdirFormatertTlfNummer(digitalKontaktdata.getMobil()));
                         kontaktdataRequest.setEpost(isBlank(digitalKontaktdata.getEpost()) ? null : digitalKontaktdata.getEpost());
                         kontaktdataRequest.setSpraak(isBlank(digitalKontaktdata.getSpraak()) ? null : digitalKontaktdata.getSpraak());
                         kobleMaalformTilSpraak((RsDollyUtvidetBestilling) context.getProperty("bestilling"), kontaktdataRequest);
                     }
 
-                    private String digdirFormatertTlfNummer(String mobil) {
+                    private String digdirFormatertTlfNummer(String mobil, String landkode) {
                         if (isBlank(mobil)) {
                             return null;
                         }
                         var nummerUtenSpace = mobil.replace(" ", "");
-                        return nummerUtenSpace.contains("+47") ? nummerUtenSpace : "+47%s".formatted(nummerUtenSpace);
+                        if (nummerUtenSpace.contains("+")) {
+                            return nummerUtenSpace;
+                        } else if (isBlank(landkode)) {
+                            return "+47%s".formatted(nummerUtenSpace);
+                        } else {
+                            return "%s%s".formatted(landkode, nummerUtenSpace);
+                        }
                     }
 
                     private ZonedDateTime getDato(RsDigitalKontaktdata digitalKontaktdata) {

diff --git a/...lly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java b/...lly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java
@@ -20,6 +20,8 @@ public class RsDigitalKontaktdata {
     private LocalDateTime gyldigFra;
     private boolean reservert;
     private String mobil;
+    private String landkode;
+    private String land;
     private String epost;
     private boolean registrert;
     private String sdpAdresse;

diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -10,15 +10,8 @@ test {
     useJUnitPlatform()
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/dolly-frontend/src/main/js/cypress.config.ts b/apps/dolly-frontend/src/main/js/cypress.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'cypress'
 export default defineConfig({
 	pageLoadTimeout: 120000,
 	defaultCommandTimeout: 25000,
+	numTestsKeptInMemory: 3,
 
 	env: {
 		'cypress-react-selector': {

diff --git a/apps/dolly-frontend/src/main/js/cypress/mocks/BasicMocks.tsx b/apps/dolly-frontend/src/main/js/cypress/mocks/BasicMocks.tsx
@@ -1290,6 +1290,7 @@ export const backendBestillingerMock = [
 		bestilling: {
 			krrstub: {
 				reservert: false,
+				landkode: '+47',
 				mobil: '12345678',
 				epost: '[email protected]',
 				registrert: true,