Merge branch 'refs/heads/master' into feature/ny-fullmakt-integrasjon

navikt · Sep 19, 2024 · 7257423 · 7257423
2 parents c6b0dce + 0eb062b
commit 7257423
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 25 deletions.
diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/aareg-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-aareg"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/aareg-synt-services-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-aareg-synt-services"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-arbeidsplassencv"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/arena-forvalteren-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-arena-forvalteren"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/batch-adeo-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-batch-adeo"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/brregstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-brregstub"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/ereg-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-ereg"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/histark-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-histark"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inntektstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-inntektstub"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inst-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-inst"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/kontoregister-person-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-kontoregister-person"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/krrstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-krrstub"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml
@@ -19,7 +19,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/medl-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-medl"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/norg2-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-norg2"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/pensjon-testdata-facade-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-pensjon"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/saf-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-saf"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/sigrunstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-sigrunstub"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml
@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/skjermingsregister-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-skjermingsregister"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml
@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/synthdata-meldekort-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-synthdata-meldekort"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/udistub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-udistub"
     permissions:
       contents: read
       id-token: write

diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json
diff --git a/apps/dolly-frontend/src/main/js/src/api/index.ts b/apps/dolly-frontend/src/main/js/src/api/index.ts
@@ -124,7 +124,8 @@ export const fetcher = (url, headers) =>
 			if (
 				(reason?.response?.status === 401 || reason?.response?.status === 403) &&
 				!url.includes('testnav-arbeidsplassencv') &&
-				!url.includes('infostripe')
+				!url.includes('infostripe') &&
+				!url.includes('norg2')
 			) {
 				console.error('Auth feilet, navigerer til login')
 				navigateToLogin()
@@ -158,7 +159,8 @@ const _fetch = (url: string, config: Config, body?: object): Promise<Response> =
 				if (
 					response?.status === 401 &&
 					!url.includes('testnav-arbeidsplassencv') &&
-					!url.includes('infostripe')
+					!url.includes('infostripe') &&
+					!url.includes('norg2')
 				) {
 					console.error('Auth feilet, navigerer til login')
 					navigateToLogin()
@@ -192,7 +194,8 @@ const _fetch = (url: string, config: Config, body?: object): Promise<Response> =
 			if (
 				response?.status === 401 &&
 				!url.includes('testnav-arbeidsplassencv') &&
-				!url.includes('infostripe')
+				!url.includes('infostripe') &&
+				!url.includes('norg2')
 			) {
 				console.error('Auth feilet, navigerer til login')
 				navigateToLogin()

diff --git a/...orvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java b/...orvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java
@@ -110,6 +110,7 @@ private FolkeregisterPersonstatusDTO handle(FolkeregisterPersonstatusDTO persons
             personstatus.setGyldigFraOgMed(person.getFalskIdentitet().stream()
                     .filter(FalskIdentitetDTO::isFalskIdentitet)
                     .map(FalskIdentitetDTO::getGyldigFraOgMed)
+                    .filter(Objects::nonNull)
                     .findFirst()
                     .orElse(LocalDateTime.now()));
 

diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yaml
@@ -9,11 +9,12 @@ spring:
       connection-timeout: 15000
       read-timeout: 30000
   datasource:
-    url: jdbc:postgresql://localhost:5432/postgres
+    url: jdbc:postgresql://localhost:5433/pdl-forvalter-test
     hikari:
       maximum-pool-size: 10
       minimum-idle: 1
     driver-class-name: org.postgresql.Driver
+    username: postgres
   jpa:
     properties:
       hibernate: