Merge branch 'master' into feature/testnorge-PDL-oppdateringer

navikt · Apr 18, 2024 · 80da00b · 80da00b
2 parents d25fa96 + 1333bec
commit 80da00b
Show file tree

Hide file tree

Showing 125 changed files with 1,010 additions and 1,543 deletions.
diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -35,5 +36,5 @@
             <appender-ref ref="CONSOLE"/>
         </root>
     </springProfile>
-    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
+    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
 </configuration>
diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +25,8 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/...ckend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java b/...ckend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java
@@ -5,7 +5,7 @@
 import no.nav.dolly.bestilling.ConsumerStatus;
 import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattDeleteCommand;
 import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattPostCommand;
-import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonGetCommand;
+import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonHentCommand;
 import no.nav.dolly.bestilling.tpsmessagingservice.command.TpsMessagingPostCommand;
 import no.nav.dolly.config.Consumers;
 import no.nav.dolly.metrics.Timed;
@@ -52,7 +52,7 @@ public TpsMessagingConsumer(
                 .build();
     }
 
-    @Timed(name = "providers", tags = {"operation", "tps_messaging_createUtenlandskBankkonto"})
+    @Timed(name = "providers", tags = { "operation", "tps_messaging_createUtenlandskBankkonto" })
     public Flux<TpsMeldingResponseDTO> sendUtenlandskBankkontoRequest(String ident, List<String> miljoer,
                                                                       BankkontonrUtlandDTO body) {
 
@@ -61,42 +61,42 @@ public Flux<TpsMeldingResponseDTO> sendUtenlandskBankkontoRequest(String ident,
                         new TpsMessagingPostCommand(webClient, ident, miljoer, body, UTENLANDSK_BANKKONTO_URL, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = {"operation", "tps_messaging_createNorskBankkonto"})
+    @Timed(name = "providers", tags = { "operation", "tps_messaging_createNorskBankkonto" })
     public Flux<TpsMeldingResponseDTO> sendNorskBankkontoRequest(String ident, List<String> miljoer, BankkontonrNorskDTO body) {
 
         return tokenService.exchange(serverProperties)
                 .flatMapMany(token ->
                         new TpsMessagingPostCommand(webClient, ident, miljoer, body, NORSK_BANKKONTO_URL, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = {"operation", "tps_messaging_createSkjerming"})
+    @Timed(name = "providers", tags = { "operation", "tps_messaging_createSkjerming" })
     public Flux<TpsMeldingResponseDTO> sendEgenansattRequest(String ident, List<String> miljoer, LocalDate fraOgMed) {
 
         return tokenService.exchange(serverProperties)
                 .flatMapMany(token ->
                         new EgenansattPostCommand(webClient, ident, miljoer, fraOgMed, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = {"operation", "tps_messaging_deleteSkjerming"})
+    @Timed(name = "providers", tags = { "operation", "tps_messaging_deleteSkjerming" })
     public Flux<TpsMeldingResponseDTO> deleteEgenansattRequest(String ident, List<String> miljoer) {
 
         return tokenService.exchange(serverProperties)
                 .flatMapMany(token -> new EgenansattDeleteCommand(webClient, ident, miljoer, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = {"operation", "tps_messaging_createSpraakkode"})
+    @Timed(name = "providers", tags = { "operation", "tps_messaging_createSpraakkode" })
     public Flux<TpsMeldingResponseDTO> sendSpraakkodeRequest(String ident, List<String> miljoer, SpraakDTO body) {
 
         return tokenService.exchange(serverProperties)
                 .flatMapMany(token ->
                         new TpsMessagingPostCommand(webClient, ident, miljoer, body, SPRAAKKODE_URL, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = {"operation", "tps_messaging_getPerson"})
+    @Timed(name = "providers", tags = { "operation", "tps_messaging_getPerson" })
     public Flux<PersonMiljoeDTO> getPerson(String ident, List<String> miljoer) {
 
         return tokenService.exchange(serverProperties)
-                .flatMapMany(token -> new PersonGetCommand(webClient, ident, miljoer, token.getTokenValue()).call());
+                .flatMapMany(token -> new PersonHentCommand(webClient, ident, miljoer, token.getTokenValue()).call());
     }
 
     @Override

diff --git a/...gingservice/command/PersonGetCommand.java → ...ingservice/command/PersonHentCommand.java b/...gingservice/command/PersonGetCommand.java → ...ingservice/command/PersonHentCommand.java
@@ -14,10 +14,10 @@
 
 @RequiredArgsConstructor
 @Slf4j
-public class PersonGetCommand implements Callable<Flux<PersonMiljoeDTO>> {
+public class PersonHentCommand implements Callable<Flux<PersonMiljoeDTO>> {
 
     private static final String MILJOER_PARAM = "miljoer";
-    private static final String PERSONER_URL = "/api/v1/personer/{ident}";
+    private static final String PERSONER_URL = "/api/v2/personer/ident";
 
     private final WebClient webClient;
     private final String ident;
@@ -27,11 +27,12 @@ public class PersonGetCommand implements Callable<Flux<PersonMiljoeDTO>> {
     @Override
     public Flux<PersonMiljoeDTO> call() {
 
-        return webClient.get()
+        return webClient.post()
                 .uri(uriBuilder -> uriBuilder
                         .path(PERSONER_URL)
                         .queryParam(MILJOER_PARAM, miljoer)
-                        .build(ident))
+                        .build())
+                .bodyValue(ident)
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .retrieve()
                 .bodyToFlux(PersonMiljoeDTO.class)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java
@@ -1,23 +1,21 @@
 package no.nav.dolly.domain;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import static java.util.Objects.isNull;
-
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class PdlPersonBolk {
 
     private Data data;
-    private Extensions extensions;
+    private JsonNode extensions;
 
     @lombok.Data
     @Builder
@@ -30,36 +28,6 @@ public static class Data {
         private List<IdenterBolk> hentIdenterBolk;
     }
 
-    @lombok.Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Extensions {
-
-        private List<Warning> warnings;
-
-        public List<Warning> getWarnings() {
-
-            if (isNull(warnings)) {
-                warnings = new ArrayList<>();
-            }
-            return warnings;
-        }
-    }
-
-    @lombok.Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Warning {
-
-        private String code;
-        private String details;
-        private String id;
-        private String message;
-        private String query;
-    }
-
     @lombok.Data
     @Builder
     @NoArgsConstructor

diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,10 +38,10 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
-    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
-    <logger level="TRACE" name="org.jetbrains.nativecerts" />
-    <logger level="TRACE" name="com.intellij.util.net.ssl" />
-    <logger level="ERROR" name="reactor.netty.transport.TransportConnector" />
-    <logger level="DEBUG" name="reactor.netty.http.client.HttpClient" />
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
+    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
+    <logger level="TRACE" name="org.jetbrains.nativecerts"/>
+    <logger level="TRACE" name="com.intellij.util.net.ssl"/>
+    <logger level="ERROR" name="reactor.netty.transport.TransportConnector"/>
+    <logger level="DEBUG" name="reactor.netty.http.client.HttpClient"/>
 </configuration>
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -131,4 +131,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
                         .filters(filter, addUserJwtHeaderFilter())
                 ).uri(host);
     }
-}
+}
diff --git a/.../dolly-frontend/src/main/js/src/components/bestilling/sammendrag/BestillingSammendrag.tsx b/.../dolly-frontend/src/main/js/src/components/bestilling/sammendrag/BestillingSammendrag.tsx
@@ -19,8 +19,8 @@ export default function BestillingSammendrag({ bestilling }) {
 						sistOppdatert: bestilling.sistOppdatert,
 						opprettetFraId: bestilling.opprettetFraId,
 						opprettetFraGruppeId: bestilling.opprettetFraGruppeId,
-						navSyntetiskIdent: bestilling.bestilling.pdldata?.opprettNyPerson?.syntetisk,
-						beskrivelse: bestilling.bestilling.beskrivelse,
+						navSyntetiskIdent: bestilling?.bestilling?.pdldata?.opprettNyPerson?.syntetisk,
+						beskrivelse: bestilling?.bestilling?.beskrivelse,
 					}}
 					header="Bestillingskriterier"
 				/>

diff --git a/...-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx b/...-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx
@@ -68,7 +68,7 @@ export const ArbeidsforholdForm = ({
 
 		const aaregBestillinger = bestillinger
 			?.filter((bestilling) => bestilling?.data?.aareg)
-			?.flatMap((bestilling) => bestilling.data.aareg)
+			?.flatMap((bestilling) => bestilling.data?.aareg)
 			?.filter((bestilling) => _.isEmpty(bestilling?.amelding))
 
 		return _.uniqWith(

diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx
@@ -159,10 +159,10 @@ const ingenOverlappFraTildato = (tildato, values) => {
 
 	if (values.tidligereBestillinger) {
 		const arenaBestillinger = values.tidligereBestillinger.filter((bestilling) =>
-			bestilling.data.hasOwnProperty('arenaforvalter'),
+			bestilling.data?.hasOwnProperty('arenaforvalter'),
 		)
 		for (let bestilling of arenaBestillinger) {
-			let arenaInfo = bestilling.data.arenaforvalter
+			let arenaInfo = bestilling.data?.arenaforvalter
 			for (let key of ikkeOverlappendeVedtak) {
 				if (arenaInfo[key]?.length > 0) {
 					const fraDatoBestilling = arenaInfo[key]?.[0]?.fraDato

diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx
@@ -130,8 +130,8 @@ InntektsmeldingVisning.filterValues = (bestillinger: Array<Bestilling>, ident: s
 
 	return bestillinger.filter(
 		(bestilling: any) =>
-			bestilling.data.inntektsmelding &&
-			!tomBestilling(bestilling.data.inntektsmelding.inntekter) &&
+			bestilling.data?.inntektsmelding &&
+			!tomBestilling(bestilling.data?.inntektsmelding.inntekter) &&
 			erGyldig(bestilling.id, 'INNTKMELD', ident),
 	)
 }

diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx
@@ -114,6 +114,6 @@ SykemeldingVisning.filterValues = (bestillinger: Array<Sykemelding>, ident: stri
 
 	return bestillinger.filter(
 		(bestilling: any) =>
-			bestilling.data.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident),
+			bestilling.data?.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident),
 	)
 }
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
@@ -514,7 +514,7 @@ export default ({
 				<KrrVisning data={krrstub} loading={loading.krrstub} />
 				<MedlVisning data={medl} loading={loadingMedl} />
 				<UdiVisning
-					data={UdiVisning.filterValues(udistub, bestilling?.bestilling.udistub)}
+					data={UdiVisning.filterValues(udistub, bestilling?.bestilling?.udistub)}
 					loading={loadingUdistub}
 				/>
 				<DokarkivVisning

diff --git a/apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx
@@ -1,21 +1,22 @@
 import Request from '@/service/services/Request'
 
-const TPS_MESSAGING_URL = `/testnav-tps-messaging-service/api/v1/personer`
+const TPS_MESSAGING_URL_V1 = `/testnav-tps-messaging-service/api/v1/personer`
+const TPS_MESSAGING_URL_V2 = `/testnav-tps-messaging-service/api/v2/personer`
 
-const getTpsMessagingUrl = (ident, miljoe) => `${TPS_MESSAGING_URL}/${ident}?miljoer=${miljoe}`
-const getTpsMessagingUrlAllEnvs = (ident) => `${TPS_MESSAGING_URL}/${ident}`
+const getTpsMessagingUrl_V2 = (miljoe) => `${TPS_MESSAGING_URL_V2}/ident?miljoer=${miljoe}`
+const getTpsMessagingUrlAllEnvs_V2 = () => `${TPS_MESSAGING_URL_V2}/ident`
 
 export default {
 	getTpsPersonInfo(ident, miljoe) {
-		return Request.get(getTpsMessagingUrl(ident, miljoe))
+		return Request.post(getTpsMessagingUrl_V2(miljoe), ident)
 	},
 	getTpsPersonInfoAllEnvs(ident) {
-		return Request.get(getTpsMessagingUrlAllEnvs(ident))
+		return Request.post(getTpsMessagingUrlAllEnvs_V2(), ident)
 	},
 	deleteBankkontoNorsk(ident) {
-		return Request.delete(`${TPS_MESSAGING_URL}/${ident}/bankkonto-norsk`)
+		return Request.delete(`${TPS_MESSAGING_URL_V1}/${ident}/bankkonto-norsk`)
 	},
 	deleteBankkontoUtenlandsk(ident) {
-		return Request.delete(`${TPS_MESSAGING_URL}/${ident}/bankkonto-utenlandsk`)
+		return Request.delete(`${TPS_MESSAGING_URL_V1}/${ident}/bankkonto-utenlandsk`)
 	},
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                             .filters(filter, addUserJwtHeaderFilter())
                     ).uri(host);
         }
-    }
+    }