Merge branch 'master' into bugfix/idporten-miljoevelger

# Conflicts: # apps/dolly-frontend/src/main/js/package-lock.json
navikt · Apr 4, 2024 · 9d599b5 · 9d599b5
2 parents 513725c + 8c4dc7e
commit 9d599b5
Show file tree

Hide file tree

Showing 170 changed files with 10,423 additions and 10,121 deletions.
diff --git a/.github/workflows/app.kodeverk-service.yml b/.github/workflows/app.kodeverk-service.yml
@@ -0,0 +1,22 @@
+name: kodeverk-service
+
+on:
+  push:
+    paths:
+      - libs/security-core
+      - libs/reactive-core
+      - libs/reactive-security
+      - libs/data-transfer-objects
+      - apps/kodeverk-service/**
+      - .github/workflows/app.kodeverk-service.yml
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/kodeverk-service"
+      deploy-tag: "#deploy-kodeverk-service"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml
@@ -0,0 +1,21 @@
+name: team-dolly-lokal-app
+
+on:
+  push:
+    paths:
+      - .nais/team-dolly-lokal-app.yml
+      - .github/workflows/app.team-dolly-lokal-app.yml
+
+jobs:
+  deploy:
+    name: Deploy team-dolly-lokal-app
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/team-dolly-lokal-app.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/tests.yml → .github/workflows/integration-tests.yml b/.github/workflows/tests.yml → .github/workflows/integration-tests.yml
@@ -1,4 +1,4 @@
-name: Tests
+name: Integration Tests
 on:
   push:
     branches:

diff --git a/.nais/team-dolly-lokal-app.yml b/.nais/team-dolly-lokal-app.yml
@@ -0,0 +1,18 @@
+apiVersion: nais.io/v1
+kind: AzureAdApplication
+metadata:
+  labels:
+    team: dolly
+  name: team-dolly-lokal-app
+  namespace: dolly
+spec:
+  allowAllUsers: true
+  logoutUrl: https://localhost:8080/oauth2/logout
+  preAuthorizedApplications:
+    - application: testnav-oversikt-frontend
+      cluster: dev-gcp
+      namespace: dolly
+  replyUrls:
+    - url: http://localhost:8080/login/oauth2/code/aad
+  secretName: azuread-team-dolly-lokal-app
+  tenant: nav.no
diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yaml
@@ -50,4 +50,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
@@ -43,4 +43,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -48,4 +48,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -46,4 +46,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -45,6 +45,8 @@ server:
   servlet:
     encoding:
       charset: UTF-8
+  error:
+    include-message: always
 
 consumers:
   dolly-backend:

diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yaml
@@ -29,4 +29,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml
@@ -44,4 +44,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/budpro-service/src/main/resources/application.yml b/apps/budpro-service/src/main/resources/application.yml
@@ -37,3 +37,10 @@ consumers:
 app:
   security:
     allow-api: true
+
+server:
+  servlet:
+    encoding:
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/dolly-backend/README.md b/apps/dolly-backend/README.md
@@ -44,5 +44,6 @@ TESTCONTAINERS_RYUK_DISABLED=true
 For å kjøre lokalt med elastic search:
 
 ```
-docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" --name opensearch-node -d opensearchproject/opensearch:latest
-```
+docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" -e "OPENSEARCH_INITIAL_ADMIN_PASSWORD=YLAgOm}rz#o6#Aq" --name opensearch -d opensearchproject/opensearch:latest
+```
+Legg merke til passord `YLAgOm}rz#o6#Aq` (tilfeldig [generert](https://www.strongpasswordgenerator.org/), men må være "sterkt" ellers vil ikke OpenSearch starte). 
diff --git a/...-backend/src/main/java/no/nav/dolly/bestilling/inntektsmelding/InntektsmeldingClient.java b/...-backend/src/main/java/no/nav/dolly/bestilling/inntektsmelding/InntektsmeldingClient.java
@@ -85,52 +85,59 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) {
         };
     }
 
-    private Flux<String> postInntektsmelding(boolean isSendMelding,
-                                             InntektsmeldingRequest inntektsmeldingRequest, Long bestillingid) {
-
+    private Flux<String> postInntektsmelding(
+            boolean isSendMelding,
+            InntektsmeldingRequest inntektsmeldingRequest,
+            Long bestillingid
+    ) {
+        final var miljoe = inntektsmeldingRequest.getMiljoe();
         if (isSendMelding) {
-            return inntektsmeldingConsumer.postInntektsmelding(inntektsmeldingRequest)
+            return inntektsmeldingConsumer
+                    .postInntektsmelding(inntektsmeldingRequest)
                     .map(response -> {
                         if (isBlank(response.getError())) {
-
-                            transaksjonMappingService.saveAll(
-                                    response.getDokumenter().stream()
-                                            .map(dokument -> {
-                                                var gjeldendeInntektRequest = InntektsmeldingRequest.builder()
-                                                        .arbeidstakerFnr(inntektsmeldingRequest.getArbeidstakerFnr())
-                                                        .inntekter(singletonList(
-                                                                inntektsmeldingRequest.getInntekter().get(response.getDokumenter().indexOf(dokument))))
-                                                        .joarkMetadata(inntektsmeldingRequest.getJoarkMetadata())
-                                                        .miljoe(inntektsmeldingRequest.getMiljoe())
-                                                        .build();
-
-                                                return TransaksjonMapping.builder()
-                                                        .ident(inntektsmeldingRequest.getArbeidstakerFnr())
-                                                        .bestillingId(bestillingid)
-                                                        .transaksjonId(toJson(TransaksjonMappingDTO.builder()
-                                                                .request(gjeldendeInntektRequest)
-                                                                .dokument(dokument)
-                                                                .build()))
-                                                        .datoEndret(LocalDateTime.now())
-                                                        .miljoe(inntektsmeldingRequest.getMiljoe())
-                                                        .system(INNTKMELD.name())
-                                                        .build();
-                                            })
-                                            .toList());
-
-                            return inntektsmeldingRequest.getMiljoe() + ":OK";
+                            var entries = response
+                                    .getDokumenter()
+                                    .stream()
+                                    .map(dokument -> {
+                                        var gjeldendeInntektRequest = InntektsmeldingRequest
+                                                .builder()
+                                                .arbeidstakerFnr(inntektsmeldingRequest.getArbeidstakerFnr())
+                                                .inntekter(singletonList(inntektsmeldingRequest.getInntekter().get(response.getDokumenter().indexOf(dokument))))
+                                                .joarkMetadata(inntektsmeldingRequest.getJoarkMetadata())
+                                                .miljoe(miljoe)
+                                                .build();
+                                        var json = toJson(TransaksjonMappingDTO
+                                                .builder()
+                                                .request(gjeldendeInntektRequest)
+                                                .dokument(dokument)
+                                                .build());
+                                        return TransaksjonMapping
+                                                .builder()
+                                                .ident(inntektsmeldingRequest.getArbeidstakerFnr())
+                                                .bestillingId(bestillingid)
+                                                .transaksjonId(json)
+                                                .datoEndret(LocalDateTime.now())
+                                                .miljoe(miljoe)
+                                                .system(INNTKMELD.name())
+                                                .build();
+                                    })
+                                    .toList();
+                            transaksjonMappingService.saveAll(entries);
+
+                            return miljoe + ":OK";
 
                         } else {
                             log.error("Feilet å legge inn person: {} til Inntektsmelding miljø: {} feilmelding {}",
-                                    inntektsmeldingRequest.getArbeidstakerFnr(), inntektsmeldingRequest.getMiljoe(), response.getError());
+                                    inntektsmeldingRequest.getArbeidstakerFnr(), miljoe, response.getError());
 
-                            return String.format(STATUS_FMT, inntektsmeldingRequest.getMiljoe(),
+                            return String.format(STATUS_FMT, miljoe,
                                     errorStatusDecoder.getErrorText(response.getStatus(), response.getError()));
 
                         }
                     });
         } else {
-            return Flux.just(inntektsmeldingRequest.getMiljoe() + ":OK");
+            return Flux.just(miljoe + ":OK");
         }
     }