Merge branch 'master' into feature/afp-offentlig-frontend

navikt · Sep 27, 2024 · c38feb0 · c38feb0
2 parents 31e1b0b + 1e446f7
commit c38feb0
Show file tree

Hide file tree

Showing 99 changed files with 350 additions and 304 deletions.
diff --git a/...service/src/main/java/no/nav/testnav/apps/adresseservice/consumer/PdlAdresseConsumer.java b/...service/src/main/java/no/nav/testnav/apps/adresseservice/consumer/PdlAdresseConsumer.java
@@ -11,17 +11,18 @@
 
 @Service
 public class PdlAdresseConsumer {
+
     private final WebClient webClient;
     private final TokenExchange tokenExchange;
     private final ServerProperties serverProperties;
 
     public PdlAdresseConsumer(
             TokenExchange tokenExchange,
-            Consumers consumers) {
+            Consumers consumers,
+            WebClient.Builder webClientBuilder) {
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getPdlServices();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/.../java/no/nav/registre/testnav/ameldingservice/consumer/OppsummeringsdokumentConsumer.java b/.../java/no/nav/registre/testnav/ameldingservice/consumer/OppsummeringsdokumentConsumer.java
@@ -30,10 +30,11 @@ public class OppsummeringsdokumentConsumer {
     public OppsummeringsdokumentConsumer(
             Consumers consumers,
             ObjectMapper objectMapper,
-            ApplicationProperties applicationProperties) {
+            ApplicationProperties applicationProperties,
+            WebClient.Builder webClientBuilder) {
+
         this.applicationProperties = applicationProperties;
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(consumers.getOppsummeringsdokumentService().getUrl())
                 .codecs(
                         clientDefaultCodecsConfigurer -> {

diff --git a/...e/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/consumer/GithubConsumer.java b/...e/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/consumer/GithubConsumer.java
@@ -18,10 +18,11 @@ public class GithubConsumer {
     private static final int PAGE_SIZE = 100;
     private final WebClient webClient;
 
-    public GithubConsumer(@Value("${consumers.github.url}") String url, @Value("${consumers.github.token}") String token) {
+    public GithubConsumer(@Value("${consumers.github.url}") String url,
+                          @Value("${consumers.github.token}") String token,
+                          WebClient.Builder webClientBuilder) {
 
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(url)
                 .defaultHeader(HttpHeaders.AUTHORIZATION, "token " + token)
                 .exchangeStrategies(ExchangeStrategies.builder()

diff --git a/...src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/consumer/AaregConsumer.java b/...src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/consumer/AaregConsumer.java
@@ -32,7 +32,9 @@ public class AaregConsumer {
     public AaregConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
-            ObjectMapper objectMapper) {
+            ObjectMapper objectMapper,
+            WebClient.Builder webClientBuilder) {
+
         serverProperties = consumers.getTestnavAaregProxy();
         this.tokenExchange = tokenExchange;
         ExchangeStrategies jacksonStrategy = ExchangeStrategies
@@ -47,8 +49,7 @@ public AaregConsumer(
                                     .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
                         })
                 .build();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .exchangeStrategies(jacksonStrategy)
                 .baseUrl(serverProperties.getUrl())
                 .build();

diff --git a/...in/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java b/...in/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java
@@ -23,7 +23,8 @@ public class PersonOrganisasjonTilgangConsumer {
     public PersonOrganisasjonTilgangConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
-            ObjectMapper objectMapper) {
+            ObjectMapper objectMapper,
+            WebClient.Builder webClientBuilder) {
         serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
         this.tokenExchange = tokenExchange;
         ExchangeStrategies jacksonStrategy = ExchangeStrategies
@@ -36,8 +37,7 @@ public PersonOrganisasjonTilgangConsumer(
                                     .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
                         })
                 .build();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .exchangeStrategies(jacksonStrategy)
                 .baseUrl(serverProperties.getUrl())
                 .build();

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
@@ -141,6 +141,7 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                             log.warn("Persondata for {} gir tom response fra PDL", dollyPerson.getIdent());
                                         }
                                     })
+                                    .filter(utvidetPersondata -> !utvidetPersondata.getT1().isEmpty())
                                     .flatMap(utvidetPersondata -> Flux.concat(
                                                     opprettPersoner(dollyPerson.getIdent(), tilgjengeligeMiljoer, utvidetPersondata.getT1())
                                                             .map(response -> PENSJON_FORVALTER + decodeStatus(response, dollyPerson.getIdent())),
@@ -150,6 +151,7 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                             )
                                             .collectList()
                                             .doOnNext(statusResultat::addAll)
+                                            .filter(status -> status.stream().allMatch(entry -> entry.contains("OK")))
                                             .map(status -> Flux.just(bestilling1)
                                                     .filter(bestilling2 -> nonNull(bestilling2.getPensjonforvalter()))
                                                     .map(RsDollyUtvidetBestilling::getPensjonforvalter)

diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/BrukerConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/BrukerConsumer.java
@@ -19,12 +19,12 @@ public class BrukerConsumer {
     private final AccessService accessService;
 
     public BrukerConsumer(TestnavBrukerServiceProperties serviceProperties,
-                          AccessService accessService) {
+                          AccessService accessService,
+                          WebClient.Builder webClientBuilder) {
 
         this.serviceProperties = serviceProperties;
         this.accessService = accessService;
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serviceProperties.getUrl())
                 .build();
     }

diff --git a/...-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java b/...-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.command.GetPersonOrganisasjonTilgangCommand;
 import no.nav.dolly.web.config.Consumers;
+import no.nav.dolly.web.consumers.command.GetPersonOrganisasjonTilgangCommand;
 import no.nav.dolly.web.service.AccessService;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import org.springframework.http.MediaType;
@@ -27,7 +27,8 @@ public class PersonOrganisasjonTilgangConsumer {
     public PersonOrganisasjonTilgangConsumer(
             Consumers consumers,
             AccessService accessService,
-            ObjectMapper objectMapper) {
+            ObjectMapper objectMapper,
+            WebClient.Builder webClientBuilder) {
 
         this.accessService = accessService;
         serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
@@ -39,8 +40,7 @@ public PersonOrganisasjonTilgangConsumer(
                             .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
                 }).build();
 
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .exchangeStrategies(jacksonStrategy)
                 .baseUrl(serverProperties.getUrl())
                 .build();

diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/TilbakemeldingConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/TilbakemeldingConsumer.java
@@ -23,10 +23,11 @@ public class TilbakemeldingConsumer {
 
     public TilbakemeldingConsumer(
             Consumers consumers,
-            AccessService accessService) {
+            AccessService accessService,
+            WebClient.Builder webClientBuilder) {
 
         serverProperties = consumers.getTestnorgeTilbakemeldingApi();
-        this.webClient = WebClient.builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
         this.accessService = accessService;

diff --git a/...s/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx b/...s/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx
@@ -112,7 +112,6 @@ export const SivilstandForm = ({
 						!isEmpty(formMethods.watch(`${path}.nyRelatertPerson`), ['syntetisk']) ||
 						formMethods.watch(`${path}.relatertVedSivilstand`) !== null
 					}
-					toggleExpansion={identMaster != 'PDL'}
 				/>
 			)}
 			<AvansertForm

diff --git a/...ntend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx b/...ntend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
@@ -121,7 +121,7 @@ export const PdlPersonForm = ({
 							(opts?.antall > 1 && 'Valg er kun tilgjengelig for individ, ikke for gruppe') || ''
 						}
 					>
-						{type === PersonType.EKSISTERENDE_PERSON && (
+						{(type === PersonType.EKSISTERENDE_PERSON || isTestnorgeIdent) && (
 							<PdlEksisterendePerson
 								nyPersonPath={nyPersonPath}
 								eksisterendePersonPath={eksisterendePersonPath}

diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx
@@ -108,6 +108,7 @@ export default ({
 		navigate(`/gruppe/${gruppeId}/bestilling`, { state: values })
 
 	const erLaast = gruppe.erLaast
+
 	return (
 		<div className="gruppe-container">
 			<GruppeHeaderConnector gruppeId={gruppe.id} />

diff --git a/.../src/main/java/no/nav/testnav/endringsmeldingservice/consumer/AdresseServiceConsumer.java b/.../src/main/java/no/nav/testnav/endringsmeldingservice/consumer/AdresseServiceConsumer.java
@@ -19,11 +19,12 @@ public class AdresseServiceConsumer {
 
     public AdresseServiceConsumer(
             TokenExchange tokenExchange,
-            Consumers consumers) {
+            Consumers consumers,
+            WebClient.Builder webClientBuilder) {
+
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getAdresseService();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/.../main/java/no/nav/testnav/endringsmeldingservice/consumer/GenererNavnServiceConsumer.java b/.../main/java/no/nav/testnav/endringsmeldingservice/consumer/GenererNavnServiceConsumer.java
@@ -20,11 +20,12 @@ public class GenererNavnServiceConsumer {
 
     public GenererNavnServiceConsumer(
             TokenExchange tokenExchange,
-            Consumers consumers) {
+            Consumers consumers,
+            WebClient.Builder webClientBuilder) {
+
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getGenererNavnService();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/...rvice/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/IdentPoolConsumer.java b/...rvice/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/IdentPoolConsumer.java
@@ -20,11 +20,12 @@ public class IdentPoolConsumer {
 
     public IdentPoolConsumer(
             TokenExchange tokenExchange,
-            Consumers consumers) {
+            Consumers consumers,
+            WebClient.Builder webClientBuilder) {
+
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getIdentPool();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/...ce/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/TpsMessagingConsumer.java b/...ce/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/TpsMessagingConsumer.java
@@ -45,7 +45,8 @@ public class TpsMessagingConsumer {
     public TpsMessagingConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
-            ObjectMapper objectMapper) {
+            ObjectMapper objectMapper,
+            WebClient.Builder webClientBuilder) {
 
         serverProperties = consumers.getTpsMessagingService();
         this.accessTokenService = tokenExchange;
@@ -59,8 +60,7 @@ public TpsMessagingConsumer(
                 }).build();
 
 
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .exchangeStrategies(jacksonStrategy)
                 .baseUrl(serverProperties.getUrl())
                 .build();

diff --git a/...enererarbeidsforholdpopulasjonservice/consumer/GenererOrganisasjonPopulasjonConsumer.java b/...enererarbeidsforholdpopulasjonservice/consumer/GenererOrganisasjonPopulasjonConsumer.java
@@ -17,12 +17,12 @@ public class GenererOrganisasjonPopulasjonConsumer {
 
     public GenererOrganisasjonPopulasjonConsumer(
             Consumers consumers,
-            TokenExchange tokenExchange) {
+            TokenExchange tokenExchange,
+            WebClient.Builder webClientBuilder) {
 
         serverProperties = consumers.getTestnavGenererOrganisasjonPopulasjonService();
         this.tokenExchange = tokenExchange;
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/...estnav/genererarbeidsforholdpopulasjonservice/consumer/OppsummeringsdokumentConsumer.java b/...estnav/genererarbeidsforholdpopulasjonservice/consumer/OppsummeringsdokumentConsumer.java
@@ -42,15 +42,15 @@ public OppsummeringsdokumentConsumer(
             TokenExchange tokenExchange,
             Consumers consumers,
             ObjectMapper objectMapper,
-            ApplicationProperties applicationProperties) {
+            ApplicationProperties applicationProperties,
+            WebClient.Builder webClientBuilder) {
 
         this.applicationProperties = applicationProperties;
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getOppsummeringsdokumentService();
         this.executor = Executors.newFixedThreadPool(20);
 
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .codecs(clientDefaultCodecsConfigurer -> {
                     clientDefaultCodecsConfigurer.defaultCodecs().maxInMemorySize(BYTE_COUNT);

diff --git a/...egistre/testnav/genererarbeidsforholdpopulasjonservice/consumer/OrganisasjonConsumer.java b/...egistre/testnav/genererarbeidsforholdpopulasjonservice/consumer/OrganisasjonConsumer.java
@@ -25,12 +25,12 @@ public class OrganisasjonConsumer {
 
     public OrganisasjonConsumer(
             Consumers consumers,
-            TokenExchange tokenExchange) {
+            TokenExchange tokenExchange,
+            WebClient.Builder webClientBuilder) {
 
         serverProperties = consumers.getTestnavOrganisasjonService();
         this.tokenExchange = tokenExchange;
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/...e/testnav/genererarbeidsforholdpopulasjonservice/consumer/SyntArbeidsforholdConsumer.java b/...e/testnav/genererarbeidsforholdpopulasjonservice/consumer/SyntArbeidsforholdConsumer.java
@@ -28,13 +28,13 @@ public class SyntArbeidsforholdConsumer {
     public SyntArbeidsforholdConsumer(
             TokenExchange tokenExchange,
             Consumers consumers,
-            ObjectMapper objectMapper) {
+            ObjectMapper objectMapper,
+            WebClient.Builder webClientBuilder) {
 
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getSyntAmelding();
         this.objectMapper = objectMapper;
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .codecs(clientDefaultCodecsConfigurer -> {
                     clientDefaultCodecsConfigurer

diff --git a/...v/registre/testnav/genererorganisasjonpopulasjonservice/consumer/GenererNavnConsumer.java b/...v/registre/testnav/genererorganisasjonpopulasjonservice/consumer/GenererNavnConsumer.java
@@ -17,11 +17,12 @@ public class GenererNavnConsumer {
 
     public GenererNavnConsumer(
             Consumers consumers,
-            TokenExchange tokenExchange) {
+            TokenExchange tokenExchange,
+            WebClient.Builder webClientBuilder) {
+
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getGenererNavnService();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/...nav/registre/testnav/genererorganisasjonpopulasjonservice/consumer/OrgnummerConsumer.java b/...nav/registre/testnav/genererorganisasjonpopulasjonservice/consumer/OrgnummerConsumer.java
@@ -16,11 +16,12 @@ public class OrgnummerConsumer {
 
     public OrgnummerConsumer(
             Consumers consumers,
-            TokenExchange tokenExchange) {
+            TokenExchange tokenExchange,
+            WebClient.Builder webClientBuilder) {
+
         serverProperties = consumers.getTestnavOrgnummerService();
         this.tokenExchange = tokenExchange;
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }

diff --git a/...a/no/nav/registre/testnorge/generersyntameldingservice/consumer/SyntAmeldingConsumer.java b/...a/no/nav/registre/testnorge/generersyntameldingservice/consumer/SyntAmeldingConsumer.java
@@ -22,11 +22,12 @@ public class SyntAmeldingConsumer {
     private final TokenExchange tokenExchange;
 
     public SyntAmeldingConsumer(TokenExchange tokenExchange,
-                                Consumers consumers) {
+                                Consumers consumers,
+                                WebClient.Builder webClientBuilder) {
+
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getSyntAmelding();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .exchangeStrategies(
                         ExchangeStrategies
                                 .builder()

diff --git a/...src/main/java/no/nav/registre/testnav/inntektsmeldingservice/consumer/DokmotConsumer.java b/...src/main/java/no/nav/registre/testnav/inntektsmeldingservice/consumer/DokmotConsumer.java
@@ -27,11 +27,12 @@ public class DokmotConsumer {
 
     public DokmotConsumer(
             Consumers consumers,
-            TokenExchange tokenExchange) {
+            TokenExchange tokenExchange,
+            WebClient.Builder webClientBuilder) {
+
         this.tokenExchange = tokenExchange;
         serverProperties = consumers.getTestnavDokarkivProxy();
-        this.webClient = WebClient
-                .builder()
+        this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }