Skip to content

Commit 8053048

Browse files
committed
Merge branch 'refs/heads/master' into feature/tenor-organisasjon-soek
2 parents 64f6900 + 1333bec commit 8053048

File tree

125 files changed

+1010
-1543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1010
-1543
lines changed

apps/adresse-service/src/main/resources/logback-spring.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -35,5 +36,5 @@
3536
<appender-ref ref="CONSOLE"/>
3637
</root>
3738
</springProfile>
38-
<logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
39+
<logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
3940
</configuration>

apps/amelding-service/src/main/resources/logback-spring.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/arbeidsforhold-service/src/main/resources/logback-spring.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/batch-bestilling-service/src/main/resources/logback-spring.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/brreg-stub/src/main/resources/logback-spring.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/bruker-service/src/main/resources/logback-spring.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +25,8 @@
2425

2526
<springProfile name="dev">
2627
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
27-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
28+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
29+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
2830
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
2931
<rootCauseFirst>true</rootCauseFirst>
3032
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/budpro-service/src/main/resources/logback-spring.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod,dev">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import no.nav.dolly.bestilling.ConsumerStatus;
66
import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattDeleteCommand;
77
import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattPostCommand;
8-
import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonGetCommand;
8+
import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonHentCommand;
99
import no.nav.dolly.bestilling.tpsmessagingservice.command.TpsMessagingPostCommand;
1010
import no.nav.dolly.config.Consumers;
1111
import no.nav.dolly.metrics.Timed;
@@ -52,7 +52,7 @@ public TpsMessagingConsumer(
5252
.build();
5353
}
5454

55-
@Timed(name = "providers", tags = {"operation", "tps_messaging_createUtenlandskBankkonto"})
55+
@Timed(name = "providers", tags = { "operation", "tps_messaging_createUtenlandskBankkonto" })
5656
public Flux<TpsMeldingResponseDTO> sendUtenlandskBankkontoRequest(String ident, List<String> miljoer,
5757
BankkontonrUtlandDTO body) {
5858

@@ -61,42 +61,42 @@ public Flux<TpsMeldingResponseDTO> sendUtenlandskBankkontoRequest(String ident,
6161
new TpsMessagingPostCommand(webClient, ident, miljoer, body, UTENLANDSK_BANKKONTO_URL, token.getTokenValue()).call());
6262
}
6363

64-
@Timed(name = "providers", tags = {"operation", "tps_messaging_createNorskBankkonto"})
64+
@Timed(name = "providers", tags = { "operation", "tps_messaging_createNorskBankkonto" })
6565
public Flux<TpsMeldingResponseDTO> sendNorskBankkontoRequest(String ident, List<String> miljoer, BankkontonrNorskDTO body) {
6666

6767
return tokenService.exchange(serverProperties)
6868
.flatMapMany(token ->
6969
new TpsMessagingPostCommand(webClient, ident, miljoer, body, NORSK_BANKKONTO_URL, token.getTokenValue()).call());
7070
}
7171

72-
@Timed(name = "providers", tags = {"operation", "tps_messaging_createSkjerming"})
72+
@Timed(name = "providers", tags = { "operation", "tps_messaging_createSkjerming" })
7373
public Flux<TpsMeldingResponseDTO> sendEgenansattRequest(String ident, List<String> miljoer, LocalDate fraOgMed) {
7474

7575
return tokenService.exchange(serverProperties)
7676
.flatMapMany(token ->
7777
new EgenansattPostCommand(webClient, ident, miljoer, fraOgMed, token.getTokenValue()).call());
7878
}
7979

80-
@Timed(name = "providers", tags = {"operation", "tps_messaging_deleteSkjerming"})
80+
@Timed(name = "providers", tags = { "operation", "tps_messaging_deleteSkjerming" })
8181
public Flux<TpsMeldingResponseDTO> deleteEgenansattRequest(String ident, List<String> miljoer) {
8282

8383
return tokenService.exchange(serverProperties)
8484
.flatMapMany(token -> new EgenansattDeleteCommand(webClient, ident, miljoer, token.getTokenValue()).call());
8585
}
8686

87-
@Timed(name = "providers", tags = {"operation", "tps_messaging_createSpraakkode"})
87+
@Timed(name = "providers", tags = { "operation", "tps_messaging_createSpraakkode" })
8888
public Flux<TpsMeldingResponseDTO> sendSpraakkodeRequest(String ident, List<String> miljoer, SpraakDTO body) {
8989

9090
return tokenService.exchange(serverProperties)
9191
.flatMapMany(token ->
9292
new TpsMessagingPostCommand(webClient, ident, miljoer, body, SPRAAKKODE_URL, token.getTokenValue()).call());
9393
}
9494

95-
@Timed(name = "providers", tags = {"operation", "tps_messaging_getPerson"})
95+
@Timed(name = "providers", tags = { "operation", "tps_messaging_getPerson" })
9696
public Flux<PersonMiljoeDTO> getPerson(String ident, List<String> miljoer) {
9797

9898
return tokenService.exchange(serverProperties)
99-
.flatMapMany(token -> new PersonGetCommand(webClient, ident, miljoer, token.getTokenValue()).call());
99+
.flatMapMany(token -> new PersonHentCommand(webClient, ident, miljoer, token.getTokenValue()).call());
100100
}
101101

102102
@Override
+5-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
@RequiredArgsConstructor
1616
@Slf4j
17-
public class PersonGetCommand implements Callable<Flux<PersonMiljoeDTO>> {
17+
public class PersonHentCommand implements Callable<Flux<PersonMiljoeDTO>> {
1818

1919
private static final String MILJOER_PARAM = "miljoer";
20-
private static final String PERSONER_URL = "/api/v1/personer/{ident}";
20+
private static final String PERSONER_URL = "/api/v2/personer/ident";
2121

2222
private final WebClient webClient;
2323
private final String ident;
@@ -27,11 +27,12 @@ public class PersonGetCommand implements Callable<Flux<PersonMiljoeDTO>> {
2727
@Override
2828
public Flux<PersonMiljoeDTO> call() {
2929

30-
return webClient.get()
30+
return webClient.post()
3131
.uri(uriBuilder -> uriBuilder
3232
.path(PERSONER_URL)
3333
.queryParam(MILJOER_PARAM, miljoer)
34-
.build(ident))
34+
.build())
35+
.bodyValue(ident)
3536
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
3637
.retrieve()
3738
.bodyToFlux(PersonMiljoeDTO.class)

apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java

+2-34
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
package no.nav.dolly.domain;
22

3+
import com.fasterxml.jackson.databind.JsonNode;
34
import lombok.AllArgsConstructor;
45
import lombok.Builder;
56
import lombok.Data;
67
import lombok.NoArgsConstructor;
78

8-
import java.util.ArrayList;
99
import java.util.List;
1010

11-
import static java.util.Objects.isNull;
12-
1311
@Data
1412
@Builder
1513
@NoArgsConstructor
1614
@AllArgsConstructor
1715
public class PdlPersonBolk {
1816

1917
private Data data;
20-
private Extensions extensions;
18+
private JsonNode extensions;
2119

2220
@lombok.Data
2321
@Builder
@@ -30,36 +28,6 @@ public static class Data {
3028
private List<IdenterBolk> hentIdenterBolk;
3129
}
3230

33-
@lombok.Data
34-
@Builder
35-
@NoArgsConstructor
36-
@AllArgsConstructor
37-
public static class Extensions {
38-
39-
private List<Warning> warnings;
40-
41-
public List<Warning> getWarnings() {
42-
43-
if (isNull(warnings)) {
44-
warnings = new ArrayList<>();
45-
}
46-
return warnings;
47-
}
48-
}
49-
50-
@lombok.Data
51-
@Builder
52-
@NoArgsConstructor
53-
@AllArgsConstructor
54-
public static class Warning {
55-
56-
private String code;
57-
private String details;
58-
private String id;
59-
private String message;
60-
private String query;
61-
}
62-
6331
@lombok.Data
6432
@Builder
6533
@NoArgsConstructor

apps/dolly-backend/src/main/resources/logback-spring.xml

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<springProfile name="prod,dev">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
6+
<layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,10 +38,10 @@
3738
</root>
3839
</springProfile>
3940

40-
<logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
41-
<logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
42-
<logger level="TRACE" name="org.jetbrains.nativecerts" />
43-
<logger level="TRACE" name="com.intellij.util.net.ssl" />
44-
<logger level="ERROR" name="reactor.netty.transport.TransportConnector" />
45-
<logger level="DEBUG" name="reactor.netty.http.client.HttpClient" />
41+
<logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
42+
<logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
43+
<logger level="TRACE" name="org.jetbrains.nativecerts"/>
44+
<logger level="TRACE" name="com.intellij.util.net.ssl"/>
45+
<logger level="ERROR" name="reactor.netty.transport.TransportConnector"/>
46+
<logger level="DEBUG" name="reactor.netty.http.client.HttpClient"/>
4647
</configuration>

apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
131131
.filters(filter, addUserJwtHeaderFilter())
132132
).uri(host);
133133
}
134-
}
134+
}

apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/BestillingSammendrag.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export default function BestillingSammendrag({ bestilling }) {
1919
sistOppdatert: bestilling.sistOppdatert,
2020
opprettetFraId: bestilling.opprettetFraId,
2121
opprettetFraGruppeId: bestilling.opprettetFraGruppeId,
22-
navSyntetiskIdent: bestilling.bestilling.pdldata?.opprettNyPerson?.syntetisk,
23-
beskrivelse: bestilling.bestilling.beskrivelse,
22+
navSyntetiskIdent: bestilling?.bestilling?.pdldata?.opprettNyPerson?.syntetisk,
23+
beskrivelse: bestilling?.bestilling?.beskrivelse,
2424
}}
2525
header="Bestillingskriterier"
2626
/>

apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const ArbeidsforholdForm = ({
6868

6969
const aaregBestillinger = bestillinger
7070
?.filter((bestilling) => bestilling?.data?.aareg)
71-
?.flatMap((bestilling) => bestilling.data.aareg)
71+
?.flatMap((bestilling) => bestilling.data?.aareg)
7272
?.filter((bestilling) => _.isEmpty(bestilling?.amelding))
7373

7474
return _.uniqWith(

apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ const ingenOverlappFraTildato = (tildato, values) => {
159159

160160
if (values.tidligereBestillinger) {
161161
const arenaBestillinger = values.tidligereBestillinger.filter((bestilling) =>
162-
bestilling.data.hasOwnProperty('arenaforvalter'),
162+
bestilling.data?.hasOwnProperty('arenaforvalter'),
163163
)
164164
for (let bestilling of arenaBestillinger) {
165-
let arenaInfo = bestilling.data.arenaforvalter
165+
let arenaInfo = bestilling.data?.arenaforvalter
166166
for (let key of ikkeOverlappendeVedtak) {
167167
if (arenaInfo[key]?.length > 0) {
168168
const fraDatoBestilling = arenaInfo[key]?.[0]?.fraDato

apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ InntektsmeldingVisning.filterValues = (bestillinger: Array<Bestilling>, ident: s
130130

131131
return bestillinger.filter(
132132
(bestilling: any) =>
133-
bestilling.data.inntektsmelding &&
134-
!tomBestilling(bestilling.data.inntektsmelding.inntekter) &&
133+
bestilling.data?.inntektsmelding &&
134+
!tomBestilling(bestilling.data?.inntektsmelding.inntekter) &&
135135
erGyldig(bestilling.id, 'INNTKMELD', ident),
136136
)
137137
}

apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ SykemeldingVisning.filterValues = (bestillinger: Array<Sykemelding>, ident: stri
114114

115115
return bestillinger.filter(
116116
(bestilling: any) =>
117-
bestilling.data.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident),
117+
bestilling.data?.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident),
118118
)
119119
}

apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ export default ({
514514
<KrrVisning data={krrstub} loading={loading.krrstub} />
515515
<MedlVisning data={medl} loading={loadingMedl} />
516516
<UdiVisning
517-
data={UdiVisning.filterValues(udistub, bestilling?.bestilling.udistub)}
517+
data={UdiVisning.filterValues(udistub, bestilling?.bestilling?.udistub)}
518518
loading={loadingUdistub}
519519
/>
520520
<DokarkivVisning
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import Request from '@/service/services/Request'
22

3-
const TPS_MESSAGING_URL = `/testnav-tps-messaging-service/api/v1/personer`
3+
const TPS_MESSAGING_URL_V1 = `/testnav-tps-messaging-service/api/v1/personer`
4+
const TPS_MESSAGING_URL_V2 = `/testnav-tps-messaging-service/api/v2/personer`
45

5-
const getTpsMessagingUrl = (ident, miljoe) => `${TPS_MESSAGING_URL}/${ident}?miljoer=${miljoe}`
6-
const getTpsMessagingUrlAllEnvs = (ident) => `${TPS_MESSAGING_URL}/${ident}`
6+
const getTpsMessagingUrl_V2 = (miljoe) => `${TPS_MESSAGING_URL_V2}/ident?miljoer=${miljoe}`
7+
const getTpsMessagingUrlAllEnvs_V2 = () => `${TPS_MESSAGING_URL_V2}/ident`
78

89
export default {
910
getTpsPersonInfo(ident, miljoe) {
10-
return Request.get(getTpsMessagingUrl(ident, miljoe))
11+
return Request.post(getTpsMessagingUrl_V2(miljoe), ident)
1112
},
1213
getTpsPersonInfoAllEnvs(ident) {
13-
return Request.get(getTpsMessagingUrlAllEnvs(ident))
14+
return Request.post(getTpsMessagingUrlAllEnvs_V2(), ident)
1415
},
1516
deleteBankkontoNorsk(ident) {
16-
return Request.delete(`${TPS_MESSAGING_URL}/${ident}/bankkonto-norsk`)
17+
return Request.delete(`${TPS_MESSAGING_URL_V1}/${ident}/bankkonto-norsk`)
1718
},
1819
deleteBankkontoUtenlandsk(ident) {
19-
return Request.delete(`${TPS_MESSAGING_URL}/${ident}/bankkonto-utenlandsk`)
20+
return Request.delete(`${TPS_MESSAGING_URL_V1}/${ident}/bankkonto-utenlandsk`)
2021
},
2122
}

0 commit comments

Comments
 (0)