Merge branch 'master' into feature/pensjon-oppdaterte-endepunkter

navikt · Aug 28, 2024 · 0531110 · 0531110
2 parents da271a5 + e381a84
commit 0531110
Show file tree

Hide file tree

Showing 380 changed files with 21,965 additions and 15,800 deletions.
diff --git a/.github/workflows/app.levende-arbeidsforhold-ansettelse.yml b/.github/workflows/app.levende-arbeidsforhold-ansettelse.yml
@@ -0,0 +1,26 @@
+name: levende-arbeidsforhold-ansettelse
+
+on:
+  push:
+    paths:
+      - libs/commands/**
+      - libs/data-transfer-objects/**
+      - libs/security-core/**
+      - libs/servlet-core/**
+      - libs/servlet-security/**
+      - libs/servlet-insecure-security/**
+      - apps/levende-arbeidsforhold-ansettelse/**
+      - .github/workflows/app.levende-arbeidsforhold-ansettelse.yml
+
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/levende-arbeidsforhold-ansettelse"
+      deploy-tag: "#deploy-levende-arbeidsforhold-ansettelse"
+      sonar-enabled: false
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
diff --git a/.github/workflows/app.levende-arbeidsforhold-scheduler.yml b/.github/workflows/app.levende-arbeidsforhold-scheduler.yml
@@ -0,0 +1,25 @@
+name: levende-arbeidsforhold-scheduler
+
+on:
+  push:
+    paths:
+      - libs/commands/**
+      - libs/data-transfer-objects/**
+      - libs/security-core/**
+      - libs/servlet-core/**
+      - libs/servlet-security/**
+      - apps/levende-arbeidsforhold-scheduler/**
+      - .github/workflows/app.levende-arbeidsforhold-scheduler.yml
+
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/levende-arbeidsforhold-scheduler"
+      deploy-tag: "#deploy-levende-arbeidsforhold-scheduler"
+      sonar-enabled: false
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
diff --git a/.github/workflows/app.levende-arbeidsforhold-service.yml b/.github/workflows/app.levende-arbeidsforhold-service.yml
@@ -0,0 +1,24 @@
+name: levende-arbeidsforhold-service
+
+on:
+  push:
+    paths:
+      - libs/kafka-config/**
+      - libs/avro-schema/**
+      - libs/security-core/**
+      - libs/servlet-core/**
+      - libs/servlet-insecure-security/**
+      - libs/reactive-core/**
+      - apps/levende-arbeidsforhold-service/**
+      - .github/workflows/app.levende-arbeidsforhold-service.yml
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/levende-arbeidsforhold-service"
+      deploy-tag: "#deploy-levende-arbeidsforhold-service"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
diff --git a/.github/workflows/common.integration-test.yml b/.github/workflows/common.integration-test.yml
@@ -37,7 +37,7 @@ jobs:
         run: ./gradlew assemble --scan
       - name: "Start docker containers"
         run: |
-          JWK=$(cat ./mocks/jwk.json) docker-compose up -d --build
+          JWK=$(cat ./mocks/jwk.json) docker compose up --build --detach
       - name: "Health check"
         timeout-minutes: 5
         run: |
@@ -52,4 +52,4 @@ jobs:
         run: ./gradlew iTest --scan
       - name: "Stop docker containers"
         run: |
-          docker-compose down -v --remove-orphans
+          docker compose down --remove-orphans --volumes
diff --git a/.github/workflows/common.workflow.backend.yml b/.github/workflows/common.workflow.backend.yml
@@ -110,7 +110,6 @@ jobs:
           team: dolly
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
-          dockerfile: ${{ inputs.working-directory }}/Dockerfile
           docker_context: ${{ inputs.working-directory }}
           image_suffix: ${{ inputs.image-suffix }}
     outputs:

diff --git a/.github/workflows/common.workflow.frontend.yml b/.github/workflows/common.workflow.frontend.yml
@@ -147,7 +147,6 @@ jobs:
           team: dolly
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
-          dockerfile: ${{ inputs.working-directory }}/Dockerfile
           docker_context: ${{ inputs.working-directory }}
           image_suffix: ${{ inputs.image-suffix }}
     outputs:

diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Eller kjør:
 Kjør kommandoen: 
 
 ```
-JWK=$(cat ./mocks/jwk.json) docker-compose up --build
+JWK=$(cat ./mocks/jwk.json) docker compose up --build
 ```
 
 Deretter kan itegrasjonstester kjøres med kommandoen: 

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     implementation 'io.r2dbc:r2dbc-h2'
     implementation 'org.postgresql:r2dbc-postgresql'
     implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-database-postgresql'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 
     implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"

diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml
@@ -26,6 +26,7 @@ spec:
   gcp:
     sqlInstances:
       - type: POSTGRES_12
+        tier: db-custom-1-3840
         databases:
           - name: testnav-app-tilgang-analyse-service-db
   liveness:

diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -27,7 +27,10 @@ consumers:
     namespace: dolly
     url: https://testnav-aareg-proxy.dev-fss-pub.nais.io
     cluster: dev-fss
-
+spec:
+  azure:
+    application:
+      enabled: true
 management:
   endpoints:
     enabled-by-default: true

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -44,6 +44,7 @@ dependencies {
     implementation 'com.zaxxer:HikariCP'
 
     implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-database-postgresql'
     implementation 'com.h2database:h2'
 
     implementation 'wsdl4j:wsdl4j'

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation 'io.r2dbc:r2dbc-h2'
     implementation 'org.postgresql:r2dbc-postgresql'
     implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-database-postgresql'
 
     runtimeOnly 'org.postgresql:postgresql'
     runtimeOnly 'com.h2database:h2'

diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml
@@ -49,6 +49,7 @@ spec:
   gcp:
     sqlInstances:
       - type: POSTGRES_12
+        tier: db-custom-1-3840
         databases:
           - name: testnav-bruker-service-dev-db
   resources:

diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml
@@ -45,6 +45,7 @@ spec:
   gcp:
     sqlInstances:
       - type: POSTGRES_12
+        tier: db-custom-1-3840
         databases:
           - name: testnav-bruker-service-db
   envFrom:

diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -45,6 +45,8 @@ dependencies {
 
     implementation 'org.postgresql:postgresql'
     implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-database-postgresql'
+
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
     implementation 'org.codehaus.jettison:jettison:1.5.4'
     implementation "org.apache.poi:poi:$versions.apachePoi"

diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -37,6 +37,7 @@ spec:
         - application: testnav-organisasjon-service
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-service
+        - application: testnav-skattekort-service
         - application: testnav-sykemelding-api
         - application: testnav-synt-sykemelding-api
         - application: testnav-tps-messaging-service
@@ -104,7 +105,8 @@ spec:
   gcp:
     sqlInstances:
       - type: POSTGRES_14
+        tier: db-custom-1-3840
         name: testnav-dolly-backend-dev
         databases:
           - name: testnav-dolly-backend-dev
-        autoBackupHour: 3
+        autoBackupHour: 3
diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -105,8 +105,8 @@ spec:
   gcp:
     sqlInstances:
       - type: POSTGRES_14
+        tier: db-custom-2-7680
         name: testnav-dolly-backend
         databases:
           - name: testnav-dolly-backend
-        tier: db-custom-2-3840
         autoBackupHour: 2
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/AaregClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/AaregClient.java
@@ -88,6 +88,12 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
         return Flux.empty();
     }
 
+    @Override
+    public void release(List<String> identer) {
+
+        // Sletting av arbeidsforhold er pt ikke støttet
+    }
+
     private ClientFuture futurePersist(BestillingProgress progress, String status) {
 
         return () -> {
@@ -97,12 +103,6 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) {
         };
     }
 
-    @Override
-    public void release(List<String> identer) {
-
-        // Sletting av arbeidsforhold er pt ikke støttet
-    }
-
     private Mono<String> sendArbeidsforhold(RsDollyUtvidetBestilling bestilling, DollyPerson dollyPerson,
                                             Set<String> miljoer, boolean isOpprettEndre) {
 

diff --git a/...n/java/no/nav/dolly/bestilling/inntektsmelding/mapper/InntektsmeldingMappingStrategy.java b/...n/java/no/nav/dolly/bestilling/inntektsmelding/mapper/InntektsmeldingMappingStrategy.java
@@ -67,8 +67,9 @@ public void mapAtoB(RsInntektsmelding rsInntektsmelding,
                     public void mapAtoB(RsInntektsmelding.Inntektsmelding rsInntektsmelding,
                                         RsInntektsmeldingRequest inntektsmelding, MappingContext context) {
 
-                        inntektsmelding.setAarsakTilInnsending(
-                                nullcheckSetDefaultValue(inntektsmelding.getAarsakTilInnsending(), AarsakInnsendingKodeListe.NY));
+                        inntektsmelding.setAarsakTilInnsending(nonNull(rsInntektsmelding.getAarsakTilInnsending()) ?
+                                mapperFacade.map(rsInntektsmelding.getAarsakTilInnsending(), AarsakInnsendingKodeListe.class) :
+                                AarsakInnsendingKodeListe.NY);
 
                         if (nonNull(rsInntektsmelding.getArbeidsgiver())) {
 
@@ -254,4 +255,4 @@ private static LocalDateTime toLocalDateTime(LocalDate localDate) {
 
         return nonNull(localDate) ? localDate.atStartOfDay() : null;
     }
-}
+}
diff --git a/...ackend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java b/...ackend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java
@@ -13,6 +13,7 @@
 import no.nav.dolly.bestilling.pensjonforvalter.domain.AlderspensjonSoknadRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.AlderspensjonVedtakRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonPersonRequest;
+import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonPoppGenerertInntektRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonPoppInntektRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSamboerRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSamboerResponse;
@@ -21,6 +22,7 @@
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonTpYtelseRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonUforetrygdRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonforvalterResponse;
+import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonsavtaleRequest;
 import no.nav.dolly.bestilling.personservice.PersonServiceConsumer;
 import no.nav.dolly.consumer.norg2.Norg2Consumer;
 import no.nav.dolly.consumer.norg2.dto.Norg2EnhetResponse;
@@ -83,6 +85,7 @@ public class PensjonforvalterClient implements ClientRegister {
     private static final String TP_FORHOLD = "TpForhold#";
     private static final String PEN_ALDERSPENSJON = "AP#";
     private static final String PEN_UFORETRYGD = "Ufoer#";
+    private static final String PEN_PENSJONSAVTALE = "Pensjonsavtale#";
     private static final String PERIODE = "/periode/";
 
     private final PensjonforvalterConsumer pensjonforvalterConsumer;
@@ -153,8 +156,15 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                                                             dollyPerson.getIdent(), bestilteMiljoer.get())
                                                                             .map(response -> POPP_INNTEKTSREGISTER + decodeStatus(response, dollyPerson.getIdent())),
 
+                                                                    lagreGenerertInntekt(pensjon,
+                                                                            dollyPerson.getIdent(), bestilteMiljoer.get())
+                                                                            .map(response -> POPP_INNTEKTSREGISTER + decodeStatus(response, dollyPerson.getIdent())),
+
                                                                     lagreTpForhold(pensjon, dollyPerson.getIdent(), bestilteMiljoer.get())
-                                                                            .map(response -> TP_FORHOLD + decodeStatus(response, dollyPerson.getIdent()))
+                                                                            .map(response -> TP_FORHOLD + decodeStatus(response, dollyPerson.getIdent())),
+
+                                                                    lagrePensjonsavtale(pensjon, dollyPerson.getIdent(), bestilteMiljoer.get())
+                                                                            .map(response -> PEN_PENSJONSAVTALE + decodeStatus(response, dollyPerson.getIdent()))
                                                             )
                                                             .collectList()
                                                             .doOnNext(statusResultat::addAll)
@@ -197,9 +207,10 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
     @Override
     public void release(List<String> identer) {
 
-        // Pensjonforvalter / POPP støtter pt ikke sletting
+        // Pensjonforvalter / POPP, AP, UT støtter pt ikke sletting
 
         pensjonforvalterConsumer.sletteTpForhold(identer);
+        pensjonforvalterConsumer.slettePensjonsavtale(identer);
     }
 
     public static PensjonforvalterResponse mergePensjonforvalterResponses(List<PensjonforvalterResponse> responser) {
@@ -458,6 +469,22 @@ private Flux<PensjonforvalterResponse> lagreInntekt(PensjonData pensjonData, Str
                         }));
     }
 
+    private Flux<PensjonforvalterResponse> lagreGenerertInntekt(PensjonData pensjonData, String ident,
+                                                                Set<String> miljoer) {
+
+        return Flux.just(pensjonData)
+                .filter(PensjonData::hasGenerertInntekt)
+                .map(PensjonData::getGenerertInntekt)
+                .flatMap(generertInntekt -> Flux.fromIterable(miljoer)
+                        .flatMap(miljoe -> {
+
+                            var request = mapperFacade.map(generertInntekt, PensjonPoppGenerertInntektRequest.class);
+                            request.setFnr(ident);
+                            request.setMiljoer(List.of(miljoe));
+                            return pensjonforvalterConsumer.lagreGenererteInntekter(request);
+                        }));
+    }
+
     private Mono<PensjonforvalterResponse> lagreTpForhold(PensjonData pensjonData, String
             ident, Set<String> miljoer) {
 
@@ -490,6 +517,23 @@ private Mono<PensjonforvalterResponse> lagreTpForhold(PensjonData pensjonData, S
                 .map(PensjonforvalterClient::mergePensjonforvalterResponses);
     }
 
+    private Flux<PensjonforvalterResponse> lagrePensjonsavtale(PensjonData pensjon, String ident, Set<String> miljoer) {
+
+        return Flux.just(pensjon)
+                .filter(PensjonData::hasPensjonsavtale)
+                .map(PensjonData::getPensjonsavtale)
+                .flatMap(pensjonsavtaler -> Flux.fromIterable(pensjonsavtaler)
+                        .flatMap(pensjonsavtale -> {
+
+                            var context = MappingContextUtils.getMappingContext();
+                            context.setProperty(IDENT, ident);
+                            context.setProperty(MILJOER, miljoer);
+
+                            var pensjonsavtaleRequest = mapperFacade.map(pensjonsavtale, PensjonsavtaleRequest.class, context);
+                            return pensjonforvalterConsumer.lagrePensjonsavtale(pensjonsavtaleRequest);
+                        }));
+    }
+
     private String decodeStatus(PensjonforvalterResponse response, String ident) {
 
         log.info("Mottatt status på {} fra Pensjon-Testdata-Facade: {}", ident, response);