Merge branch 'master' into feature/ny-dialog-for-banckid-pålogging

.nais/idporten.yml

@@ -15,3 +15,4 @@ spec:
     - https://dolly.ekstern.dev.nav.no/login/oauth2/code/idporten
     - https://dolly-idporten.ekstern.dev.nav.no/login/oauth2/code/idporten
   secretName: idporten-dolly-prod # deployes til prod. secret kopieres manuelt til dev.
+  ssoDisabled: true

apps/adresse-service/src/main/resources/application.yml

@@ -34,12 +34,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/altinn3-tilgang-service/config.dev.yml

@@ -32,6 +32,7 @@ spec:
         - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
         - application: testnav-bruker-service-dev
+        - application: testnorge-profil-api-dev
     outbound:
       external:
         - host: platform.tt02.altinn.no

apps/altinn3-tilgang-service/src/main/resources/application.yml

@@ -37,12 +37,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/amelding-service/src/main/resources/application.yml

@@ -30,12 +30,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/app-tilgang-analyse-service/src/main/resources/application.yml

@@ -32,12 +32,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/arbeidsforhold-service/src/main/resources/application.yml

@@ -33,12 +33,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/batch-bestilling-service/src/main/resources/application.yml

@@ -28,12 +28,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/brreg-stub/src/main/resources/application.yml

@@ -12,12 +12,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java → apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/AltinnTilgangServiceConsumer.java

@@ -11,14 +11,14 @@
 import reactor.core.publisher.Mono;
 
 @Component
-public class PersonOrganisasjonTilgangConsumer {
+public class AltinnTilgangServiceConsumer {
 
     private final WebClient webClient;
     private final ServerProperties serverProperties;
     private final TokenExchange tokenExchange;
     private final GetAuthenticatedUserId getAuthenticatedUserId;
 
-    public PersonOrganisasjonTilgangConsumer(
+    public AltinnTilgangServiceConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
             WebClient.Builder webClientBuilder,

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/ValidateService.java

@@ -1,18 +1,19 @@
 package no.nav.testnav.apps.brukerservice.service;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.brukerservice.consumer.PersonOrganisasjonTilgangConsumer;
+import no.nav.testnav.apps.brukerservice.consumer.AltinnTilgangServiceConsumer;
 import no.nav.testnav.apps.brukerservice.exception.UserHasNoAccessToOrgnisasjonException;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 @Service
 @RequiredArgsConstructor
 public class ValidateService {
-    private final PersonOrganisasjonTilgangConsumer client;
+
+    private final AltinnTilgangServiceConsumer altinnTilgangServiceConsumer;
 
     public Mono<Void> validateOrganiasjonsnummerAccess(String organisasjonsnummer) {
-        return client
+        return altinnTilgangServiceConsumer
                 .getOrganisasjon(organisasjonsnummer)
                 .doOnNext(organisasjon -> {
                     if (!organisasjon.getOrganisasjonsnummer().equals(organisasjonsnummer)) {

apps/bruker-service/src/main/resources/application-virtual.yml

@@ -23,11 +23,11 @@ spring:
     password: compose-postgres
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
-    url: http://testnav-person-organisasjon-tilgang-service:8080
+  testnav-altinn3-tilgang-service:
+    url: http://testnav-altinn3-tilgang-service:8080
     cluster: dev-gcp
     namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service
+    name: testnav-altinn3-tilgang-service
 
 TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service

apps/bruker-service/src/main/resources/application.yml

@@ -33,12 +33,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

apps/bruker-service/src/test/resources/application-test.yml

@@ -20,5 +20,5 @@ spring:
           jwk-set-uri: ${wiremockBaseUrl}/jwks
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
+  testnav-altinn3-tilgang-service:
     url: ${wiremockBaseUrl}

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

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

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

@@ -20,6 +20,7 @@
 import no.nav.dolly.domain.resultset.dokarkiv.RsDokarkiv;
 import no.nav.dolly.domain.resultset.dolly.DollyPerson;
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
+import no.nav.dolly.service.DokumentService;
 import no.nav.dolly.service.TransaksjonMappingService;
 import no.nav.dolly.util.TransactionHelperService;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
@@ -47,6 +48,7 @@ public class DokarkivClient implements ClientRegister {
 
     private final ApplicationConfig applicationConfig;
     private final DokarkivConsumer dokarkivConsumer;
+    private final DokumentService dokumentService;
     private final ErrorStatusDecoder errorStatusDecoder;
     private final MapperFacade mapperFacade;
     private final ObjectMapper objectMapper;
@@ -63,7 +65,7 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                 .flatMap(dokarkiv -> Flux.from(getPersonData(dollyPerson.getIdent())
                                 .flatMap(person -> getFilteredMiljoer(bestilling.getEnvironments())
                                         .flatMapMany(miljoer -> Flux.fromIterable(miljoer)
-                                                .flatMap(env -> buildRequest(dokarkiv, person)
+                                                .flatMap(env -> buildRequest(dokarkiv, person, progress.getBestilling().getId())
                                                         .flatMap(request ->
                                                                 !transaksjonMappingService.existAlready(DOKARKIV,
                                                                         dollyPerson.getIdent(), env, bestilling.getId()) || isOpprettEndre ?
@@ -142,10 +144,11 @@ private Flux<PdlPersonBolk.PersonBolk> getPersonData(String ident) {
                 .filter(personBolk -> nonNull(personBolk.getPerson()));
     }
 
-    private Mono<DokarkivRequest> buildRequest(RsDokarkiv rsDokarkiv, PdlPersonBolk.PersonBolk personBolk) {
+    private Mono<DokarkivRequest> buildRequest(RsDokarkiv rsDokarkiv, PdlPersonBolk.PersonBolk personBolk, Long bestillingId) {
 
         var context = new MappingContext.Factory().getContext();
         context.setProperty("personBolk", personBolk);
+        context.setProperty("dokumenter", dokumentService.getDokumenterByBestilling(bestillingId));
 
         return Mono.just(mapperFacade.map(rsDokarkiv, DokarkivRequest.class, context));
     }

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

@@ -1,5 +1,6 @@
 package no.nav.dolly.bestilling.dokarkiv.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -100,6 +101,8 @@ public static class DokumentVariant {
         private String filtype;
         private String fysiskDokument;
         private String variantformat;
+        @JsonIgnore
+        private Long dokumentReferanse;
 
         @Override
         public String toString() {

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

@@ -37,7 +37,5 @@ public List<DokumentInfo> getDokumenter() {
     public static class DokumentInfo {
 
         private String dokumentInfoId;
-        private String brevkode;
-        private String tittel;
     }
 }