Skip to content

Commit 75b7768

Browse files
stigusstigus
committed
Endret en god del av oppsettet for henting av identer og logging i endringsmelding løypa
#deploy-endringsmelding-frontend #deploy-endringsmelding-service #deploy-tps-messaging-service #deploy-test-frontend
1 parent f6c2954 commit 75b7768

File tree

87 files changed

+283
-219
lines changed

Some content is hidden

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

87 files changed

+283
-219
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -35,5 +35,5 @@
3535
<appender-ref ref="CONSOLE"/>
3636
</root>
3737
</springProfile>
38-
<logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
38+
<logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
3939
</configuration>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +24,7 @@
2424

2525
<springProfile name="dev">
2626
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
27-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
27+
<encoder class="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
2828
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
2929
<rootCauseFirst>true</rootCauseFirst>
3030
<maxDepthPerThrowable>256</maxDepthPerThrowable>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<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

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java ‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java

+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/resources/logback-spring.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,10 +37,10 @@
3737
</root>
3838
</springProfile>
3939

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" />
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"/>
4646
</configuration>

‎apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx

+8-7
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
}

‎apps/dolly-frontend/src/main/resources/logback-spring.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<springProfile name="prod,dev,idporten">
44
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
5+
<encoder class="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

‎apps/dollystatus/src/main/resources/logback-spring.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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="no.nav.testnav.libs.commands.utils.DollyLogbackEncoder">
66
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
77
<rootCauseFirst>true</rootCauseFirst>
88
<maxDepthPerThrowable>256</maxDepthPerThrowable>

0 commit comments

Comments
 (0)