Merge branch 'master' into feature/tps-messaging-legge-til-kilde-i-pr…

…olog
navikt · Apr 24, 2024 · 0fa7790 · 0fa7790
2 parents 3550757 + b64e52d
commit 0fa7790
Show file tree

Hide file tree

Showing 149 changed files with 1,123 additions and 1,633 deletions.
diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-arbeidsplassencv-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inst-proxy"
-      deploy-tag: "#deploy-inst-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

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.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <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.reactivecore.logging.TestnavLogbackLayout"/>
                 <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.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -23,8 +23,6 @@ spec:
         - application: testnav-oversikt-frontend
         - application: etterlatte-testdata
           namespace: etterlatte
-        - application: statuspoll
-          namespace: navdig
     outbound:
       rules:
         - application: generer-navn-service

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/java/no/nav/dolly/service/MalBestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java
@@ -17,6 +17,7 @@
 import no.nav.testnav.libs.servletsecurity.action.GetUserInfo;
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.CacheManager;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,7 @@
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
+import static no.nav.dolly.config.CachingConfig.CACHE_BESTILLING_MAL;
 import static no.nav.dolly.util.CurrentAuthentication.getUserId;
 
 @Service
@@ -49,6 +51,7 @@ public class MalBestillingService {
     private final MapperFacade mapperFacade;
     private final GetUserInfo getUserInfo;
     private final ObjectMapper objectMapper;
+    private final CacheManager cacheManager;
 
     @Transactional(readOnly = true)
     public RsMalBestillingWrapper getMalBestillinger() {
@@ -138,6 +141,8 @@ public void saveBestillingMal(Bestilling bestilling, String malNavn, Bruker bruk
             oppdateEksisterende.setBestKriterier(bestilling.getBestKriterier());
             oppdateEksisterende.setMiljoer(bestilling.getMiljoer());
         }
+
+        cacheManager.getCache(CACHE_BESTILLING_MAL).clear();
     }
 
     @Transactional

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.TestnavLogbackLayout"/>
                 <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/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx
@@ -88,7 +88,7 @@ export const GjenopprettPerson = ({ ident }: GjenopprettProps) => {
 	return (
 		<>
 			<Button onClick={openGjenopprettModal} kind="synchronize">
-				GJENOPPRETT PERSON
+				GJENOPPRETT
 			</Button>
 			{isGjenopprettModalOpen && (
 				<GjenopprettModal

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/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/Bestillingsveileder.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/Bestillingsveileder.tsx
@@ -14,7 +14,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => {
 	const navigate = useNavigate()
 	const [showError, setShowError] = useState(false)
 	const [navigateRoot, setNavigateRoot] = useState(false)
-	const { gruppeId, personId } = useParams()
+	const { gruppeId } = useParams()
 	const erOrganisasjon = location?.state?.opprettOrganisasjon
 	const importPersoner = location?.state?.importPersoner
 
@@ -46,7 +46,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => {
 		return null
 	}
 
-	const options = BVOptions(location.state, gruppeId, personId)
+	const options = BVOptions(location.state, gruppeId)
 	const handleSubmit = (values) => {
 		sendBestilling(values, options, gruppeId, navigate)
 	}