Fikset merge conflicts

.github/workflows/app.sykemelding-api.yml

@@ -13,7 +13,7 @@ jobs:
   workflow:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
-      cluster: "dev-fss"
+      cluster: "dev-gcp"
       working-directory: "apps/sykemelding-api"
       deploy-tag: "#deploy-sykemelding-api"
     permissions:

.github/workflows/common.js.build.yml

@@ -12,6 +12,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
     steps:
       - uses: actions/checkout@v3
       - name: 'Setup Node'

.github/workflows/common.js.publish.yml

@@ -10,6 +10,9 @@ on:
 
 jobs:
   build:
+    permissions:
+      contents: write
+      id-token: write
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:

.github/workflows/lib.frontend.dolly-assets.yml

@@ -9,11 +9,17 @@ on:
 jobs:
   build:
     name: Build
+    permissions:
+      contents: write
+      id-token: write
     uses: ./.github/workflows/common.js.build.yml
     with:
       working-directory: 'navikt/dolly-assets/'
   publish:
     name: Publish
+    permissions:
+      contents: write
+      id-token: write
     uses: ./.github/workflows/common.js.publish.yml
     if: ${{ github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '#publish-libs') }}
     with:

.github/workflows/lib.frontend.dolly-komponenter.yml

@@ -9,13 +9,19 @@ on:
 jobs:
   build:
     name: Build
+    permissions:
+      contents: write
+      id-token: write
     uses: ./.github/workflows/common.js.build.yml
     with:
       working-directory: 'navikt/dolly-komponenter/'
     secrets:
       READER_TOKEN: ${{ secrets.READER_TOKEN }}
   publish:
     name: Publish
+    permissions:
+      contents: write
+      id-token: write
     uses: ./.github/workflows/common.js.publish.yml
     if: ${{ github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '#publish-libs') }}
     with:

.github/workflows/lib.frontend.dolly-lib.yml

@@ -9,11 +9,17 @@ on:
 jobs:
   build:
     name: Build
+    permissions:
+      contents: write
+      id-token: write
     uses: ./.github/workflows/common.js.build.yml
     with:
       working-directory: 'navikt/dolly-lib/'
   publish:
     name: Publish
+    permissions:
+      contents: write
+      id-token: write
     uses: ./.github/workflows/common.js.publish.yml
     if: ${{ github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '#publish-libs') }}
     with:

apps/dolly-backend/config.test.yml

@@ -7,7 +7,9 @@ metadata:
     team: dolly
   annotations:
     nginx.ingress.kubernetes.io/proxy-body-size: "512m"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+
 spec:
   tokenx:
     enabled: true
@@ -42,6 +44,7 @@ spec:
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-service
         - application: testnav-synt-sykemelding-api
+        - application: testnav-sykemelding-api
         - application: testnav-tps-messaging-service
         - application: testnorge-profil-api-dev
       external:
@@ -62,7 +65,6 @@ spec:
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
         - host: testnav-statisk-data-forvalter-proxy.dev-fss-pub.nais.io
-        - host: testnav-sykemelding-api-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
   webproxy: true
@@ -108,4 +110,4 @@ spec:
         name: testnav-dolly-backend-dev
         databases:
           - name: testnav-dolly-backend-dev
-        autoBackupTime: "01:00"
+        autoBackupTime: "01:00"

apps/dolly-backend/config.yml

@@ -52,6 +52,7 @@ spec:
         - application: testnav-pdl-forvalter
         - application: testnav-person-service
         - application: testnav-synt-sykemelding-api
+        - application: testnav-sykemelding-api
         - application: testnav-tps-messaging-service
         - application: testnorge-profil-api
       external:
@@ -72,7 +73,6 @@ spec:
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
         - host: testnav-statisk-data-forvalter-proxy.dev-fss-pub.nais.io
-        - host: testnav-sykemelding-api-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
   webproxy: true

apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

@@ -9,4 +9,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/brregstub/BrregstubClient.java

@@ -8,7 +8,7 @@
 import no.nav.dolly.bestilling.ClientRegister;
 import no.nav.dolly.bestilling.brregstub.domain.RolleoversiktTo;
 import no.nav.dolly.bestilling.brregstub.util.BrregstubMergeUtil;
-import no.nav.dolly.consumer.pdlperson.PdlPersonConsumer;
+import no.nav.dolly.bestilling.personservice.PersonServiceConsumer;
 import no.nav.dolly.domain.PdlPersonBolk;
 import no.nav.dolly.domain.jpa.BestillingProgress;
 import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
@@ -35,7 +35,7 @@ public class BrregstubClient implements ClientRegister {
     private static final String FEIL_STATUS = "Feil= ";
 
     private final BrregstubConsumer brregstubConsumer;
-    private final PdlPersonConsumer pdlPersonConsumer;
+    private final PersonServiceConsumer personServiceConsumer;
     private final MapperFacade mapperFacade;
     private final TransactionHelperService transactionHelperService;
 
@@ -65,7 +65,7 @@ public void release(List<String> identer) {
 
     private Flux<PdlPersonBolk.PersonBolk> getPersonData(String ident) {
 
-        return pdlPersonConsumer.getPdlPersoner(List.of(ident))
+        return personServiceConsumer.getPdlPersoner(List.of(ident))
                 .filter(pdlPersonBolk -> nonNull(pdlPersonBolk.getData()))
                 .map(PdlPersonBolk::getData)
                 .map(PdlPersonBolk.Data::getHentPersonBolk)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java

@@ -11,7 +11,7 @@
 import no.nav.dolly.bestilling.dokarkiv.domain.DokarkivRequest;
 import no.nav.dolly.bestilling.dokarkiv.domain.DokarkivResponse;
 import no.nav.dolly.bestilling.dokarkiv.domain.JoarkTransaksjon;
-import no.nav.dolly.consumer.pdlperson.PdlPersonConsumer;
+import no.nav.dolly.bestilling.personservice.PersonServiceConsumer;
 import no.nav.dolly.domain.PdlPersonBolk;
 import no.nav.dolly.domain.jpa.BestillingProgress;
 import no.nav.dolly.domain.jpa.TransaksjonMapping;
@@ -44,7 +44,7 @@ public class DokarkivClient implements ClientRegister {
     private final TransaksjonMappingService transaksjonMappingService;
     private final ObjectMapper objectMapper;
     private final TransactionHelperService transactionHelperService;
-    private final PdlPersonConsumer pdlPersonConsumer;
+    private final PersonServiceConsumer personServiceConsumer;
     private final ErrorStatusDecoder errorStatusDecoder;
 
     @Override
@@ -59,7 +59,7 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                         .flatMapIterable(env -> env)
                                         .filter(env -> bestilling.getEnvironments().contains(env))
                                         .filter(env -> !transaksjonMappingService.existAlready(DOKARKIV,
-                                                dollyPerson.getIdent(), env) || isOpprettEndre)
+                                                dollyPerson.getIdent(), env, bestilling.getId()) || isOpprettEndre)
                                         .flatMap(env -> dokarkivConsumer.postDokarkiv(env, request)
                                                 .map(status ->
                                                         getStatus(dollyPerson.getIdent(), progress.getBestilling().getId(), status))))
@@ -103,7 +103,7 @@ public void release(List<String> identer) {
 
     private Flux<PdlPersonBolk.PersonBolk> getPersonData(List<String> identer) {
 
-        return pdlPersonConsumer.getPdlPersoner(identer)
+        return personServiceConsumer.getPdlPersoner(identer)
                 .filter(pdlPersonBolk -> nonNull(pdlPersonBolk.getData()))
                 .map(PdlPersonBolk::getData)
                 .map(PdlPersonBolk.Data::getHentPersonBolk)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java

@@ -52,7 +52,7 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
             return Flux.just(dollyPerson.getIdent())
                     .map(person -> buildRequest(bestilling.getHistark(), person))
                     .filter(env -> !transaksjonMappingService.existAlready(HISTARK,
-                            dollyPerson.getIdent(), "NA") || isOpprettEndre)
+                            dollyPerson.getIdent(), "NA", bestilling.getId()) || isOpprettEndre)
                     .flatMap(request -> histarkConsumer.postHistark(request)
                             .mapNotNull(status -> getStatus(dollyPerson.getIdent(), bestillingId, status)))
                     .map(status -> futurePersist(progress, status));

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektsmelding/InntektsmeldingClient.java

@@ -60,8 +60,8 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                 var request = mapperFacade.map(inntektsmeldingRequest, InntektsmeldingRequest.class);
                                 request.setMiljoe(environment);
                                 return postInntektsmelding(isOpprettEndre ||
-                                                !transaksjonMappingService.existAlready(INNTKMELD, dollyPerson.getIdent(), environment),
-                                        request, progress.getBestilling().getId());
+                                                !transaksjonMappingService.existAlready(INNTKMELD, dollyPerson.getIdent(), environment, bestilling.getId()),
+                                        request, bestilling.getId());
                             })
                             .filter(StringUtils::isNotBlank)
                             .collect(Collectors.joining(","))

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java

@@ -1,6 +1,7 @@
 package no.nav.dolly.bestilling.pdldata;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.netty.channel.ChannelOption;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.ConsumerStatus;
 import no.nav.dolly.bestilling.pdldata.command.PdlDataCheckIdentCommand;
@@ -57,7 +58,8 @@ public PdlDataConsumer(
                                 .maxConnections(5)
                                 .pendingAcquireMaxCount(500)
                                 .pendingAcquireTimeout(Duration.ofMinutes(15))
-                                .build())))
+                                .build())
+                                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 10000)))
                 .build();
     }