Skip to content

Commit 0fa7790

Browse files
krharumkrharum
committed
Merge branch 'master' into feature/tps-messaging-legge-til-kilde-i-prolog
2 parents 3550757 + b64e52d commit 0fa7790

File tree

149 files changed

+1123
-1633
lines changed

Some content is hidden

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

149 files changed

+1123
-1633
lines changed

‎.github/workflows/proxy.arbeidsplassencv-proxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: ./.github/workflows/common.workflow.backend.yml
1616
with:
1717
working-directory: "proxies/arbeidsplassencv-proxy"
18-
deploy-tag: "#deploy-arbeidsplassencv-proxy"
18+
deploy-tag: "#deploy-proxy"
1919
permissions:
2020
contents: read
2121
id-token: write

‎.github/workflows/proxy.inst-proxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
cluster: "dev-fss"
1616
working-directory: "proxies/inst-proxy"
17-
deploy-tag: "#deploy-inst-proxy"
17+
deploy-tag: "#deploy-proxy"
1818
permissions:
1919
contents: read
2020
id-token: write

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

Lines changed: 3 additions & 2 deletions
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.TestnavLogbackLayout"/>
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

Lines changed: 2 additions & 1 deletion
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.TestnavLogbackLayout"/>
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

Lines changed: 2 additions & 1 deletion
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.TestnavLogbackLayout"/>
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

Lines changed: 2 additions & 1 deletion
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.TestnavLogbackLayout"/>
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

Lines changed: 2 additions & 1 deletion
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.TestnavLogbackLayout"/>
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

Lines changed: 2 additions & 1 deletion
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.TestnavLogbackLayout"/>
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

Lines changed: 4 additions & 2 deletions
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.TestnavLogbackLayout"/>
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.reactivecore.logging.TestnavLogbackLayout"/>
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

Lines changed: 2 additions & 1 deletion
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.TestnavLogbackLayout"/>
67
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
78
<rootCauseFirst>true</rootCauseFirst>
89
<maxDepthPerThrowable>256</maxDepthPerThrowable>

‎apps/dolly-backend/config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ spec:
2323
- application: testnav-oversikt-frontend
2424
- application: etterlatte-testdata
2525
namespace: etterlatte
26-
- application: statuspoll
27-
namespace: navdig
2826
outbound:
2927
rules:
3028
- application: generer-navn-service

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

Lines changed: 8 additions & 8 deletions
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 renamed to ‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java

Lines changed: 5 additions & 4 deletions
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

Lines changed: 2 additions & 34 deletions
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/java/no/nav/dolly/service/MalBestillingService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import no.nav.testnav.libs.servletsecurity.action.GetUserInfo;
1818
import org.apache.commons.collections4.IterableUtils;
1919
import org.apache.commons.lang3.StringUtils;
20+
import org.springframework.cache.CacheManager;
2021
import org.springframework.http.HttpStatus;
2122
import org.springframework.stereotype.Service;
2223
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,7 @@
3334

3435
import static java.util.Objects.isNull;
3536
import static java.util.Objects.nonNull;
37+
import static no.nav.dolly.config.CachingConfig.CACHE_BESTILLING_MAL;
3638
import static no.nav.dolly.util.CurrentAuthentication.getUserId;
3739

3840
@Service
@@ -49,6 +51,7 @@ public class MalBestillingService {
4951
private final MapperFacade mapperFacade;
5052
private final GetUserInfo getUserInfo;
5153
private final ObjectMapper objectMapper;
54+
private final CacheManager cacheManager;
5255

5356
@Transactional(readOnly = true)
5457
public RsMalBestillingWrapper getMalBestillinger() {
@@ -138,6 +141,8 @@ public void saveBestillingMal(Bestilling bestilling, String malNavn, Bruker bruk
138141
oppdateEksisterende.setBestKriterier(bestilling.getBestKriterier());
139142
oppdateEksisterende.setMiljoer(bestilling.getMiljoer());
140143
}
144+
145+
cacheManager.getCache(CACHE_BESTILLING_MAL).clear();
141146
}
142147

143148
@Transactional

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

Lines changed: 8 additions & 7 deletions
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.TestnavLogbackLayout"/>
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/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export const GjenopprettPerson = ({ ident }: GjenopprettProps) => {
8888
return (
8989
<>
9090
<Button onClick={openGjenopprettModal} kind="synchronize">
91-
GJENOPPRETT PERSON
91+
GJENOPPRETT
9292
</Button>
9393
{isGjenopprettModalOpen && (
9494
<GjenopprettModal

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

Lines changed: 2 additions & 2 deletions
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/bestillingsveileder/Bestillingsveileder.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => {
1414
const navigate = useNavigate()
1515
const [showError, setShowError] = useState(false)
1616
const [navigateRoot, setNavigateRoot] = useState(false)
17-
const { gruppeId, personId } = useParams()
17+
const { gruppeId } = useParams()
1818
const erOrganisasjon = location?.state?.opprettOrganisasjon
1919
const importPersoner = location?.state?.importPersoner
2020

@@ -46,7 +46,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => {
4646
return null
4747
}
4848

49-
const options = BVOptions(location.state, gruppeId, personId)
49+
const options = BVOptions(location.state, gruppeId)
5050
const handleSubmit = (values) => {
5151
sendBestilling(values, options, gruppeId, navigate)
5252
}

0 commit comments

Comments
 (0)