From 3fcccc4456ca07b873305e7027c3c1444ae7499f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Mon, 18 Dec 2023 19:00:45 +0100 Subject: [PATCH 01/13] Feature/inst proxy legge til sikkerhet (#3355) Sikkerhet mot INST lagt til --- .github/workflows/proxy.inst-proxy.yml | 2 +- proxies/inst-proxy/build.gradle | 7 +++-- proxies/inst-proxy/config.yml | 21 ++++++++++++++- proxies/inst-proxy/settings.gradle | 2 ++ .../testnav/proxies/instproxy/Consumers.java | 20 ++++++++++++++ .../InstProxyApplicationStarter.java | 27 ++++++++++++++++--- .../src/main/resources/application.yml | 7 +++++ .../instproxy/ApplicationContextTest.java | 18 +++++++++++++ 8 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/Consumers.java create mode 100644 proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index 007c64c1239..efcf944cc00 100644 --- 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-proxy" + deploy-tag: "#deploy-inst-proxy" permissions: contents: read id-token: write diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 66876700c2a..ddbcad4fd85 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -50,20 +50,23 @@ repositories { dependencies { + implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' + implementation 'no.nav.testnav.libs:reactive-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' - testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 + annotationProcessor 'org.projectlombok:lombok' + implementation 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/inst-proxy/config.yml b/proxies/inst-proxy/config.yml index a761e04cd46..56546597a3d 100644 --- a/proxies/inst-proxy/config.yml +++ b/proxies/inst-proxy/config.yml @@ -1,4 +1,17 @@ -apiVersion: "nais.io/v1alpha1" +--- +apiVersion: nais.io/v1 +kind: AzureAdApplication +metadata: + name: testnav-inst-proxy-trygdeetaten + namespace: dolly + labels: + team: dolly +spec: + secretName: azure-trygdeetaten-testnav-inst-proxy-trygdeetaten + secretKeyPrefix: "AZURE_TRYGDEETATEN" + tenant: trygdeetaten.no +--- +apiVersion: "nais.io/v1alpha1" kind: "Application" metadata: name: testnav-inst-proxy @@ -36,6 +49,10 @@ spec: - application: app-1 namespace: plattformsikkerhet cluster: dev-gcp + outbound: + rules: + - application: opphold-testdata + namespace: team-rocket liveness: path: /internal/isAlive initialDelay: 4 @@ -55,5 +72,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi + envFrom: + - secret: azure-trygdeetaten-testnav-inst-proxy-trygdeetaten ingresses: - "https://testnav-inst-proxy.dev-fss-pub.nais.io" \ No newline at end of file diff --git a/proxies/inst-proxy/settings.gradle b/proxies/inst-proxy/settings.gradle index acfb0900b3d..edc24388518 100644 --- a/proxies/inst-proxy/settings.gradle +++ b/proxies/inst-proxy/settings.gradle @@ -5,8 +5,10 @@ plugins { rootProject.name = 'inst-proxy' +includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' +includeBuild '../../libs/reactive-security' includeBuild '../../libs/data-transfer-objects' gradleEnterprise { diff --git a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/Consumers.java b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/Consumers.java new file mode 100644 index 00000000000..874cbfd96a5 --- /dev/null +++ b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/Consumers.java @@ -0,0 +1,20 @@ +package no.nav.testnav.proxies.instproxy; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +import static lombok.AccessLevel.PACKAGE; + +@Configuration +@ConfigurationProperties(prefix = "consumers") +@NoArgsConstructor(access = PACKAGE) +@Getter +@Setter(PACKAGE) +public class Consumers { + + private ServerProperties inst; +} \ No newline at end of file diff --git a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java index 25cb6073a50..721f71309f0 100644 --- a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java +++ b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java @@ -3,6 +3,11 @@ import no.nav.testnav.libs.reactivecore.config.CoreConfig; import no.nav.testnav.libs.reactiveproxy.config.DevConfig; import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig; +import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory; +import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; +import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange; +import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService; +import no.nav.testnav.libs.securitycore.domain.AccessToken; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.gateway.route.RouteLocator; @@ -13,7 +18,8 @@ @Import({ CoreConfig.class, DevConfig.class, - SecurityConfig.class + SecurityConfig.class, + SecureOAuth2ServerToServerConfiguration.class }) @SpringBootApplication public class InstProxyApplicationStarter { @@ -23,11 +29,24 @@ public static void main(String[] args) { } @Bean - public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { - return builder.routes() + public RouteLocator customRouteLocator( + RouteLocatorBuilder builder, + TrygdeetatenAzureAdTokenService tokenService, + Consumers consumers + ) { + var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory + .bearerAuthenticationHeaderFilter( + () -> tokenService + .exchange(consumers.getInst()) + .map(AccessToken::getTokenValue)); + + return builder + .routes() .route(spec -> spec .path("/**") - .uri("https://institusjon-opphold-testdata.dev.intern.nav.no/")) + .filters(filterSpec -> filterSpec.filter(addAuthenticationHeaderDevFilter)) + .uri(consumers.getInst().getUrl()) + ) .build(); } } \ No newline at end of file diff --git a/proxies/inst-proxy/src/main/resources/application.yml b/proxies/inst-proxy/src/main/resources/application.yml index 166567cc683..a3275a98eb8 100644 --- a/proxies/inst-proxy/src/main/resources/application.yml +++ b/proxies/inst-proxy/src/main/resources/application.yml @@ -21,3 +21,10 @@ spring: gateway: httpclient: response-timeout: 180s + +consumers: + inst: + name: opphold-testdata + namespace: team-rocket + url: http://opphold-testdata.team-rocket.svc.nais.local + cluster: dev-fss \ No newline at end of file diff --git a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java new file mode 100644 index 00000000000..8eb36dcd572 --- /dev/null +++ b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java @@ -0,0 +1,18 @@ +package no.nav.testnav.proxies.instproxy; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; + +@SpringBootTest +class ApplicationContextTest { + + @MockBean + public ReactiveJwtDecoder reactiveJwtDecoder; + + @Test + @SuppressWarnings("java:S2699") + void load_app_context() { + } +} From decec97d284deac7954d2feacfb04650e236f0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Tue, 19 Dec 2023 14:11:16 +0100 Subject: [PATCH 02/13] Bugfix/dolly backend fikser (#3361) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rettet diverse småfeil --- apps/dolly-backend/build.gradle | 1 - apps/dolly-backend/config.test.yml | 2 +- apps/dolly-backend/config.yml | 2 +- .../bestilling/dokarkiv/DokarkivClient.java | 21 +++++++--- .../bestilling/dokarkiv/DokarkivConsumer.java | 2 +- .../command/DokarkivGetMiljoeCommand.java | 1 + .../dokarkiv/domain/DokarkivResponse.java | 9 ++-- .../bestilling/histark/HistarkClient.java | 18 +++++--- .../histark/domain/HistarkResponse.java | 6 +-- .../command/InstdataGetMiljoerCommand.java | 3 +- .../PensjonforvalterClient.java | 12 +++++- .../SkjermingsRegisterConsumer.java | 41 +++++++++++-------- .../command/SkjermingsregisterGetCommand.java | 3 ++ .../sykemelding/SykemeldingClient.java | 12 +++--- .../java/no/nav/dolly/util/DollyTextUtil.java | 11 ++--- .../dolly/util/TransactionHelperService.java | 4 +- 16 files changed, 90 insertions(+), 58 deletions(-) diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 2d6faaa0b92..2895086f8e7 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -86,7 +86,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.retry:spring-retry:2.0.0' diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml index 3d8c201ac1f..4f0f8143f07 100644 --- a/apps/dolly-backend/config.test.yml +++ b/apps/dolly-backend/config.test.yml @@ -70,7 +70,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" openSearch: instance: bestillinger access: admin diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml index 3e3fe1cc08e..d0e7fb654d6 100644 --- a/apps/dolly-backend/config.yml +++ b/apps/dolly-backend/config.yml @@ -77,7 +77,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" openSearch: instance: bestillinger access: admin diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java index f04e81f94af..c02029cb361 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java @@ -23,6 +23,7 @@ import no.nav.dolly.util.TransactionHelperService; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import java.time.LocalDateTime; import java.util.List; @@ -58,11 +59,17 @@ public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly .flatMap(request -> dokarkivConsumer.getEnvironments() .flatMapIterable(env -> env) .filter(env -> bestilling.getEnvironments().contains(env)) - .filter(env -> !transaksjonMappingService.existAlready(DOKARKIV, - dollyPerson.getIdent(), env, bestilling.getId()) || isOpprettEndre) - .flatMap(env -> dokarkivConsumer.postDokarkiv(env, request) - .map(status -> - getStatus(dollyPerson.getIdent(), progress.getBestilling().getId(), status)))) + .flatMap(env -> + !transaksjonMappingService.existAlready(DOKARKIV, + dollyPerson.getIdent(), env, bestilling.getId()) || isOpprettEndre ? + + dokarkivConsumer.postDokarkiv(env, request) + .map(status -> + getStatus(dollyPerson.getIdent(), + bestilling.getId(), status)) : + + Mono.just(env + ":OK") + )) .collect(Collectors.joining(","))) .map(status -> futurePersist(progress, status))); } @@ -79,6 +86,8 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) { private String getStatus(String ident, Long bestillingId, DokarkivResponse response) { + log.info("Dokarkiv response {} for ident {}", response, ident); + if (isNull(response)) { return null; } @@ -123,6 +132,8 @@ private DokarkivRequest buildRequest(RsDokarkiv rsDokarkiv, PdlPersonBolk.Person private void saveTransaksjonId(DokarkivResponse response, String ident, Long bestillingId, String miljoe) { + log.info("Lagrer transaksjon for {} i {} ", ident, miljoe); + transaksjonMappingService.save( TransaksjonMapping.builder() .ident(ident) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivConsumer.java index 20737d796d7..659e55c914b 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivConsumer.java @@ -44,7 +44,7 @@ public DokarkivConsumer( @Timed(name = "providers", tags = { "operation", "dokarkiv-opprett" }) public Flux postDokarkiv(String environment, DokarkivRequest dokarkivRequest) { - log.info("Sender dokarkiv melding for ident {} miljoe {} request {}", + log.info("Dokarkiv sender melding for ident {} miljoe {} request {}", dokarkivRequest.getBruker().getId(), environment, dokarkivRequest); return tokenService.exchange(serverProperties) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/command/DokarkivGetMiljoeCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/command/DokarkivGetMiljoeCommand.java index 4ed861d6be3..a7d472d3bb2 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/command/DokarkivGetMiljoeCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/command/DokarkivGetMiljoeCommand.java @@ -42,6 +42,7 @@ public Mono> call() { .bodyToMono(String[].class) .map(Arrays::asList) .doOnError(WebClientFilter::logErrorMessage) + .onErrorResume(error -> Mono.just(List.of("q1", "q2", "q4"))) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) .filter(WebClientFilter::is5xxException)); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/domain/DokarkivResponse.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/domain/DokarkivResponse.java index ddfc6a70dab..af22301fc25 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/domain/DokarkivResponse.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/domain/DokarkivResponse.java @@ -2,17 +2,15 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; -import lombok.Setter; import java.util.ArrayList; import java.util.List; import static java.util.Objects.isNull; -@Getter -@Setter +@Data @Builder @NoArgsConstructor @AllArgsConstructor @@ -32,8 +30,7 @@ public List getDokumenter() { return dokumenter; } - @Getter - @Setter + @Data @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java index fb4cd00f819..3a3d585250d 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java @@ -21,6 +21,7 @@ import no.nav.dolly.util.TransactionHelperService; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import java.time.LocalDateTime; import java.util.List; @@ -48,13 +49,16 @@ public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly if (nonNull(bestilling.getHistark())) { - var bestillingId = progress.getBestilling().getId(); return Flux.just(dollyPerson.getIdent()) .map(person -> buildRequest(bestilling.getHistark(), person)) - .filter(request -> !transaksjonMappingService.existAlready(HISTARK, - dollyPerson.getIdent(), "NA", bestilling.getId()) || isOpprettEndre) - .flatMap(request -> histarkConsumer.postHistark(request) - .mapNotNull(status -> getStatus(dollyPerson.getIdent(), bestillingId, status))) + .flatMap(request -> !transaksjonMappingService.existAlready(HISTARK, + dollyPerson.getIdent(), "NA", bestilling.getId()) || isOpprettEndre ? + + histarkConsumer.postHistark(request) + .mapNotNull(status -> getStatus(dollyPerson.getIdent(), bestilling.getId(), status)) : + + Mono.just("OK") + ) .map(status -> futurePersist(progress, status)); } @@ -77,6 +81,8 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) { private String getStatus(String ident, Long bestillingId, HistarkResponse response) { + log.info("Histark response {} mottatt for ident {}", response, ident); + if (isNull(response)) { return null; } @@ -105,6 +111,8 @@ private HistarkRequest buildRequest(RsHistark rsHistark, String ident) { private void saveTransaksjonId(String histarkId, String ident, Long bestillingId) { + log.info("Lagrer transaksjon for ident {}", ident); + transaksjonMappingService.save( TransaksjonMapping.builder() .ident(ident) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java index 42553a68d6e..c69f5f6f22f 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java @@ -2,12 +2,10 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; -import lombok.Setter; -@Getter -@Setter +@Data @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/command/InstdataGetMiljoerCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/command/InstdataGetMiljoerCommand.java index b909298636d..3bf7c90cfc5 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/command/InstdataGetMiljoerCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/command/InstdataGetMiljoerCommand.java @@ -13,7 +13,6 @@ import java.util.List; import java.util.concurrent.Callable; -import static java.util.Collections.emptyList; import static no.nav.dolly.util.TokenXUtil.getUserJwt; @RequiredArgsConstructor @@ -37,7 +36,7 @@ public Mono> call() { .bodyToMono(MiljoerResponse.class) .map(MiljoerResponse::getInstitusjonsoppholdEnvironments) .doOnError(WebClientFilter::logErrorMessage) - .onErrorResume(error -> Mono.just(emptyList())) + .onErrorResume(error -> Mono.just(List.of("q1", "q2"))) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) .filter(WebClientFilter::is5xxException)); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java index e38257392f3..6001b0a9caa 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java @@ -151,7 +151,7 @@ public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly .map(this::getPersonData) .flatMap(persondata -> Mono.zip( getPdlPerson(persondata), - getNavEnhetNr(persondata))) + getNavEnhetNr(persondata, dollyPerson.getIdent()))) .doOnNext(utvidetPersondata -> { if (utvidetPersondata.getT1().isEmpty()) { log.warn("Persondata for {} gir tom response fra PDL", dollyPerson.getIdent()); @@ -211,9 +211,17 @@ private static Mono> getPdlPerson(Flux getNavEnhetNr(Flux persondata) { + private Mono getNavEnhetNr(Flux persondata, String ident) { return persondata + .doOnNext(data -> { + if (isNull(data.getHentGeografiskTilknytningBolk()) || + data.getHentGeografiskTilknytningBolk().stream() + .anyMatch(bolk -> isNull(bolk.getGeografiskTilknytning()))) { + + log.warn("GT for {} gir tom response fra PDL", ident); + } + }) .filter(data -> nonNull(data.getHentGeografiskTilknytningBolk())) .map(PdlPersonBolk.Data::getHentGeografiskTilknytningBolk) .flatMap(Flux::fromIterable) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java index 58c1b30c768..7a2a7e4c9fc 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java @@ -23,6 +23,7 @@ import static java.util.Objects.nonNull; import static no.nav.dolly.util.JacksonExchangeStrategyUtil.getJacksonStrategy; +import static org.apache.commons.lang3.StringUtils.isBlank; @Slf4j @Service @@ -64,26 +65,30 @@ public Mono oppdaterPerson(SkjermingDataRequest skjerming return tokenService.exchange(serverProperties) .flatMap(token -> new SkjermingsregisterGetCommand(webClient, skjerming.getPersonident(), token.getTokenValue()).call() .flatMap(response -> { - if (response.isEksistererIkke()) { - return new SkjermingsregisterPostCommand(webClient, List.of(skjerming), - token.getTokenValue()).call() - .collectList() - .map(status -> { - log.info("Opprettet skjerming på ident {} fraDato {} tilDato {}", - status.get(0).getPersonident(), status.get(0).getSkjermetFra(), status.get(0).getSkjermetTil()); - return status.get(0); - }); - } else { - return nonNull(skjerming.getSkjermetTil()) ? + if (isBlank(response.getError())) { + if (response.isEksistererIkke()) { + return new SkjermingsregisterPostCommand(webClient, List.of(skjerming), + token.getTokenValue()).call() + .collectList() + .map(status -> { + log.info("Opprettet skjerming på ident {} fraDato {} tilDato {}", + status.get(0).getPersonident(), status.get(0).getSkjermetFra(), status.get(0).getSkjermetTil()); + return status.get(0); + }); + } else { + return nonNull(skjerming.getSkjermetTil()) ? - new SkjermingsregisterPutCommand(webClient, skjerming.getPersonident(), - skjerming.getSkjermetTil(), token.getTokenValue()).call() - .map(status -> { - log.info("Oppdatert skjerming for ident {}, ny tilDato {}", skjerming.getPersonident(), skjerming.getSkjermetTil()); - return status; - }) : + new SkjermingsregisterPutCommand(webClient, skjerming.getPersonident(), + skjerming.getSkjermetTil(), token.getTokenValue()).call() + .map(status -> { + log.info("Oppdatert skjerming for ident {}, ny tilDato {}", skjerming.getPersonident(), skjerming.getSkjermetTil()); + return status; + }) : - Mono.just(new SkjermingDataResponse()); + Mono.just(new SkjermingDataResponse()); + } + } else { + return Mono.just(response); } })); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java index 5c748e943ad..a8ab2517272 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java @@ -35,6 +35,9 @@ public Mono call() { error -> Mono.just(SkjermingDataResponse.builder() .eksistererIkke(true) .build())) + .onErrorResume(error -> Mono.just(SkjermingDataResponse.builder() + .error(WebClientFilter.getMessage(error)) + .build())) .doOnError(WebClientFilter::logErrorMessage) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) .filter(WebClientFilter::is5xxException)); diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java index 2a165fccb3d..d81437c6162 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java @@ -35,6 +35,7 @@ import static java.util.Objects.nonNull; import static no.nav.dolly.domain.resultset.SystemTyper.SYKEMELDING; +import static no.nav.dolly.util.DollyTextUtil.getGenereringStartet; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Slf4j @@ -66,14 +67,13 @@ public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly return Mono.empty(); } else { - setProgress(progress, "Info: Venter på generering av sykemelding ..."); - long bestillingId = progress.getBestilling().getId(); + setProgress(progress, getGenereringStartet()); return getPerson(dollyPerson.getIdent()) .flatMap(persondata -> Flux.concat(postSyntSykemelding(sykemelding, persondata), postDetaljertSykemelding(sykemelding, persondata)) .filter(Objects::nonNull) - .doOnNext(status -> saveTransaksjonId(status, bestillingId)) + .doOnNext(status -> saveTransaksjonId(status, bestilling.getId())) .map(this::getStatus) .collect(Collectors.joining())) .collect(Collectors.joining()) @@ -85,7 +85,8 @@ public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly private ClientFuture futurePersist(BestillingProgress progress, String status) { return () -> { - transactionHelperService.persister(progress, BestillingProgress::setSykemeldingStatus, status); + transactionHelperService.persister(progress, BestillingProgress::getSykemeldingStatus, + BestillingProgress::setSykemeldingStatus, status); return progress; }; } @@ -105,7 +106,8 @@ private String getStatus(SykemeldingResponse status) { private void setProgress(BestillingProgress progress, String status) { - transactionHelperService.persister(progress, BestillingProgress::setSykemeldingStatus, status); + transactionHelperService.persister(progress, BestillingProgress::getSykemeldingStatus, + BestillingProgress::setSykemeldingStatus, status); } private Flux getPerson(String ident) { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/util/DollyTextUtil.java b/apps/dolly-backend/src/main/java/no/nav/dolly/util/DollyTextUtil.java index 8066a904b1d..22e1cc7ccad 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/util/DollyTextUtil.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/util/DollyTextUtil.java @@ -8,16 +8,17 @@ public class DollyTextUtil { private static final String INFO_STARTET = "Oppretting startet"; private static final String INFO_VENTER_SYSTEM = "Info: " + INFO_STARTET + " mot %s ..."; private static final String SYNC_START = "Info: Synkronisering mot %s startet ... %d ms"; - private static final String INFO_SYNC = "Synkronisering mot"; + private static final String INFO_GENERERING_STARTET = "Info: Venter på generering av sykemelding ..."; public static String getInfoTextSystem(String system) { return INFO_VENTER_SYSTEM.formatted(system); } - public static String getInfoText() { + public static boolean containsInfoText(String text) { - return INFO_STARTET; + return text.contains(INFO_STARTET) || + text.contains(INFO_GENERERING_STARTET); } public static String getSyncTextSystem(String system, Long millis) { @@ -25,8 +26,8 @@ public static String getSyncTextSystem(String system, Long millis) { return SYNC_START.formatted(system, millis); } - public static String getInfoSync() { + public static String getGenereringStartet() { - return INFO_SYNC; + return INFO_GENERERING_STARTET; } } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java index 8b3d77ed8af..613647edc50 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java @@ -27,7 +27,7 @@ import static java.util.Objects.requireNonNull; import static no.nav.dolly.config.CachingConfig.CACHE_BESTILLING; import static no.nav.dolly.config.CachingConfig.CACHE_GRUPPE; -import static no.nav.dolly.util.DollyTextUtil.getInfoText; +import static no.nav.dolly.util.DollyTextUtil.containsInfoText; import static org.apache.commons.lang3.StringUtils.isBlank; @Slf4j @@ -150,7 +150,7 @@ private String applyChanges(String value, String status, String separator) { return Stream.of(status.split(regex), value.split(regex)) .flatMap(Arrays::stream) - .filter(text -> !text.contains(getInfoText())) + .filter(text -> !containsInfoText(text)) .distinct() .collect(Collectors.joining(regex)); } From c2f17191720416b8384c458e65afdc371d645324 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 19 Dec 2023 14:39:58 +0100 Subject: [PATCH 03/13] PDL-forvalter tillate tom fraDato for statsborgerskap --- .../service/StatsborgerskapService.java | 7 ++- .../service/StatsborgerskapServiceTest.java | 62 ++++++++++--------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/StatsborgerskapService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/StatsborgerskapService.java index bcd0c178a0e..a4d813ac136 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/StatsborgerskapService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/StatsborgerskapService.java @@ -5,6 +5,7 @@ import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; import no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; @@ -37,9 +38,9 @@ public List convert(PersonDTO person) { if (isTrue(type.getIsNew())) { - handle(type, person, person.getInnflytting().stream().reduce((a, b) -> b).orElse(null)); type.setKilde(getKilde(type)); type.setMaster(getMaster(type, person)); + handle(type, person, person.getInnflytting().stream().reduce((a, b) -> b).orElse(null)); } } return person.getStatsborgerskap(); @@ -70,7 +71,9 @@ private void handle(StatsborgerskapDTO statsborgerskap, PersonDTO person, Innfly } } - if (isNull(statsborgerskap.getGyldigFraOgMed())) { + if (isNull(statsborgerskap.getGyldigFraOgMed()) && + isNull(statsborgerskap.getBekreftelsesdato()) && + statsborgerskap.getMaster() == DbVersjonDTO.Master.PDL) { statsborgerskap.setGyldigFraOgMed(FoedselsdatoUtility.getFoedselsdato(person)); } } diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/StatsborgerskapServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/StatsborgerskapServiceTest.java index 31f046c5dd7..1fac221f9af 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/StatsborgerskapServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/StatsborgerskapServiceTest.java @@ -1,6 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; @@ -38,9 +39,9 @@ class StatsborgerskapServiceTest { void whenUgyldigLandkode_thenThrowExecption() { var request = StatsborgerskapDTO.builder() - .landkode("Uruguay") - .isNew(true) - .build(); + .landkode("Uruguay") + .isNew(true) + .build(); var exception = assertThrows(HttpClientErrorException.class, () -> statsborgerskapService.validate(request)); @@ -52,10 +53,10 @@ void whenUgyldigLandkode_thenThrowExecption() { void whenInvalidDateInterval_thenThrowExecption() { var request = StatsborgerskapDTO.builder() - .gyldigFraOgMed(LocalDate.of(2020, 1, 1).atStartOfDay()) - .gyldigTilOgMed(LocalDate.of(2018, 1, 1).atStartOfDay()) - .isNew(true) - .build(); + .gyldigFraOgMed(LocalDate.of(2020, 1, 1).atStartOfDay()) + .gyldigTilOgMed(LocalDate.of(2018, 1, 1).atStartOfDay()) + .isNew(true) + .build(); var exception = assertThrows(HttpClientErrorException.class, () -> statsborgerskapService.validate(request)); @@ -67,14 +68,14 @@ void whenInvalidDateInterval_thenThrowExecption() { void whenLandkodeIsEmptyAndAvailFromInnflytting_thenPickLandkodeFromInnflytting() { var target = statsborgerskapService.convert(PersonDTO.builder() - .statsborgerskap(List.of(StatsborgerskapDTO.builder() - .isNew(true) - .build())) - .ident(FNR_IDENT) - .innflytting(List.of(InnflyttingDTO.builder() - .fraflyttingsland("GER") - .build())) - .build()) + .statsborgerskap(List.of(StatsborgerskapDTO.builder() + .isNew(true) + .build())) + .ident(FNR_IDENT) + .innflytting(List.of(InnflyttingDTO.builder() + .fraflyttingsland("GER") + .build())) + .build()) .get(0); assertThat(target.getLandkode(), is(equalTo("GER"))); @@ -84,11 +85,11 @@ void whenLandkodeIsEmptyAndAvailFromInnflytting_thenPickLandkodeFromInnflytting( void whenLandkodeIsEmptyAndUnavailFromInnflyttingAndIdenttypeFNR_thenSetLandkodeNorge() { var target = statsborgerskapService.convert(PersonDTO.builder() - .statsborgerskap(List.of(StatsborgerskapDTO.builder() - .isNew(true) - .build())) - .ident(FNR_IDENT) - .build()) + .statsborgerskap(List.of(StatsborgerskapDTO.builder() + .isNew(true) + .build())) + .ident(FNR_IDENT) + .build()) .get(0); assertThat(target.getLandkode(), is(equalTo("NOR"))); @@ -100,11 +101,11 @@ void whenLandkodeIsEmptyAndUnavailFromInnflyttingAndIdenttypeDNR_thenGeografiske when(geografiskeKodeverkConsumer.getTilfeldigLand()).thenReturn("CHL"); var target = statsborgerskapService.convert(PersonDTO.builder() - .statsborgerskap(List.of(StatsborgerskapDTO.builder() - .isNew(true) - .build())) - .ident(DNR_IDENT) - .build()) + .statsborgerskap(List.of(StatsborgerskapDTO.builder() + .isNew(true) + .build())) + .ident(DNR_IDENT) + .build()) .get(0); verify(geografiskeKodeverkConsumer).getTilfeldigLand(); @@ -116,11 +117,12 @@ void whenLandkodeIsEmptyAndUnavailFromInnflyttingAndIdenttypeDNR_thenGeografiske void whenGyldigFomNotProvided_thenDeriveGyldigFomFromBirthdate() { var target = statsborgerskapService.convert(PersonDTO.builder() - .statsborgerskap(List.of(StatsborgerskapDTO.builder() - .isNew(true) - .build())) - .ident(FNR_IDENT) - .build()) + .statsborgerskap(List.of(StatsborgerskapDTO.builder() + .isNew(true) + .master(DbVersjonDTO.Master.PDL) + .build())) + .ident(FNR_IDENT) + .build()) .get(0); assertThat(target.getGyldigFraOgMed(), is(equalTo(LocalDate.of(1956, 4, 12).atStartOfDay()))); From 149ccf619b5022e7349054e145a97365cf696dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Wed, 20 Dec 2023 12:20:50 +0100 Subject: [PATCH 04/13] Index out of bound fix (#3363) --- .../main/java/no/nav/dolly/util/TransactionHelperService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java index 613647edc50..570a83ed04d 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/util/TransactionHelperService.java @@ -164,8 +164,10 @@ private String applyChanges(String gmlStatus, String nyStatus) { } else { var nyeStatuser = Arrays.stream(nyStatus.split(",")) + .filter(status -> status.split(":").length > 1) .collect(Collectors.toMap(data -> data.split(":")[0], data -> data.split(":")[1])); var gamleStatuser = Arrays.stream(gmlStatus.split(",")) + .filter(status -> status.split(":").length > 1) .collect(Collectors.toMap(data -> data.split(":")[0], data -> data.split(":")[1])); var resultater = new HashMap<>(gamleStatuser); @@ -173,7 +175,7 @@ private String applyChanges(String gmlStatus, String nyStatus) { return resultater.entrySet().stream() .map(data -> "%s:%s".formatted(data.getKey(), data.getValue())) - .collect(Collectors.joining(",")); + .collect(Collectors.joining(",")); } } From ae266256fa4363356a2088178039708bc68bd5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Wed, 20 Dec 2023 12:23:02 +0100 Subject: [PATCH 05/13] Bugfix/idporten org tilgang (#3362) * Frontend endret consumer som var feil * PersonOrgTilgangService gitt outbound maskinporten-tilgang --- apps/dolly-frontend/config.idporten.yml | 2 +- apps/dolly-frontend/config.test.yml | 2 +- apps/dolly-frontend/config.unstable.yml | 2 +- apps/dolly-frontend/config.yml | 2 +- .../PersonOrganisasjonTilgangConsumer.java | 2 +- .../GetPersonOrganisasjonTilgangCommand.java | 7 +++- .../src/main/resources/application-dev.yml | 4 --- .../build.gradle | 3 +- .../config.test.yml | 13 ++----- .../config.yml | 13 ++++--- .../v1/command/GetPersonAccessCommand.java | 18 ++++++++-- .../config/LocalVaultConfig.java | 36 +++++++++++++++++++ .../PersonOrganisasjonController.java | 7 ++-- .../src/main/resources/application-local.yml | 10 +++++- .../src/main/resources/application.yml | 4 +++ 15 files changed, 87 insertions(+), 38 deletions(-) create mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/LocalVaultConfig.java diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml index c8e3ab59dc5..7d4df05b969 100644 --- a/apps/dolly-frontend/config.idporten.yml +++ b/apps/dolly-frontend/config.idporten.yml @@ -83,7 +83,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi - image: {{image}} + image: "{{image}}" envFrom: - secret: idporten-dolly-prod env: diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml index 263ab599bca..cc88bff6eef 100644 --- a/apps/dolly-frontend/config.test.yml +++ b/apps/dolly-frontend/config.test.yml @@ -91,7 +91,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi - image: {{image}} + image: "{{image}}" env: - name: SPRING_PROFILES_ACTIVE value: dev diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml index 0a04b820069..c27b7173093 100644 --- a/apps/dolly-frontend/config.unstable.yml +++ b/apps/dolly-frontend/config.unstable.yml @@ -92,7 +92,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi - image: {{image}} + image: "{{image}}" env: - name: SPRING_PROFILES_ACTIVE value: dev \ No newline at end of file diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml index 0d5eb04ee34..496cf0d107d 100644 --- a/apps/dolly-frontend/config.yml +++ b/apps/dolly-frontend/config.yml @@ -91,7 +91,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi - image: {{image}} + image: "{{image}}" envFrom: - secret: idporten-dolly-prod env: diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java index 9c0396fdafd..fab5a20388f 100644 --- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java +++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java @@ -30,7 +30,7 @@ public PersonOrganisasjonTilgangConsumer( ObjectMapper objectMapper) { this.accessService = accessService; - serverProperties = consumers.getTestnavOrganisasjonTilgangService(); + serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService(); ExchangeStrategies jacksonStrategy = ExchangeStrategies.builder() .codecs(config -> { config.defaultCodecs() diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java index 1ecf55e8102..3bdfb86c837 100644 --- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java +++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java @@ -1,6 +1,7 @@ package no.nav.dolly.web.consumers.command; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import no.nav.dolly.web.consumers.dto.OrganisasjonDTO; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; @@ -11,7 +12,7 @@ import java.time.Duration; import java.util.concurrent.Callable; - +@Slf4j @RequiredArgsConstructor public class GetPersonOrganisasjonTilgangCommand implements Callable> { private final WebClient webClient; @@ -26,6 +27,10 @@ public Mono call() { .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(OrganisasjonDTO.class) + .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: ", + WebClientFilter.getMessage(error), + WebClientFilter.getMessage(error), + error)) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) .filter(WebClientFilter::is5xxException)); } diff --git a/apps/dolly-frontend/src/main/resources/application-dev.yml b/apps/dolly-frontend/src/main/resources/application-dev.yml index d6a35d171a8..7e66b2695e0 100644 --- a/apps/dolly-frontend/src/main/resources/application-dev.yml +++ b/apps/dolly-frontend/src/main/resources/application-dev.yml @@ -13,10 +13,6 @@ consumers: testnorge-profil-api: name: testnorge-profil-api-dev url: http://testnorge-profil-api-dev.dolly.svc.cluster.local - testnav-organisasjon-tilgang-service: - name: testnav-organisasjon-tilgang-service - url: http://testnav-organisasjon-tilgang-service.dolly.svc.cluster.local - cluster: dev-gcp testnav-varslinger-service: name: testnav-varslinger-service-dev url: http://testnav-varslinger-service-dev.dolly.svc.cluster.local diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index e73436cf41f..89857dcdce9 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -72,8 +72,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - - implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'io.micrometer:micrometer-registry-prometheus' diff --git a/apps/person-organisasjon-tilgang-service/config.test.yml b/apps/person-organisasjon-tilgang-service/config.test.yml index 20a0d0e1fe6..335a4e36d27 100644 --- a/apps/person-organisasjon-tilgang-service/config.test.yml +++ b/apps/person-organisasjon-tilgang-service/config.test.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{ image }}" port: 8080 azure: application: @@ -24,24 +24,15 @@ spec: inbound: rules: - application: dolly-frontend-dev - cluster: dev-gcp - application: dolly-idporten - cluster: dev-gcp - application: dolly-frontend-dev-unstable - cluster: dev-gcp - application: team-dolly-lokal-app - cluster: dev-gcp - application: testnav-oversikt-frontend - cluster: dev-gcp - application: testnav-bruker-service-dev - cluster: dev-gcp - application: testnorge-profil-api-dev - cluster: dev-gcp + - application: testnorge-profil-api-dev - application: app-1 - cluster: dev-gcp namespace: plattformsikkerhet - - application: testnorge-profil-api-dev - cluster: dev-gcp outbound: external: - host: tt02.altinn.no diff --git a/apps/person-organisasjon-tilgang-service/config.yml b/apps/person-organisasjon-tilgang-service/config.yml index 68983fa0231..c05b383219b 100644 --- a/apps/person-organisasjon-tilgang-service/config.yml +++ b/apps/person-organisasjon-tilgang-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 azure: application: @@ -19,18 +19,17 @@ spec: inbound: rules: - application: dolly-frontend - cluster: dev-gcp - application: dolly-idporten - cluster: dev-gcp - - application: dolly-frontend-dev-unstable - cluster: dev-gcp - application: testnav-bruker-service - cluster: dev-gcp - application: testnorge-profil-api - cluster: dev-gcp + - application: team-dolly-lokal-app + - application: testnorge-profil-api + - application: app-1 + namespace: plattformsikkerhet outbound: external: - host: altinn.no + - host: maskinporten.no liveness: path: /internal/isAlive initialDelay: 4 diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java index 870073507d4..5db7644abc0 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java +++ b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java @@ -1,14 +1,19 @@ package no.nav.testnav.apps.persontilgangservice.client.altinn.v1.command; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.dto.AccessDTO; +import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; +import reactor.util.retry.Retry; +import java.time.Duration; +import java.util.Arrays; import java.util.concurrent.Callable; -import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.dto.AccessDTO; - +@Slf4j @RequiredArgsConstructor public class GetPersonAccessCommand implements Callable> { private final WebClient webClient; @@ -31,6 +36,13 @@ public Mono call() { .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .header("ApiKey", apiKey) .retrieve() - .bodyToMono(AccessDTO[].class); + .bodyToMono(AccessDTO[].class) + .doOnNext(response -> Arrays.stream(response) + .forEach(entry -> + log.info("Hentet organisasjon fra Altinn: navn: {}, type: {}, orgnr: {}, orgform: {}, status: {} ", + entry.name(), entry.type(), entry.organizationNumber(), entry.organizationForm(), entry.status()))) + .doOnError(error -> log.error("Henting av \"/reportees\" feilet: {}", WebClientFilter.getMessage(error), error)) + .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) + .filter(WebClientFilter::is5xxException)); } } diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/LocalVaultConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/LocalVaultConfig.java new file mode 100644 index 00000000000..c4a0f0e1aba --- /dev/null +++ b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/LocalVaultConfig.java @@ -0,0 +1,36 @@ +package no.nav.testnav.apps.persontilgangservice.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.vault.annotation.VaultPropertySource; +import org.springframework.vault.authentication.ClientAuthentication; +import org.springframework.vault.authentication.TokenAuthentication; +import org.springframework.vault.client.VaultEndpoint; +import org.springframework.vault.config.AbstractVaultConfiguration; + +import static io.micrometer.common.util.StringUtils.isBlank; + +@Configuration +@Profile("local") +@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false) +public class LocalVaultConfig extends AbstractVaultConfiguration { + + private static final String VAULT_TOKEN = "spring.cloud.vault.token"; + + @Override + public VaultEndpoint vaultEndpoint() { + return VaultEndpoint.create("vault.adeo.no", 443); + } + + @Override + public ClientAuthentication clientAuthentication() { + if (System.getenv().containsKey("VAULT_TOKEN")) { + System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN")); + } + var token = System.getProperty(VAULT_TOKEN); + if (isBlank(token)) { + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); + } + return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); + } +} \ No newline at end of file diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java index 9a18e95427b..230f4be2db1 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java +++ b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java @@ -1,6 +1,9 @@ package no.nav.testnav.apps.persontilgangservice.controller; import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.persontilgangservice.controller.dto.OrganisasjonDTO; +import no.nav.testnav.apps.persontilgangservice.domain.Access; +import no.nav.testnav.apps.persontilgangservice.service.PersonOrganisasjonService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -9,10 +12,6 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import no.nav.testnav.apps.persontilgangservice.controller.dto.OrganisasjonDTO; -import no.nav.testnav.apps.persontilgangservice.domain.Access; -import no.nav.testnav.apps.persontilgangservice.service.PersonOrganisasjonService; - @RestController @RequestMapping("/api/v1/person/organisasjoner") @RequiredArgsConstructor diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml index 1cee299994c..619ed0070da 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml @@ -1,2 +1,10 @@ ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-person-tilgang-service-dev -ALTINN_URL: https://tt02.altinn.no \ No newline at end of file +ALTINN_URL: https://tt02.altinn.no + +TOKENDINGS_URL: dummy +ALTINN_API_KEY: dummy + +MASKINPORTEN_CLIENT_ID: dummy +MASKINPORTEN_CLIENT_JWK: dummy +MASKINPORTEN_SCOPES: dummy +MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml index c4fa87e0c20..eb37aab219f 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml @@ -1,3 +1,4 @@ + spring: application: version: application.version.todo @@ -13,6 +14,9 @@ spring: jackson: serialization: write_dates_as_timestamps: false + cloud: + vault: + enabled: false springdoc: swagger-ui: From f29d3c9bc361ba962833160bfa032b637c2e50e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Tue, 2 Jan 2024 10:02:01 +0100 Subject: [PATCH 06/13] Feature/kor2024 kommuner oppdatering (#3364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "KOR2024 lagt til postnumre for Haram og Ålesund #deploy-test-pdl-forv… (#3314)" This reverts commit e42a5379d9cd1c748dc4006418ada24244980ac2. * Revert "Nye kommunenumre for KOR2024 #deploy-test-pdl-forvalter #deploy-pdl-f… (#3274)" This reverts commit 52b0b018c38aac72ecddf61f8f9500cef183b4d2. --- .../consumer/kodeverk/KodeverkMapper.java | 10 - .../consumer/kodeverk/Kor2024NyeKommuner.java | 135 ---------- .../MatrikkeladresseServiceCommand.java | 16 +- .../command/VegadresseServiceCommand.java | 17 +- .../mapper/KontaktadresseMappingStrategy.java | 10 +- .../service/KontaktAdresseService.java | 2 +- .../utils/Kor2024KommuneEndringer.java | 253 ------------------ 7 files changed, 12 insertions(+), 431 deletions(-) delete mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/Kor2024NyeKommuner.java delete mode 100644 apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkMapper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkMapper.java index b6034fdd9e0..4cdaa04937c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkMapper.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkMapper.java @@ -32,16 +32,6 @@ public Flux mapBetydningToAdjustedKodeverk(String kodeverkNavn .name(kodeverkNavn) .koder(extractKoderFromBetydninger(betydning)) .build()) - .doOnNext(kor24Adjustment -> { - if ("Kommuner".equals(kodeverkNavn)) { - kor24Adjustment.getKoder() - .forEach(kode -> { - if (Kor2024NyeKommuner.isNewKommune(kode.getValue())) { - kode.setLabel(kode.getLabel() + " (NY)"); - } - }); - } - }) .cache(Duration.ofHours(9)); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/Kor2024NyeKommuner.java b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/Kor2024NyeKommuner.java deleted file mode 100644 index fcb30ee4fe9..00000000000 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/Kor2024NyeKommuner.java +++ /dev/null @@ -1,135 +0,0 @@ -package no.nav.dolly.consumer.kodeverk; - -import lombok.experimental.UtilityClass; - -import java.util.HashSet; -import java.util.Set; - -@UtilityClass -public class Kor2024NyeKommuner { - - private static final Set KOMMUNER = new HashSet<>(); - - static { - KOMMUNER.add("1508"); // Ålesund - KOMMUNER.add("1580"); // Haram - KOMMUNER.add("3101"); // Halden - KOMMUNER.add("3103"); // Moss - KOMMUNER.add("3105"); // Sarpsborg - KOMMUNER.add("3107"); // Fredrikstad - KOMMUNER.add("3301"); // Drammen - KOMMUNER.add("3303"); // Kongsberg - KOMMUNER.add("3305"); // Ringerike - KOMMUNER.add("3110"); // Hvaler - KOMMUNER.add("3124"); // Aremark - KOMMUNER.add("3122"); // Marker - KOMMUNER.add("3118"); // Indre Østfold - KOMMUNER.add("3116"); // Skiptvet - KOMMUNER.add("3120"); // Rakkestad - KOMMUNER.add("3112"); // Råde - KOMMUNER.add("3114"); // Våler - KOMMUNER.add("3216"); // Vestby - KOMMUNER.add("3207"); // Nordre Follo - KOMMUNER.add("3218"); // Ås - KOMMUNER.add("3214"); // Frogn - KOMMUNER.add("3212"); // Nesodden - KOMMUNER.add("3201"); // Bærum - KOMMUNER.add("3203"); // Asker - KOMMUNER.add("3226"); // Aurskog-Høland - KOMMUNER.add("3224"); // Rælingen - KOMMUNER.add("3220"); // Enebakk - KOMMUNER.add("3222"); // Lørenskog - KOMMUNER.add("3205"); // Lillestrøm - KOMMUNER.add("3232"); // Nittedal - KOMMUNER.add("3230"); // Gjerdrum - KOMMUNER.add("3209"); // Ullensaker - KOMMUNER.add("3228"); // Nes - KOMMUNER.add("3240"); // Eidsvoll - KOMMUNER.add("3238"); // Nannestad - KOMMUNER.add("3242"); // Hurdal - KOMMUNER.add("3310"); // Hole - KOMMUNER.add("3320"); // Flå - KOMMUNER.add("3322"); // Nesbyen - KOMMUNER.add("3324"); // Gol - KOMMUNER.add("3326"); // Hemsedal - KOMMUNER.add("3328"); // Ål - KOMMUNER.add("3330"); // Hol - KOMMUNER.add("3332"); // Sigdal - KOMMUNER.add("3318"); // Krødsherad - KOMMUNER.add("3316"); // Modum - KOMMUNER.add("3314"); // Øvre Eiker - KOMMUNER.add("3312"); // Lier - KOMMUNER.add("3334"); // Flesberg - KOMMUNER.add("3336"); // Rollag - KOMMUNER.add("3338"); // Nore og Uvdal - KOMMUNER.add("3236"); // Jevnaker - KOMMUNER.add("3234"); // Lunner - KOMMUNER.add("3901"); // Horten - KOMMUNER.add("3903"); // Holmestrand - KOMMUNER.add("3905"); // Tønsberg - KOMMUNER.add("3907"); // Sandefjord - KOMMUNER.add("3909"); // Larvik - KOMMUNER.add("4001"); // Porsgrunn - KOMMUNER.add("4003"); // Skien - KOMMUNER.add("4005"); // Notodden - KOMMUNER.add("3911"); // Færder - KOMMUNER.add("4010"); // Siljan - KOMMUNER.add("4012"); // Bamble - KOMMUNER.add("4014"); // Kragerø - KOMMUNER.add("4016"); // Drangedal - KOMMUNER.add("4018"); // Nome - KOMMUNER.add("4020"); // Midt-Telemark - KOMMUNER.add("4026"); // Tinn - KOMMUNER.add("4024"); // Hjartdal - KOMMUNER.add("4022"); // Seljord - KOMMUNER.add("4028"); // Kviteseid - KOMMUNER.add("4030"); // Nissedal - KOMMUNER.add("4032"); // Fyresdal - KOMMUNER.add("4034"); // Tokke - KOMMUNER.add("4036"); // Vinje - KOMMUNER.add("5501"); // Tromsø - KOMMUNER.add("5503"); // Harstad - KOMMUNER.add("5601"); // Alta - KOMMUNER.add("5634"); // Vardø - KOMMUNER.add("5607"); // Vadsø - KOMMUNER.add("5603"); // Hammerfest - KOMMUNER.add("5510"); // Kvæfjord - KOMMUNER.add("5512"); // Tjeldsund - KOMMUNER.add("5514"); // Ibestad - KOMMUNER.add("5516"); // Gratangen - KOMMUNER.add("5518"); // Lavangen - KOMMUNER.add("5520"); // Bardu - KOMMUNER.add("5522"); // Salangen - KOMMUNER.add("5524"); // Målselv - KOMMUNER.add("5526"); // Sørreisa - KOMMUNER.add("5528"); // Dyrøy - KOMMUNER.add("5530"); // Senja - KOMMUNER.add("5532"); // Balsfjord - KOMMUNER.add("5534"); // Karlsøy - KOMMUNER.add("5536"); // Lyngen - KOMMUNER.add("5538"); // Storfjord - KOMMUNER.add("5540"); // Kåfjord - KOMMUNER.add("5542"); // Skjervøy - KOMMUNER.add("5544"); // Nordreisa - KOMMUNER.add("5546"); // Kvænangen - KOMMUNER.add("5612"); // Kautokeino - KOMMUNER.add("5614"); // Loppa - KOMMUNER.add("5616"); // Hasvik - KOMMUNER.add("5618"); // Måsøy - KOMMUNER.add("5620"); // Nordkapp - KOMMUNER.add("5622"); // Porsanger - KOMMUNER.add("5610"); // Karasjok - KOMMUNER.add("5624"); // Lebesby - KOMMUNER.add("5626"); // Gamvik - KOMMUNER.add("5630"); // Berlevåg - KOMMUNER.add("5628"); // Tana - KOMMUNER.add("5636"); // Nesseby - KOMMUNER.add("5632"); // Båtsfjord - KOMMUNER.add("5605"); // Sør-Varanger - } - - public static boolean isNewKommune(String kommune) { - - return KOMMUNER.contains(kommune); - } -} diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java index 2cbea6cd19c..4985cb37845 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import no.nav.pdl.forvalter.utils.Kor2024KommuneEndringer; import no.nav.pdl.forvalter.utils.WebClientFilter; import no.nav.testnav.libs.dto.adresseservice.v1.MatrikkeladresseDTO; import org.springframework.http.HttpHeaders; @@ -16,7 +15,6 @@ import reactor.util.retry.Retry; import java.time.Duration; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -69,13 +67,6 @@ public Mono call() { .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(MatrikkeladresseDTO[].class) - .doOnNext(matrikkeladresser -> Arrays.stream(matrikkeladresser) - .forEach(matrikkeladresse -> { - matrikkeladresse.setKommunenummer(isNotBlank(query.getKommunenummer()) ? - query.getKommunenummer() : matrikkeladresse.getKommunenummer()); - matrikkeladresse.setMatrikkelId(Kor2024KommuneEndringer.isGmlKommune(query, matrikkeladresse) ? - matrikkeladresse.getMatrikkelId() : null); - })) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) .filter(WebClientFilter::is5xxException)) .onErrorResume(throwable -> throwable instanceof WebClientResponseException.NotFound || @@ -88,13 +79,10 @@ private MultiValueMap getQuery() { return new LinkedMultiValueMap<>( new LinkedHashMap<>( Map.of("matrikkelId", filterArtifact(matrikkelId), - "kommunenummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? - Kor2024KommuneEndringer.getKommuneNummer(query.getKommunenummer()) : null), + "kommunenummer", filterArtifact(query.getKommunenummer()), "gaardsnummer", filterArtifact(nullcheck(query.getGaardsnummer())), "bruksnummer", filterArtifact(nullcheck(query.getBruksnummer())), - "postnummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? - Kor2024KommuneEndringer.getRandomPostnummer(query.getKommunenummer()) : - query.getPostnummer()), + "postnummer", filterArtifact(query.getPostnummer()), "tilleggsnavn", filterArtifact(query.getTilleggsnavn())) .entrySet().stream() .filter(entry -> isNotBlank(entry.getValue())) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java index 73e5752a7cb..615ce436d16 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import no.nav.pdl.forvalter.utils.Kor2024KommuneEndringer; import no.nav.pdl.forvalter.utils.WebClientFilter; import no.nav.testnav.libs.dto.adresseservice.v1.VegadresseDTO; import org.springframework.http.HttpHeaders; @@ -16,7 +15,6 @@ import reactor.util.retry.Retry; import java.time.Duration; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -39,7 +37,6 @@ public class VegadresseServiceCommand implements Callable> @Override public Mono call() { - return webClient .get() .uri(builder -> builder.path(ADRESSER_VEG_URL).queryParams(getQuery()).build()) @@ -48,13 +45,6 @@ public Mono call() { .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(VegadresseDTO[].class) - .doOnNext(vegadresser -> Arrays.stream(vegadresser) - .forEach(vegadresse -> { - vegadresse.setKommunenummer(isNotBlank(query.getKommunenummer()) ? - query.getKommunenummer() : vegadresse.getKommunenummer()); - vegadresse.setMatrikkelId(Kor2024KommuneEndringer.isGmlKommune(query, vegadresse) ? - vegadresse.getMatrikkelId() : null); - })) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) .filter(WebClientFilter::is5xxException)) .onErrorResume(throwable -> throwable instanceof WebClientResponseException.NotFound || @@ -83,11 +73,8 @@ private MultiValueMap getQuery() { "adressenavn", filterArtifact(query.getAdressenavn()), "husnummer", filterArtifact(query.getHusnummer()), "husbokstav", filterArtifact(query.getHusbokstav()), - "postnummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? - Kor2024KommuneEndringer.getRandomPostnummer(query.getKommunenummer()) : - query.getPostnummer()), - "kommunenummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? - Kor2024KommuneEndringer.getKommuneNummer(query.getKommunenummer()) : null), + "postnummer", filterArtifact(query.getPostnummer()), + "kommunenummer", filterArtifact(query.getKommunenummer()), "bydelsnummer", filterArtifact(query.getBydelsnummer()), "tilleggsnavn", filterArtifact(query.getTilleggsnavn())) .entrySet().stream() diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktadresseMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktadresseMappingStrategy.java index e11934a2e29..d7749235ee3 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktadresseMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktadresseMappingStrategy.java @@ -9,6 +9,9 @@ import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; import org.springframework.stereotype.Component; +import static java.util.Objects.nonNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; + @Component public class KontaktadresseMappingStrategy implements MappingStrategy { @@ -21,12 +24,13 @@ public void register(MapperFactory factory) { @Override public void mapAtoB(KontaktadresseDTO kildeAdresse, PdlKontaktadresse kontaktadresse, MappingContext context) { - if (kildeAdresse.getMaster() == DbVersjonDTO.Master.FREG) { + if (isNotBlank(kontaktadresse.getAdresseIdentifikatorFraMatrikkelen())) { + kontaktadresse.setMaster(DbVersjonDTO.Master.FREG); kontaktadresse.setVegadresseForPost( mapperFacade.map(kildeAdresse.getVegadresse(), VegadresseForPost.class)); kontaktadresse.setVegadresse(null); - } else { - kontaktadresse.setAdresseIdentifikatorFraMatrikkelen(null); + } else if (nonNull(kontaktadresse.getVegadresse())) { + kontaktadresse.setMaster(DbVersjonDTO.Master.PDL); } } }) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktAdresseService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktAdresseService.java index 4f4d79995c6..abd32088405 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktAdresseService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktAdresseService.java @@ -112,7 +112,7 @@ private void handle(KontaktadresseDTO kontaktadresse, PersonDTO person) { if (nonNull(kontaktadresse.getVegadresse())) { var vegadresse = adresseServiceConsumer.getVegadresse(kontaktadresse.getVegadresse(), kontaktadresse.getAdresseIdentifikatorFraMatrikkelen()); - kontaktadresse.setAdresseIdentifikatorFraMatrikkelen(vegadresse.getMatrikkelId()); + kontaktadresse.setAdresseIdentifikatorFraMatrikkelen(kontaktadresse.getMaster() == Master.FREG ? vegadresse.getMatrikkelId() : null); mapperFacade.map(vegadresse, kontaktadresse.getVegadresse()); kontaktadresse.getVegadresse().setKommunenummer(null); diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java deleted file mode 100644 index 97051ba1c15..00000000000 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java +++ /dev/null @@ -1,253 +0,0 @@ -package no.nav.pdl.forvalter.utils; - -import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; - -import java.security.SecureRandom; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Random; -import java.util.Set; - -import static org.apache.commons.lang3.StringUtils.isBlank; - -@UtilityClass -public class Kor2024KommuneEndringer { - - private static final String HARAM = "1580"; - private static final String AALESUND = "1508"; - private static Random postnummer = new SecureRandom(); - - private static Map kommuner = new HashMap<>(); - - static { - kommuner.put("1508", "1507"); // Ålesund - kommuner.put("1580", "1507"); // Haram - kommuner.put("3101", "3001"); // Halden - kommuner.put("3103", "3002"); // Moss - kommuner.put("3105", "3003"); // Sarpsborg - kommuner.put("3107", "3004"); // Fredrikstad - kommuner.put("3301", "3005"); // Drammen - kommuner.put("3303", "3006"); // Kongsberg - kommuner.put("3305", "3007"); // Ringerike - kommuner.put("3110", "3011"); // Hvaler - kommuner.put("3124", "3012"); // Aremark - kommuner.put("3122", "3013"); // Marker - kommuner.put("3118", "3014"); // Indre Østfold - kommuner.put("3116", "3015"); // Skiptvet - kommuner.put("3120", "3016"); // Rakkestad - kommuner.put("3112", "3017"); // Råde - kommuner.put("3114", "3018"); // Våler - kommuner.put("3216", "3019"); // Vestby - kommuner.put("3207", "3020"); // Nordre Follo - kommuner.put("3218", "3021"); // Ås - kommuner.put("3214", "3022"); // Frogn - kommuner.put("3212", "3023"); // Nesodden - kommuner.put("3201", "3024"); // Bærum - kommuner.put("3203", "3025"); // Asker - kommuner.put("3226", "3026"); // Aurskog-Høland - kommuner.put("3224", "3027"); // Rælingen - kommuner.put("3220", "3028"); // Enebakk - kommuner.put("3222", "3029"); // Lørenskog - kommuner.put("3205", "3030"); // Lillestrøm - kommuner.put("3232", "3031"); // Nittedal - kommuner.put("3230", "3032"); // Gjerdrum - kommuner.put("3209", "3033"); // Ullensaker - kommuner.put("3228", "3034"); // Nes - kommuner.put("3240", "3035"); // Eidsvoll - kommuner.put("3238", "3036"); // Nannestad - kommuner.put("3242", "3037"); // Hurdal - kommuner.put("3310", "3038"); // Hole - kommuner.put("3320", "3039"); // Flå - kommuner.put("3322", "3040"); // Nesbyen - kommuner.put("3324", "3041"); // Gol - kommuner.put("3326", "3042"); // Hemsedal - kommuner.put("3328", "3043"); // Ål - kommuner.put("3330", "3044"); // Hol - kommuner.put("3332", "3045"); // Sigdal - kommuner.put("3318", "3046"); // Krødsherad - kommuner.put("3316", "3047"); // Modum - kommuner.put("3314", "3048"); // Øvre Eiker - kommuner.put("3312", "3049"); // Lier - kommuner.put("3334", "3050"); // Flesberg - kommuner.put("3336", "3051"); // Rollag - kommuner.put("3338", "3052"); // Nore og Uvdal - kommuner.put("3236", "3053"); // Jevnaker - kommuner.put("3234", "3054"); // Lunner - kommuner.put("3901", "3801"); // Horten - kommuner.put("3903", "3802"); // Holmestrand - kommuner.put("3905", "3803"); // Tønsberg - kommuner.put("3907", "3804"); // Sandefjord - kommuner.put("3909", "3805"); // Larvik - kommuner.put("4001", "3806"); // Porsgrunn - kommuner.put("4003", "3807"); // Skien - kommuner.put("4005", "3808"); // Notodden - kommuner.put("3911", "3811"); // Færder - kommuner.put("4010", "3812"); // Siljan - kommuner.put("4012", "3813"); // Bamble - kommuner.put("4014", "3814"); // Kragerø - kommuner.put("4016", "3815"); // Drangedal - kommuner.put("4018", "3816"); // Nome - kommuner.put("4020", "3817"); // Midt-Telemark - kommuner.put("4026", "3818"); // Tinn - kommuner.put("4024", "3819"); // Hjartdal - kommuner.put("4022", "3820"); // Seljord - kommuner.put("4028", "3821"); // Kviteseid - kommuner.put("4030", "3822"); // Nissedal - kommuner.put("4032", "3823"); // Fyresdal - kommuner.put("4034", "3824"); // Tokke - kommuner.put("4036", "3825"); // Vinje - kommuner.put("5501", "5401"); // Tromsø - kommuner.put("5503", "5402"); // Harstad - kommuner.put("5601", "5403"); // Alta - kommuner.put("5634", "5404"); // Vardø - kommuner.put("5607", "5405"); // Vadsø - kommuner.put("5603", "5406"); // Hammerfest - kommuner.put("5510", "5411"); // Kvæfjord - kommuner.put("5512", "5412"); // Tjeldsund - kommuner.put("5514", "5413"); // Ibestad - kommuner.put("5516", "5414"); // Gratangen - kommuner.put("5518", "5415"); // Lavangen - kommuner.put("5520", "5416"); // Bardu - kommuner.put("5522", "5417"); // Salangen - kommuner.put("5524", "5418"); // Målselv - kommuner.put("5526", "5419"); // Sørreisa - kommuner.put("5528", "5420"); // Dyrøy - kommuner.put("5530", "5421"); // Senja - kommuner.put("5532", "5422"); // Balsfjord - kommuner.put("5534", "5423"); // Karlsøy - kommuner.put("5536", "5424"); // Lyngen - kommuner.put("5538", "5425"); // Storfjord - kommuner.put("5540", "5426"); // Kåfjord - kommuner.put("5542", "5427"); // Skjervøy - kommuner.put("5544", "5428"); // Nordreisa - kommuner.put("5546", "5429"); // Kvænangen - kommuner.put("5612", "5430"); // Kautokeino - kommuner.put("5614", "5432"); // Loppa - kommuner.put("5616", "5433"); // Hasvik - kommuner.put("5618", "5434"); // Måsøy - kommuner.put("5620", "5435"); // Nordkapp - kommuner.put("5622", "5436"); // Porsanger - kommuner.put("5610", "5437"); // Karasjok - kommuner.put("5624", "5438"); // Lebesby - kommuner.put("5626", "5439"); // Gamvik - kommuner.put("5630", "5440"); // Berlevåg - kommuner.put("5628", "5441"); // Tana - kommuner.put("5636", "5442"); // Nesseby - kommuner.put("5632", "5443"); // Båtsfjord - kommuner.put("5605", "5444"); // Sør-Varanger - } - - private static Set postnummerHaram = new HashSet<>(); - - static { - - postnummerHaram.add("6264"); // TENNFJORD - postnummerHaram.add("6265"); // VATNE - postnummerHaram.add("6270"); // BRATTVÅG - postnummerHaram.add("6272"); // HILDRE - postnummerHaram.add("6280"); // SØVIK - postnummerHaram.add("6281"); // SØVIK - postnummerHaram.add("6282"); // BRATTVÅG - postnummerHaram.add("6283"); // VATNE - postnummerHaram.add("6285"); // STOREKALVØY - postnummerHaram.add("6290"); // HARAMSØY - postnummerHaram.add("6291"); // HARAMSØY - postnummerHaram.add("6292"); // KJERSTAD - postnummerHaram.add("6293"); // LONGVA - postnummerHaram.add("6294"); // FJØRTOF - } - - private static Set postnummerAalesund = new HashSet<>(); - - static { - postnummerAalesund.add("6001"); // ÅLESUND - postnummerAalesund.add("6002"); // ÅLESUND - postnummerAalesund.add("6003"); // ÅLESUND - postnummerAalesund.add("6004"); // ÅLESUND - postnummerAalesund.add("6005"); // ÅLESUND - postnummerAalesund.add("6006"); // ÅLESUND - postnummerAalesund.add("6007"); // ÅLESUND - postnummerAalesund.add("6008"); // ÅLESUND - postnummerAalesund.add("6009"); // ÅLESUND - postnummerAalesund.add("6010"); // ÅLESUND - postnummerAalesund.add("6011"); // ÅLESUND - postnummerAalesund.add("6012"); // ÅLESUND - postnummerAalesund.add("6013"); // ÅLESUND - postnummerAalesund.add("6014"); // ÅLESUND - postnummerAalesund.add("6015"); // ÅLESUND - postnummerAalesund.add("6016"); // ÅLESUND - postnummerAalesund.add("6017"); // ÅLESUND - postnummerAalesund.add("6018"); // ÅLESUND - postnummerAalesund.add("6019"); // ÅLESUND - postnummerAalesund.add("6020"); // ÅLESUND - postnummerAalesund.add("6021"); // ÅLESUND - postnummerAalesund.add("6022"); // ÅLESUND - postnummerAalesund.add("6023"); // ÅLESUND - postnummerAalesund.add("6024"); // ÅLESUND - postnummerAalesund.add("6025"); // ÅLESUND - postnummerAalesund.add("6026"); // ÅLESUND - postnummerAalesund.add("6028"); // ÅLESUND - postnummerAalesund.add("6029"); // ÅLESUND - postnummerAalesund.add("6043"); // ÅLESUND - postnummerAalesund.add("6044"); // ÅLESUND - postnummerAalesund.add("6045"); // ÅLESUND - postnummerAalesund.add("6046"); // ÅLESUND - postnummerAalesund.add("6047"); // ÅLESUND - postnummerAalesund.add("6048"); // ÅLESUND - postnummerAalesund.add("6057"); // ELLINGSØY - postnummerAalesund.add("6240"); // ØRSKOG - postnummerAalesund.add("6249"); // ØRSKOG - postnummerAalesund.add("6260"); // SKODJE - postnummerAalesund.add("6263"); // SKODJE - postnummerAalesund.add("6286"); // ORTEN - postnummerAalesund.add("6287"); // HARØY - postnummerAalesund.add("6295"); // MYKLEBOST - postnummerAalesund.add("6296"); // HARØY - postnummerAalesund.add("6297"); // SANDØY - postnummerAalesund.add("6298"); // ONA - postnummerAalesund.add("6424"); // SANDØY - postnummerAalesund.add("6426"); // ORTEN - postnummerAalesund.add("6427"); // HARØY - postnummerAalesund.add("6428"); // MYKLEBOST - } - - private String getRandomPostnummer(Set kommune) { - - return kommune.stream() - .skip(postnummer.nextInt(kommune.size())) - .findFirst() - .orElse(null); - } - public String getRandomPostnummer(String kommune) { - - if (HARAM.equals(kommune)) { - return getRandomPostnummer(postnummerHaram); - - } else if (AALESUND.equals(kommune)) { - return getRandomPostnummer(postnummerAalesund); - - } else { - return null; - } - } - - public String getKommuneNummer(String kommuneNummer) { - - return kommuner.getOrDefault(kommuneNummer, kommuneNummer); - } - - public boolean isGmlKommune(VegadresseDTO request, no.nav.testnav.libs.dto.adresseservice.v1.VegadresseDTO response) { - - return isBlank(request.getKommunenummer()) || - Kor2024KommuneEndringer.getKommuneNummer(request.getKommunenummer()).equals(request.getKommunenummer()); - } - - public boolean isGmlKommune(MatrikkeladresseDTO request, no.nav.testnav.libs.dto.adresseservice.v1.MatrikkeladresseDTO response) { - - return isBlank(request.getKommunenummer()) || - Kor2024KommuneEndringer.getKommuneNummer(request.getKommunenummer()).equals(request.getKommunenummer()); - } -} \ No newline at end of file From ad0cfd9cecedb5d9e48c5d9a59ac461bd61bf394 Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Tue, 2 Jan 2024 14:41:30 +0100 Subject: [PATCH 07/13] Delt opp lange querys for identer --- .../services/pdl/PdlForvalterService.tsx | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx index ee25d3016f2..e5547009be2 100644 --- a/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx @@ -2,13 +2,30 @@ import Request from '@/service/services/Request' const getPdlUrl = () => '/testnav-pdl-forvalter/api/v1' +const sliceIdentListe = (identListe: string[]) => { + const maxAntall = 150 + if (identListe.length <= maxAntall) return [identListe] + const identer = [] + for (let i = 0; i < identListe.length; i += maxAntall) { + identer.push(identListe.slice(i, i + maxAntall)) + } + return identer +} + export default { getPersoner(identListe: string[]) { if (!identListe) { return } - const endpoint = `${getPdlUrl()}/personer?identer=${identListe}` - return Request.get(endpoint) + const identerDelt = sliceIdentListe(identListe) + const promises = identerDelt.map((identer) => { + const endpoint = `${getPdlUrl()}/personer?identer=${identer}` + return Request.get(endpoint) + }) + return Promise.all(promises).then((responses) => { + const data = responses.map((response: any) => response?.data).flat() + return { data } + }) }, soekPersoner(fragment: string) { if (!fragment || fragment.length > 11) { From ddcc3409058b027b6541c173bc23d5980ca5c657 Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Wed, 3 Jan 2024 10:28:47 +0100 Subject: [PATCH 08/13] =?UTF-8?q?Endret=20p=C3=A5=20KRRstub=20telefonnumme?= =?UTF-8?q?r=20validering=20(#3367)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/js/src/components/fagsystem/krrstub/form/Form.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx index 1d7ce242d3c..2f8b526312a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx @@ -115,7 +115,10 @@ KrrstubForm.validation = { krrstub: Yup.object({ epost: Yup.string(), gyldigFra: Yup.date().nullable(), - mobil: Yup.string().matches(/^\+?\d*$/, 'Ugyldig mobilnummer'), + mobil: Yup.string().matches(/^\+?\d{8,14}$/, { + message: 'Ugyldig telefonnummer', + excludeEmptyString: true, + }), sdpAdresse: Yup.string(), sdpLeverandoer: Yup.string().nullable(), spraak: Yup.string(), From f4e015435a56f41bb8adc2d832c688514e6f22b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Wed, 3 Jan 2024 13:46:09 +0100 Subject: [PATCH 09/13] Oppdatert innsending uten historikk #deploy-pdl-forvalter-dev (#3368) Oppdatert artifakter uten historikk --- .../nav/pdl/forvalter/service/DoedsfallService.java | 9 +++++++++ .../nav/pdl/forvalter/service/FoedselService.java | 9 +++++++++ .../forvalter/service/SikkerhetstiltakService.java | 13 ++++++++++--- .../no/nav/pdl/forvalter/utils/ArtifactUtils.java | 10 ++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedsfallService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedsfallService.java index 7cf795cb452..e1136d8a299 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedsfallService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedsfallService.java @@ -5,11 +5,14 @@ import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import static java.util.Objects.isNull; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getKilde; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getMaster; +import static no.nav.pdl.forvalter.utils.ArtifactUtils.renumberId; import static org.apache.commons.lang3.BooleanUtils.isTrue; @Service @@ -26,6 +29,12 @@ public List convert(PersonDTO person) { type.setMaster(getMaster(type, person)); } } + + person.setDoedsfall(new ArrayList<>(person.getDoedsfall())); + + person.getDoedsfall().sort(Comparator.comparing(DoedsfallDTO::getDoedsdato).reversed()); + renumberId(person.getDoedsfall()); + return person.getDoedsfall(); } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FoedselService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FoedselService.java index 773c3aa3781..8cb08f8238a 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FoedselService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FoedselService.java @@ -10,6 +10,8 @@ import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import static java.util.Objects.isNull; @@ -17,6 +19,7 @@ import static no.nav.pdl.forvalter.utils.ArtifactUtils.NORGE; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getKilde; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getMaster; +import static no.nav.pdl.forvalter.utils.ArtifactUtils.renumberId; import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -41,6 +44,12 @@ public List convert(PersonDTO person) { type.setMaster(getMaster(type, person)); } } + + person.setFoedsel(new ArrayList<>(person.getFoedsel())); + person.getFoedsel().sort(Comparator.comparing(FoedselDTO::getFoedselsaar).reversed()); + + renumberId(person.getFoedsel()); + return person.getFoedsel(); } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SikkerhetstiltakService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SikkerhetstiltakService.java index 04147e1a2b0..8870be16375 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SikkerhetstiltakService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SikkerhetstiltakService.java @@ -7,11 +7,14 @@ import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getKilde; +import static no.nav.pdl.forvalter.utils.ArtifactUtils.renumberId; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -38,6 +41,11 @@ public List convert(PersonDTO person) { type.setMaster(Master.PDL); } } + + person.setSikkerhetstiltak(new ArrayList<>(person.getSikkerhetstiltak())); + person.getSikkerhetstiltak().sort(Comparator.comparing(SikkerhetstiltakDTO::getGyldigFraOgMed).reversed()); + renumberId(person.getSikkerhetstiltak()); + return person.getSikkerhetstiltak(); } @@ -59,8 +67,7 @@ public void validate(SikkerhetstiltakDTO sikkerhetstiltak) { throw new InvalidRequestException(VALIDATION_GYLDIGTOM_ERROR); } - if (nonNull(sikkerhetstiltak.getGyldigFraOgMed()) && nonNull(sikkerhetstiltak.getGyldigTilOgMed()) && - sikkerhetstiltak.getGyldigFraOgMed().isAfter(sikkerhetstiltak.getGyldigTilOgMed())) { + if (sikkerhetstiltak.getGyldigFraOgMed().isAfter(sikkerhetstiltak.getGyldigTilOgMed())) { throw new InvalidRequestException(VALIDATION_UGYLDIG_INTERVAL_ERROR); } @@ -68,7 +75,7 @@ public void validate(SikkerhetstiltakDTO sikkerhetstiltak) { throw new InvalidRequestException(VALIDATION_KONTAKTPERSON_ERROR); } - if (nonNull(sikkerhetstiltak.getKontaktperson()) && isBlank(sikkerhetstiltak.getKontaktperson().getPersonident())) { + if (isBlank(sikkerhetstiltak.getKontaktperson().getPersonident())) { throw new InvalidRequestException(VALIDATION_PERSONIDENT_ERROR); } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/ArtifactUtils.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/ArtifactUtils.java index 1b948b3e27b..bb3889ac76a 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/ArtifactUtils.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/ArtifactUtils.java @@ -5,6 +5,9 @@ import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + import static java.util.Objects.nonNull; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -47,4 +50,11 @@ public static String getKilde(DbVersjonDTO artifact) { return isNotBlank(artifact.getKilde()) ? artifact.getKilde() : "Dolly"; } + + public static void renumberId(List artifact) { + + var size = new AtomicInteger(artifact.size()); + + artifact.forEach(entry -> entry.setId(size.getAndDecrement())); + } } From a12a88bfd106a789b638180b295c20a27bbe3e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Thu, 4 Jan 2024 10:50:00 +0100 Subject: [PATCH 10/13] Update SonarQube properties and image format in build.gradle and config.yml files (#3369) --- apps/adresse-service/build.gradle | 4 ++-- apps/adresse-service/config.yml | 2 +- apps/amelding-service/build.gradle | 4 ++-- apps/amelding-service/config.yml | 2 +- apps/app-tilgang-analyse-service/build.gradle | 4 ++-- apps/app-tilgang-analyse-service/config.yml | 2 +- apps/arbeidsforhold-service/build.gradle | 4 ++-- apps/arbeidsforhold-service/config.yml | 2 +- apps/batch-bestilling-service/build.gradle | 4 ++-- apps/batch-bestilling-service/config.yml | 2 +- apps/brreg-stub/build.gradle | 4 ++-- apps/brreg-stub/config.yml | 2 +- apps/bruker-service/build.gradle | 4 ++-- apps/bruker-service/config.test.yml | 2 +- apps/bruker-service/config.yml | 2 +- apps/budpro-service/build.gradle | 2 +- apps/budpro-service/config.yml | 2 +- apps/dolly-frontend/build.gradle | 4 ++-- apps/dollystatus/build.gradle | 4 ++-- apps/dollystatus/config.yml | 2 +- apps/endringsmelding-frontend/build.gradle | 4 ++-- apps/endringsmelding-frontend/config.yml | 2 +- apps/endringsmelding-service/build.gradle | 4 ++-- apps/endringsmelding-service/config.yml | 2 +- apps/ereg-batch-status-service/build.gradle | 4 ++-- apps/ereg-batch-status-service/config.yml | 2 +- apps/faste-data-frontend/build.gradle | 4 ++-- apps/faste-data-frontend/config.yml | 2 +- apps/generer-arbeidsforhold-populasjon-service/build.gradle | 4 ++-- apps/generer-arbeidsforhold-populasjon-service/config.yml | 2 +- apps/generer-navn-service/build.gradle | 4 ++-- apps/generer-navn-service/config.yml | 2 +- apps/generer-organisasjon-populasjon-service/build.gradle | 4 ++-- apps/generer-organisasjon-populasjon-service/config.yml | 2 +- apps/generer-synt-amelding-service/build.gradle | 4 ++-- apps/generer-synt-amelding-service/config.yml | 2 +- apps/geografiske-kodeverk-service/build.gradle | 4 ++-- apps/geografiske-kodeverk-service/config.yml | 2 +- apps/helsepersonell-service/build.gradle | 4 ++-- apps/helsepersonell-service/config.yml | 2 +- apps/hodejegeren/build.gradle | 4 ++-- apps/hodejegeren/config.yml | 2 +- apps/inntektsmelding-generator-service/build.gradle | 4 ++-- apps/inntektsmelding-generator-service/config.yml | 2 +- apps/inntektsmelding-service/build.gradle | 4 ++-- apps/inntektsmelding-service/config.yml | 2 +- apps/jenkins-batch-status-service/build.gradle | 4 ++-- apps/jenkins-batch-status-service/config.yml | 2 +- apps/joark-dokument-service/build.gradle | 4 ++-- apps/joark-dokument-service/config.yml | 2 +- apps/miljoer-service/build.gradle | 4 ++-- apps/miljoer-service/config.yml | 2 +- apps/mn-synt-arbeidsforhold-service/build.gradle | 4 ++-- apps/mn-synt-arbeidsforhold-service/config.yml | 2 +- apps/oppsummeringsdokument-service/build.gradle | 4 ++-- apps/oppsummeringsdokument-service/config.yml | 2 +- apps/organisasjon-bestilling-service/build.gradle | 4 ++-- apps/organisasjon-bestilling-service/config.yml | 2 +- apps/organisasjon-faste-data-service/build.gradle | 4 ++-- apps/organisasjon-faste-data-service/config.yml | 2 +- apps/organisasjon-forvalter/build.gradle | 4 ++-- apps/organisasjon-forvalter/config.yml | 2 +- apps/organisasjon-mottak-service/build.gradle | 4 ++-- apps/organisasjon-mottak-service/config.yml | 2 +- apps/organisasjon-service/build.gradle | 4 ++-- apps/organisasjon-service/config.yml | 2 +- apps/organisasjon-tilgang-frontend/build.gradle | 4 ++-- apps/organisasjon-tilgang-frontend/config.yml | 2 +- apps/organisasjon-tilgang-service/build.gradle | 4 ++-- apps/organisasjon-tilgang-service/config.yml | 2 +- apps/orgnummer-service/build.gradle | 4 ++-- apps/orgnummer-service/config.yml | 2 +- apps/oversikt-frontend/build.gradle | 4 ++-- apps/oversikt-frontend/config.yml | 2 +- apps/pdl-forvalter/build.gradle | 4 ++-- apps/pdl-forvalter/config.test.yml | 2 +- apps/pdl-forvalter/config.yml | 2 +- apps/person-faste-data-service/build.gradle | 4 ++-- apps/person-faste-data-service/config.yml | 2 +- apps/person-organisasjon-tilgang-service/build.gradle | 4 ++-- apps/person-search-service/build.gradle | 4 ++-- apps/person-search-service/config.yml | 2 +- apps/person-service/build.gradle | 4 ++-- apps/person-service/config.yml | 2 +- apps/profil-api/build.gradle | 4 ++-- apps/profil-api/config.test.yml | 2 +- apps/profil-api/config.yml | 2 +- apps/sykemelding-api/build.gradle | 4 ++-- apps/sykemelding-api/config.yml | 2 +- apps/synt-sykemelding-api/build.gradle | 4 ++-- apps/synt-sykemelding-api/config.yml | 2 +- apps/synt-vedtakshistorikk-service/build.gradle | 4 ++-- apps/synt-vedtakshistorikk-service/config.yml | 2 +- apps/testnav-ident-pool/build.gradle | 4 ++-- apps/testnav-ident-pool/config.yml | 2 +- apps/testnorge-statisk-data-forvalter/build.gradle | 4 ++-- apps/testnorge-statisk-data-forvalter/config.yml | 2 +- apps/tilbakemelding-api/build.gradle | 4 ++-- apps/tilbakemelding-api/config.yml | 2 +- apps/tps-messaging-service/build.gradle | 4 ++-- apps/tps-messaging-service/config.yml | 2 +- apps/udi-stub/build.gradle | 4 ++-- apps/udi-stub/config.yml | 2 +- apps/varslinger-service/build.gradle | 4 ++-- apps/varslinger-service/config.test.yml | 2 +- apps/varslinger-service/config.yml | 2 +- examples/reactive-rest-example/build.gradle | 4 ++-- libs/commands/build.gradle | 4 ++-- libs/csv-converter/build.gradle | 4 ++-- libs/data-transfer-objects/build.gradle | 4 ++-- libs/data-transfer-search-objects/build.gradle | 4 ++-- libs/database/build.gradle | 4 ++-- libs/domain/build.gradle | 4 ++-- libs/integration-test/build.gradle | 4 ++-- libs/kafka-config/build.gradle | 4 ++-- libs/kafka-producers/build.gradle | 4 ++-- libs/reactive-core/build.gradle | 4 ++-- libs/reactive-frontend/build.gradle | 4 ++-- libs/reactive-proxy/build.gradle | 4 ++-- libs/reactive-security/build.gradle | 4 ++-- libs/reactive-session-security/build.gradle | 4 ++-- libs/security-core/build.gradle | 4 ++-- libs/security-token-service/build.gradle | 4 ++-- libs/servlet-core/build.gradle | 4 ++-- libs/servlet-insecure-security/build.gradle | 4 ++-- libs/servlet-security/build.gradle | 4 ++-- libs/slack/build.gradle | 4 ++-- libs/testing/build.gradle | 4 ++-- proxies/aareg-proxy/build.gradle | 4 ++-- proxies/aareg-proxy/config.yml | 2 +- proxies/aareg-synt-services-proxy/build.gradle | 4 ++-- proxies/aareg-synt-services-proxy/config.yml | 2 +- proxies/arbeidsplassencv-proxy/build.gradle | 4 ++-- proxies/arbeidsplassencv-proxy/config.yml | 2 +- proxies/arena-forvalteren-proxy/build.gradle | 4 ++-- proxies/arena-forvalteren-proxy/config.yml | 2 +- proxies/batch-adeo-proxy/build.gradle | 4 ++-- proxies/batch-adeo-proxy/config.yml | 2 +- proxies/brregstub-proxy/build.gradle | 4 ++-- proxies/brregstub-proxy/config.yml | 2 +- proxies/dokarkiv-proxy/build.gradle | 4 ++-- proxies/dokarkiv-proxy/config.yml | 2 +- proxies/ereg-proxy/build.gradle | 4 ++-- proxies/ereg-proxy/config.yml | 2 +- proxies/histark-proxy/build.gradle | 4 ++-- proxies/histark-proxy/config.yml | 2 +- proxies/hodejegeren-proxy/build.gradle | 4 ++-- proxies/hodejegeren-proxy/config.yml | 2 +- proxies/inntektstub-proxy/build.gradle | 4 ++-- proxies/inntektstub-proxy/config.yml | 2 +- proxies/inst-proxy/build.gradle | 4 ++-- proxies/inst-proxy/config.yml | 2 +- proxies/kodeverk-proxy/build.gradle | 4 ++-- proxies/kodeverk-proxy/config.yml | 2 +- proxies/kontoregister-person-proxy/build.gradle | 4 ++-- proxies/kontoregister-person-proxy/config.yml | 2 +- proxies/krrstub-proxy/build.gradle | 4 ++-- proxies/krrstub-proxy/config.yml | 2 +- proxies/medl-proxy/build.gradle | 4 ++-- proxies/medl-proxy/config.yml | 2 +- proxies/norg2-proxy/build.gradle | 4 ++-- proxies/norg2-proxy/config.yml | 2 +- proxies/pdl-proxy/build.gradle | 4 ++-- proxies/pdl-proxy/config.yml | 2 +- proxies/pensjon-testdata-facade-proxy/build.gradle | 4 ++-- proxies/pensjon-testdata-facade-proxy/config.yml | 2 +- proxies/saf-proxy/build.gradle | 4 ++-- proxies/saf-proxy/config.yml | 2 +- proxies/sigrunstub-proxy/build.gradle | 4 ++-- proxies/sigrunstub-proxy/config.yml | 2 +- proxies/skjermingsregister-proxy/build.gradle | 4 ++-- proxies/skjermingsregister-proxy/config.yml | 2 +- proxies/synthdata-meldekort-proxy/build.gradle | 4 ++-- proxies/synthdata-meldekort-proxy/config.yml | 2 +- proxies/tps-forvalteren-proxy/build.gradle | 4 ++-- proxies/tps-forvalteren-proxy/config.test.yml | 2 +- proxies/tps-forvalteren-proxy/config.yml | 2 +- proxies/udistub-proxy/build.gradle | 4 ++-- proxies/udistub-proxy/config.yml | 2 +- 179 files changed, 277 insertions(+), 277 deletions(-) diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index e3bb51bc8f7..ff7439fd68e 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "navit_testnorge_adresse_service" diff --git a/apps/adresse-service/config.yml b/apps/adresse-service/config.yml index 1a038415db5..813d46c00e5 100644 --- a/apps/adresse-service/config.yml +++ b/apps/adresse-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index 7b56e28fc31..9ee08fb9224 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "navit_testnorge_amelding_service" diff --git a/apps/amelding-service/config.yml b/apps/amelding-service/config.yml index 1034e721f82..f3054d3c12a 100644 --- a/apps/amelding-service/config.yml +++ b/apps/amelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 accessPolicy: inbound: diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 6f4c6ea8d32..562d0a2d3f6 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "navit_testnorge_app_tilgang_analyse_service" diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml index 2d8517b9f3d..19edc95c9ab 100644 --- a/apps/app-tilgang-analyse-service/config.yml +++ b/apps/app-tilgang-analyse-service/config.yml @@ -13,7 +13,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" port: 8080 accessPolicy: inbound: diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 79ca648e2b3..15f4cf7f78c 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-arbeidsforhold-service" diff --git a/apps/arbeidsforhold-service/config.yml b/apps/arbeidsforhold-service/config.yml index 966d96ba4f9..821f7365101 100644 --- a/apps/arbeidsforhold-service/config.yml +++ b/apps/arbeidsforhold-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 263a06d8ce3..bceca753034 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-batch-bestilling-service" diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml index cdde7aeaa38..7232b106207 100644 --- a/apps/batch-bestilling-service/config.yml +++ b/apps/batch-bestilling-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index f29676bad04..f00997f210d 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "brreg-stub" diff --git a/apps/brreg-stub/config.yml b/apps/brreg-stub/config.yml index e2a1d8ff6aa..b338409a52e 100644 --- a/apps/brreg-stub/config.yml +++ b/apps/brreg-stub/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 liveness: path: /isAlive diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 4bd5369ea5c..0171386fb3b 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -27,12 +27,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-bruker-service" diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml index 4a35b00af7e..6d176a1af71 100644 --- a/apps/bruker-service/config.test.yml +++ b/apps/bruker-service/config.test.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml index c3f69896772..6e551c4b8e0 100644 --- a/apps/bruker-service/config.yml +++ b/apps/bruker-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index d0adf882a0a..80da396b83b 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -90,7 +90,7 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" diff --git a/apps/budpro-service/config.yml b/apps/budpro-service/config.yml index 27a4a5449bc..c5014890c89 100644 --- a/apps/budpro-service/config.yml +++ b/apps/budpro-service/config.yml @@ -19,7 +19,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" ingresses: - "https://testnav-budpro-service.intern.dev.nav.no" liveness: diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 3e53b0c7eae..c4ba6e9f53f 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "dolly-frontend" diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index a143f42624f..f4ce7b69aa9 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-dollystatus" diff --git a/apps/dollystatus/config.yml b/apps/dollystatus/config.yml index c0c66031764..a6fceedea5e 100644 --- a/apps/dollystatus/config.yml +++ b/apps/dollystatus/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 accessPolicy: outbound: diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index 49b19b632eb..99ae52f135d 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-endringsmelding-frontend" diff --git a/apps/endringsmelding-frontend/config.yml b/apps/endringsmelding-frontend/config.yml index 800935c0f7d..5cc19a8b63e 100644 --- a/apps/endringsmelding-frontend/config.yml +++ b/apps/endringsmelding-frontend/config.yml @@ -41,6 +41,6 @@ spec: requests: cpu: 300m memory: 1024Mi - image: {{ image }} + image: "{{image}}" ingresses: - "https://testnav-endringsmelding.intern.dev.nav.no" diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index b44f0c2ff04..210652ba98e 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-endringsmelding-service" diff --git a/apps/endringsmelding-service/config.yml b/apps/endringsmelding-service/config.yml index 2be00e3280a..0eb96c908cb 100644 --- a/apps/endringsmelding-service/config.yml +++ b/apps/endringsmelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 3a1be419c17..3e7fff65598 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-ereg-batch-status-service" diff --git a/apps/ereg-batch-status-service/config.yml b/apps/ereg-batch-status-service/config.yml index ee491117a1c..23f5416dc3e 100644 --- a/apps/ereg-batch-status-service/config.yml +++ b/apps/ereg-batch-status-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 4e01c3b67bf..0e76f343985 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-faste-data-frontend" diff --git a/apps/faste-data-frontend/config.yml b/apps/faste-data-frontend/config.yml index 32de941c128..4823e90b564 100644 --- a/apps/faste-data-frontend/config.yml +++ b/apps/faste-data-frontend/config.yml @@ -44,6 +44,6 @@ spec: requests: cpu: 300m memory: 1024Mi - image: {{ image }} + image: "{{image}}" ingresses: - "https://testnav-faste-data.intern.dev.nav.no" \ No newline at end of file diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index cd7af023009..acff03c789e 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-arbeidsforhold-populasjon-service" diff --git a/apps/generer-arbeidsforhold-populasjon-service/config.yml b/apps/generer-arbeidsforhold-populasjon-service/config.yml index bc883aaa2c1..652323b02bf 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/config.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/config.yml @@ -8,7 +8,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index b7f284be411..c1efbd5e8ac 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-navn-service" diff --git a/apps/generer-navn-service/config.yml b/apps/generer-navn-service/config.yml index 103356f2a3b..b1e23da4e0c 100644 --- a/apps/generer-navn-service/config.yml +++ b/apps/generer-navn-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 031b4f63a63..184e7ecc035 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-organisasjon-populasjon-service" diff --git a/apps/generer-organisasjon-populasjon-service/config.yml b/apps/generer-organisasjon-populasjon-service/config.yml index 71a8838132d..8f2ba32678e 100644 --- a/apps/generer-organisasjon-populasjon-service/config.yml +++ b/apps/generer-organisasjon-populasjon-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index b790e8ddd0e..96535cbf724 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-synt-amelding-service" diff --git a/apps/generer-synt-amelding-service/config.yml b/apps/generer-synt-amelding-service/config.yml index 8ade8692ed0..3d937750474 100644 --- a/apps/generer-synt-amelding-service/config.yml +++ b/apps/generer-synt-amelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tracing: diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index 73b7e394fc1..f60b47b5d26 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-geografiske-kodeverk-service" diff --git a/apps/geografiske-kodeverk-service/config.yml b/apps/geografiske-kodeverk-service/config.yml index 921d49cc90f..7e4b2a015ac 100644 --- a/apps/geografiske-kodeverk-service/config.yml +++ b/apps/geografiske-kodeverk-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index c0d63451a3d..fbafef94927 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-helsepersonell-service" diff --git a/apps/helsepersonell-service/config.yml b/apps/helsepersonell-service/config.yml index 5431b605555..d028995f654 100644 --- a/apps/helsepersonell-service/config.yml +++ b/apps/helsepersonell-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index 3aaa58f08ed..95cda1b2dbd 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-hodejegeren" diff --git a/apps/hodejegeren/config.yml b/apps/hodejegeren/config.yml index f987eab4b81..a983e80fa5c 100644 --- a/apps/hodejegeren/config.yml +++ b/apps/hodejegeren/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true liveness: diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 5467e18022e..4313ba82af5 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inntektsmelding-generator-service" diff --git a/apps/inntektsmelding-generator-service/config.yml b/apps/inntektsmelding-generator-service/config.yml index 7b64d584f3c..039d04ab087 100644 --- a/apps/inntektsmelding-generator-service/config.yml +++ b/apps/inntektsmelding-generator-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 800a23e507d..661fe50f7aa 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inntektsmelding-service" diff --git a/apps/inntektsmelding-service/config.yml b/apps/inntektsmelding-service/config.yml index 401a7d2955f..fd15925e7dd 100644 --- a/apps/inntektsmelding-service/config.yml +++ b/apps/inntektsmelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 3492add236c..edd717a67cf 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-jenkins-batch-status-service" diff --git a/apps/jenkins-batch-status-service/config.yml b/apps/jenkins-batch-status-service/config.yml index 24a995c0648..a184d50dff7 100644 --- a/apps/jenkins-batch-status-service/config.yml +++ b/apps/jenkins-batch-status-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 48a30b6d2b6..d6b89056646 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-joark-dokument-service" diff --git a/apps/joark-dokument-service/config.yml b/apps/joark-dokument-service/config.yml index 011330687c2..2e64de12fc3 100644 --- a/apps/joark-dokument-service/config.yml +++ b/apps/joark-dokument-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 6fe3cff5003..3ffded68927 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-miljoer-service" diff --git a/apps/miljoer-service/config.yml b/apps/miljoer-service/config.yml index 002a004d8c2..6bc3aa92739 100644 --- a/apps/miljoer-service/config.yml +++ b/apps/miljoer-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tracing: diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle index 1e44dcfcb22..434e11c8934 100644 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ b/apps/mn-synt-arbeidsforhold-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "mn-synt-arbeidsforhold-service" diff --git a/apps/mn-synt-arbeidsforhold-service/config.yml b/apps/mn-synt-arbeidsforhold-service/config.yml index 00d72e51b2e..35059bbd84d 100644 --- a/apps/mn-synt-arbeidsforhold-service/config.yml +++ b/apps/mn-synt-arbeidsforhold-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 79ef0a07ef1..ebb31fff341 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "oppsummeringsdokument-service" diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml index 4ba7921c11f..42c2a6c82e7 100644 --- a/apps/oppsummeringsdokument-service/config.yml +++ b/apps/oppsummeringsdokument-service/config.yml @@ -8,7 +8,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 accessPolicy: inbound: diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index e99d498f3c3..88fab1f912d 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "organisasjon-bestilling-service" diff --git a/apps/organisasjon-bestilling-service/config.yml b/apps/organisasjon-bestilling-service/config.yml index 15128fab474..aac16e21e70 100644 --- a/apps/organisasjon-bestilling-service/config.yml +++ b/apps/organisasjon-bestilling-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index e240141cb3e..2b03afe2473 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-faste-data-service" diff --git a/apps/organisasjon-faste-data-service/config.yml b/apps/organisasjon-faste-data-service/config.yml index b1bd0fc41bf..05aa99e61b8 100644 --- a/apps/organisasjon-faste-data-service/config.yml +++ b/apps/organisasjon-faste-data-service/config.yml @@ -10,7 +10,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-send-timeout: "300" nginx.ingress.kubernetes.io/proxy-body-size: "50m" spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 3fd67aed5d1..b8ca81d542c 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-forvalter" diff --git a/apps/organisasjon-forvalter/config.yml b/apps/organisasjon-forvalter/config.yml index 3b01496a5d5..ba768822533 100644 --- a/apps/organisasjon-forvalter/config.yml +++ b/apps/organisasjon-forvalter/config.yml @@ -9,7 +9,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 4721739e7b6..cf995d9059e 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-mottak-service" diff --git a/apps/organisasjon-mottak-service/config.yml b/apps/organisasjon-mottak-service/config.yml index 47f5992ff92..67ad8f7b904 100644 --- a/apps/organisasjon-mottak-service/config.yml +++ b/apps/organisasjon-mottak-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 6daae6b29fa..e6282160c18 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-service" diff --git a/apps/organisasjon-service/config.yml b/apps/organisasjon-service/config.yml index 5f514749d28..768b6451974 100644 --- a/apps/organisasjon-service/config.yml +++ b/apps/organisasjon-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 16cf949b27a..b6f0936ab52 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-tilgang-frontend" diff --git a/apps/organisasjon-tilgang-frontend/config.yml b/apps/organisasjon-tilgang-frontend/config.yml index e9d49884be7..e1854d58e04 100644 --- a/apps/organisasjon-tilgang-frontend/config.yml +++ b/apps/organisasjon-tilgang-frontend/config.yml @@ -47,6 +47,6 @@ spec: requests: cpu: 300m memory: 512Mi - image: {{ image }} + image: "{{image}}" ingresses: - "https://testnav-organisasjon-tilgang.intern.dev.nav.no" \ No newline at end of file diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index a24115e95ec..26d56417738 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-tilgang-service" diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml index 27b65107ced..c2668b76ef2 100644 --- a/apps/organisasjon-tilgang-service/config.yml +++ b/apps/organisasjon-tilgang-service/config.yml @@ -8,7 +8,7 @@ metadata: spec: tokenx: enabled: true - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true azure: diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 5c5d9999502..f9ce74141ed 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "orgnummer-service" diff --git a/apps/orgnummer-service/config.yml b/apps/orgnummer-service/config.yml index daf135b99fd..4923ebe32a0 100644 --- a/apps/orgnummer-service/config.yml +++ b/apps/orgnummer-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index de827f2c32b..56f05744c9a 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-oversikt-frontend" diff --git a/apps/oversikt-frontend/config.yml b/apps/oversikt-frontend/config.yml index 33641d2f8c6..ccca707cfe0 100644 --- a/apps/oversikt-frontend/config.yml +++ b/apps/oversikt-frontend/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 6745e8695c6..e65a5293da6 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-pdl-forvalter" diff --git a/apps/pdl-forvalter/config.test.yml b/apps/pdl-forvalter/config.test.yml index 543116cd702..b2ad098c034 100644 --- a/apps/pdl-forvalter/config.test.yml +++ b/apps/pdl-forvalter/config.test.yml @@ -13,7 +13,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: dev - image: {{image}} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/pdl-forvalter/config.yml b/apps/pdl-forvalter/config.yml index dacd2849b47..0c2c84cabf1 100644 --- a/apps/pdl-forvalter/config.yml +++ b/apps/pdl-forvalter/config.yml @@ -13,7 +13,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - image: {{image}} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 79e39ba95d7..5973026c17e 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-person-faste-data-service" diff --git a/apps/person-faste-data-service/config.yml b/apps/person-faste-data-service/config.yml index 496aba1e134..9d35ba92904 100644 --- a/apps/person-faste-data-service/config.yml +++ b/apps/person-faste-data-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 89857dcdce9..9c53fedc230 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -29,12 +29,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-person-organisasjon-tilgang-service" diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index b355dd0b46f..d0d305b3ea6 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "person-search-service" diff --git a/apps/person-search-service/config.yml b/apps/person-search-service/config.yml index 7fffda1f9d5..340eb328cf5 100644 --- a/apps/person-search-service/config.yml +++ b/apps/person-search-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index ed874b4c1b4..44b1f6f19c8 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-person-service" diff --git a/apps/person-service/config.yml b/apps/person-service/config.yml index 7d55fe137e8..63ceb65750a 100644 --- a/apps/person-service/config.yml +++ b/apps/person-service/config.yml @@ -9,7 +9,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-read-timeout: "900" nginx.ingress.kubernetes.io/proxy-send-timeout: "900" spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 34ca325cef8..8dfa7e3a4b2 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-profil-api" diff --git a/apps/profil-api/config.test.yml b/apps/profil-api/config.test.yml index 0799d0cadeb..677bc45707f 100644 --- a/apps/profil-api/config.test.yml +++ b/apps/profil-api/config.test.yml @@ -11,7 +11,7 @@ spec: value: testnav-person-organisasjon-tilgang-service-dev - name: PERSON_ORG_TILGANG_URL value: http://testnav-person-organisasjon-tilgang-service-dev.dolly.svc.cluster.local - image: {{ image }} + image: "{{image}}" tokenx: enabled: true azure: diff --git a/apps/profil-api/config.yml b/apps/profil-api/config.yml index 7446c7d8834..5621a7aefdb 100644 --- a/apps/profil-api/config.yml +++ b/apps/profil-api/config.yml @@ -11,7 +11,7 @@ spec: value: testnav-person-organisasjon-tilgang-service - name: PERSON_ORG_TILGANG_URL value: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local - image: {{image}} + image: "{{image}}" tokenx: enabled: true azure: diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 31deb5ce600..96bac84696a 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-sykemelding-api" diff --git a/apps/sykemelding-api/config.yml b/apps/sykemelding-api/config.yml index 866b0109b2c..eea56030bb8 100644 --- a/apps/sykemelding-api/config.yml +++ b/apps/sykemelding-api/config.yml @@ -18,7 +18,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" port: 8080 liveness: path: /internal/isAlive diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index f73cd9fc465..d815abbe06f 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-synt-sykemelding-api" diff --git a/apps/synt-sykemelding-api/config.yml b/apps/synt-sykemelding-api/config.yml index 5cfa4cf2cf6..ab3bbb2983b 100644 --- a/apps/synt-sykemelding-api/config.yml +++ b/apps/synt-sykemelding-api/config.yml @@ -9,7 +9,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 3173bd9f44e..743cdcb7409 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-synt-vedtakshistorikk-service" diff --git a/apps/synt-vedtakshistorikk-service/config.yml b/apps/synt-vedtakshistorikk-service/config.yml index dfa06603617..17aabdb1d55 100644 --- a/apps/synt-vedtakshistorikk-service/config.yml +++ b/apps/synt-vedtakshistorikk-service/config.yml @@ -33,7 +33,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi - image: {{ image }} + image: "{{image}}" accessPolicy: inbound: rules: diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index 30ddcbdda9b..f7a80aba2bd 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-ident-pool" diff --git a/apps/testnav-ident-pool/config.yml b/apps/testnav-ident-pool/config.yml index 234482f3407..518b26819ac 100644 --- a/apps/testnav-ident-pool/config.yml +++ b/apps/testnav-ident-pool/config.yml @@ -13,7 +13,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - image: {{ image }} + image: "{{image}}" webproxy: true azure: application: diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 5d8dcc6efd9..ba8aad72aa0 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-statisk-data-forvalter" diff --git a/apps/testnorge-statisk-data-forvalter/config.yml b/apps/testnorge-statisk-data-forvalter/config.yml index 5b0c22890ba..f0175829f11 100644 --- a/apps/testnorge-statisk-data-forvalter/config.yml +++ b/apps/testnorge-statisk-data-forvalter/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 4a2e5d87e65..8b94d1455ae 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-tilbakemelding-api" diff --git a/apps/tilbakemelding-api/config.yml b/apps/tilbakemelding-api/config.yml index 635c987e7d0..72c2f5fba89 100644 --- a/apps/tilbakemelding-api/config.yml +++ b/apps/tilbakemelding-api/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 7602ff02437..56993ecbac9 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "tps-messaging-service" diff --git a/apps/tps-messaging-service/config.yml b/apps/tps-messaging-service/config.yml index 09e02532b76..ceaf793c812 100644 --- a/apps/tps-messaging-service/config.yml +++ b/apps/tps-messaging-service/config.yml @@ -9,7 +9,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - image: {{image}} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index e8574181e22..0e96a301760 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -20,12 +20,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "udi-stub" diff --git a/apps/udi-stub/config.yml b/apps/udi-stub/config.yml index b380f527c4e..4d896ddfba2 100644 --- a/apps/udi-stub/config.yml +++ b/apps/udi-stub/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index 87ccfe70427..b5d7fb05948 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-varslinger-service" diff --git a/apps/varslinger-service/config.test.yml b/apps/varslinger-service/config.test.yml index 40161f30864..24259bbed3a 100644 --- a/apps/varslinger-service/config.test.yml +++ b/apps/varslinger-service/config.test.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/varslinger-service/config.yml b/apps/varslinger-service/config.yml index 8d139e0fb7a..684cd750dfe 100644 --- a/apps/varslinger-service/config.yml +++ b/apps/varslinger-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index d1eee8636ef..7690696c88d 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-rest-example" diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index 8ba162028e3..146c350740c 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-commands" diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index 1dc3aaf14ea..b3bf815ce1d 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-csv-converter" diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 07e5a3003ae..c951fe168e5 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-data-transfer-objects" diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index c8efdca1868..9810aaba515 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-data-transfer-search-objects" diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 236987b4332..1183d6d9700 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-database" diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index 328005948b5..c5cf6dd5e00 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-domain" diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index 1281b0ddec8..fb6b34bd21b 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -17,12 +17,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-integration-test" diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index fba140f4eae..317acb22b43 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kafka-config" diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 71a0365e950..901a9dfe412 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kafka-producers" diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index f5bf489c694..61415c833b4 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-core" diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 2e82aa9ae67..2797d91860c 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-frontend" diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 48be5157b36..449a20ba5c8 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-proxy" diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 60e5d105815..a4005a8861b 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-security" diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 3afc0d51173..a1c8f0a023f 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-session-security" diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 29d6140ff87..be95e8dd1ca 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-security-core" diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index 8a74c343c24..2ec98ef8949 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-security-token-service" diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index d309134ed24..6c48d7c5b2e 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -17,12 +17,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-servlet-core" diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index f18fc4e1f0e..14015ae5f5b 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-servlet-insecure-security" diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 7dd67f607ea..8abd3e1b81c 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-servlet-security" diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index 53d6657b294..e18e9f283a4 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-slack" diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index d6d91efdf37..0291fd18bc1 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-testing" diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index c282f9f5f54..562ead1f4be 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-aareg-proxy" diff --git a/proxies/aareg-proxy/config.yml b/proxies/aareg-proxy/config.yml index d79c7631c7a..0efc40334a8 100644 --- a/proxies/aareg-proxy/config.yml +++ b/proxies/aareg-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 5901ec36a18..d5bc875f65a 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "aareg-synt-services-proxy" diff --git a/proxies/aareg-synt-services-proxy/config.yml b/proxies/aareg-synt-services-proxy/config.yml index e41beeda65e..f7a3dde867f 100644 --- a/proxies/aareg-synt-services-proxy/config.yml +++ b/proxies/aareg-synt-services-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 4216c45427b..a65de00fba6 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-arbeidsplassencv-proxy" diff --git a/proxies/arbeidsplassencv-proxy/config.yml b/proxies/arbeidsplassencv-proxy/config.yml index c89c93f13ee..44f4683531d 100644 --- a/proxies/arbeidsplassencv-proxy/config.yml +++ b/proxies/arbeidsplassencv-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 2005fc1e50b..4a6df72441c 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-arena-forvalteren-proxy" diff --git a/proxies/arena-forvalteren-proxy/config.yml b/proxies/arena-forvalteren-proxy/config.yml index 8e847821723..38ebaf76bf4 100644 --- a/proxies/arena-forvalteren-proxy/config.yml +++ b/proxies/arena-forvalteren-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 280a6725cc7..19cfcbd172a 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-batch-adeo-proxy" diff --git a/proxies/batch-adeo-proxy/config.yml b/proxies/batch-adeo-proxy/config.yml index e2bdf494ef3..361a91ba51d 100644 --- a/proxies/batch-adeo-proxy/config.yml +++ b/proxies/batch-adeo-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index 7a1f8d002c3..f5fc098e409 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-brregstub-proxy" diff --git a/proxies/brregstub-proxy/config.yml b/proxies/brregstub-proxy/config.yml index 0a94c4074ea..77dc4f303cb 100644 --- a/proxies/brregstub-proxy/config.yml +++ b/proxies/brregstub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index a9c6c440ee9..7ff998bb680 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-dokarkiv-proxy" diff --git a/proxies/dokarkiv-proxy/config.yml b/proxies/dokarkiv-proxy/config.yml index 661ec516273..13d29e6c989 100644 --- a/proxies/dokarkiv-proxy/config.yml +++ b/proxies/dokarkiv-proxy/config.yml @@ -22,7 +22,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: "512m" nginx.ingress.kubernetes.io/proxy-read-timeout: "300" spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 72b1b082259..758415a786b 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-ereg-proxy" diff --git a/proxies/ereg-proxy/config.yml b/proxies/ereg-proxy/config.yml index 061c382fa94..64719a9a3e5 100644 --- a/proxies/ereg-proxy/config.yml +++ b/proxies/ereg-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 1d5af9ca7f7..f092aeb2e13 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-histark-proxy" diff --git a/proxies/histark-proxy/config.yml b/proxies/histark-proxy/config.yml index d50613a72a4..b097bf96213 100644 --- a/proxies/histark-proxy/config.yml +++ b/proxies/histark-proxy/config.yml @@ -9,7 +9,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: "512m" nginx.ingress.kubernetes.io/proxy-read-timeout: "300" spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle index 3057829a68d..4d77d0aee12 100644 --- a/proxies/hodejegeren-proxy/build.gradle +++ b/proxies/hodejegeren-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-hodejegeren-proxy" diff --git a/proxies/hodejegeren-proxy/config.yml b/proxies/hodejegeren-proxy/config.yml index d975e7d1d6c..b5c2463c3ae 100644 --- a/proxies/hodejegeren-proxy/config.yml +++ b/proxies/hodejegeren-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 6662fd56e8b..787c19d21e6 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inntektstub-proxy" diff --git a/proxies/inntektstub-proxy/config.yml b/proxies/inntektstub-proxy/config.yml index 1af530a5f67..e29b313f2ee 100644 --- a/proxies/inntektstub-proxy/config.yml +++ b/proxies/inntektstub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index ddbcad4fd85..ff5c166e8c1 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inst-proxy" diff --git a/proxies/inst-proxy/config.yml b/proxies/inst-proxy/config.yml index 56546597a3d..fe854b4023b 100644 --- a/proxies/inst-proxy/config.yml +++ b/proxies/inst-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index 71fdc1210c7..a4a936e3fb4 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kodeverk-proxy" diff --git a/proxies/kodeverk-proxy/config.yml b/proxies/kodeverk-proxy/config.yml index 68586f77a9c..5e97803ef68 100644 --- a/proxies/kodeverk-proxy/config.yml +++ b/proxies/kodeverk-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index aed9ead16aa..23d60690e26 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kontoregister-person-proxy" diff --git a/proxies/kontoregister-person-proxy/config.yml b/proxies/kontoregister-person-proxy/config.yml index 57c3da3eb58..f81254a9480 100644 --- a/proxies/kontoregister-person-proxy/config.yml +++ b/proxies/kontoregister-person-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 0e9d73bd9e2..26793591028 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-krrstub-proxy" diff --git a/proxies/krrstub-proxy/config.yml b/proxies/krrstub-proxy/config.yml index e42c8032586..f729a19f778 100644 --- a/proxies/krrstub-proxy/config.yml +++ b/proxies/krrstub-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 726d6f91832..98f419a895e 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -22,12 +22,12 @@ sonarqube { property "sonar.projectKey", "testnav-medl-proxy" property "sonar.projectName", "testnav-medl-proxy" property "sonar.organization", "navikt" - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.project.monorepo.enabled", true } } diff --git a/proxies/medl-proxy/config.yml b/proxies/medl-proxy/config.yml index 8a36fc50640..61d02c935b6 100644 --- a/proxies/medl-proxy/config.yml +++ b/proxies/medl-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 68b9fac5db6..e46b9090715 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-norg2-proxy" diff --git a/proxies/norg2-proxy/config.yml b/proxies/norg2-proxy/config.yml index a2e92392888..0bf3e3ac3f7 100644 --- a/proxies/norg2-proxy/config.yml +++ b/proxies/norg2-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index a54d1392209..fb5edf6f87e 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-pdl-proxy" diff --git a/proxies/pdl-proxy/config.yml b/proxies/pdl-proxy/config.yml index a40bdb9e0be..58d2e2c8b38 100644 --- a/proxies/pdl-proxy/config.yml +++ b/proxies/pdl-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 7cd76a85cfb..aba01e473d2 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-pensjon-testdata-facade-proxy" diff --git a/proxies/pensjon-testdata-facade-proxy/config.yml b/proxies/pensjon-testdata-facade-proxy/config.yml index 4273489cd35..c48bfae6e4b 100644 --- a/proxies/pensjon-testdata-facade-proxy/config.yml +++ b/proxies/pensjon-testdata-facade-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 54cac54afda..b429e7fe74f 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-saf-proxy" diff --git a/proxies/saf-proxy/config.yml b/proxies/saf-proxy/config.yml index afcaa73b9e7..43bbe175fdc 100644 --- a/proxies/saf-proxy/config.yml +++ b/proxies/saf-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 8961bf348d4..b5b93f70080 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-sigrunstub-proxy" diff --git a/proxies/sigrunstub-proxy/config.yml b/proxies/sigrunstub-proxy/config.yml index 46b8424c3b8..82fe4e78e6c 100644 --- a/proxies/sigrunstub-proxy/config.yml +++ b/proxies/sigrunstub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index b4e2d4f8539..a711ce5a38a 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-skjermingsregister-proxy" diff --git a/proxies/skjermingsregister-proxy/config.yml b/proxies/skjermingsregister-proxy/config.yml index 4b236e21ff7..5b935a86541 100644 --- a/proxies/skjermingsregister-proxy/config.yml +++ b/proxies/skjermingsregister-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true azure: diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index adf546b2ceb..ecbc8796587 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-synthdata-meldekort-proxy" diff --git a/proxies/synthdata-meldekort-proxy/config.yml b/proxies/synthdata-meldekort-proxy/config.yml index 1449416d40e..6f3c6b37886 100644 --- a/proxies/synthdata-meldekort-proxy/config.yml +++ b/proxies/synthdata-meldekort-proxy/config.yml @@ -27,7 +27,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true azure: diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index aea79ee5f51..711e8077cf6 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "tps-forvalteren-proxy" diff --git a/proxies/tps-forvalteren-proxy/config.test.yml b/proxies/tps-forvalteren-proxy/config.test.yml index e0010f44a34..50abdede2b7 100644 --- a/proxies/tps-forvalteren-proxy/config.test.yml +++ b/proxies/tps-forvalteren-proxy/config.test.yml @@ -9,7 +9,7 @@ spec: env: - name: PROXY_URL value: https://tps-forvalteren-dev.dev.adeo.no - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/tps-forvalteren-proxy/config.yml b/proxies/tps-forvalteren-proxy/config.yml index fe5c16c953e..8bec76b4ee6 100644 --- a/proxies/tps-forvalteren-proxy/config.yml +++ b/proxies/tps-forvalteren-proxy/config.yml @@ -9,7 +9,7 @@ spec: env: - name: PROXY_URL value: https://tps-forvalteren.dev.adeo.no - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index a882ec7bada..670fcab1e6a 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-udistub-proxy" diff --git a/proxies/udistub-proxy/config.yml b/proxies/udistub-proxy/config.yml index a96b640f29f..5f4537efe6e 100644 --- a/proxies/udistub-proxy/config.yml +++ b/proxies/udistub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true azure: From 780f145746ab303480125e32ad38bcdd749c582f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Thu, 4 Jan 2024 15:15:12 +0100 Subject: [PATCH 11/13] Oppdatert SivilstandService med riktig sekvens for Id (#3371) --- .../pdl/forvalter/service/SivilstandService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SivilstandService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SivilstandService.java index 3e86387eb87..76c8c734a14 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SivilstandService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SivilstandService.java @@ -27,6 +27,7 @@ import static no.nav.pdl.forvalter.consumer.command.VegadresseServiceCommand.defaultAdresse; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getKilde; import static no.nav.pdl.forvalter.utils.ArtifactUtils.getMaster; +import static no.nav.pdl.forvalter.utils.ArtifactUtils.renumberId; import static no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility.isSyntetisk; import static no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand.SAMBOER; import static no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand.UGIFT; @@ -48,11 +49,7 @@ public class SivilstandService implements Validation { public List convert(PersonDTO person) { - var iterator = person.getSivilstand().iterator(); - - while (iterator.hasNext()) { - - var type = iterator.next(); + for (var type : person.getSivilstand()) { if (isTrue(type.getIsNew())) { @@ -63,7 +60,10 @@ public List convert(PersonDTO person) { } } - return enforceIntegrity(person); + var oppdatertSivilstand = enforceIntegrity(person); + renumberId(oppdatertSivilstand); + + return oppdatertSivilstand; } @Override @@ -126,7 +126,7 @@ private void handle(SivilstandDTO sivilstand, PersonDTO hovedperson) { fellesAdresse.setId(relatertPerson.getBostedsadresse().stream() .map(BostedadresseDTO::getId).findFirst() .orElse(0) + 1); - relatertPerson.getBostedsadresse().add(0, fellesAdresse); + relatertPerson.getBostedsadresse().addFirst(fellesAdresse); } sivilstand.setBorIkkeSammen(null); @@ -152,7 +152,7 @@ private void createRelatertSivilstand(SivilstandDTO sivilstand, String hovedpers .max(Comparator.comparing(SivilstandDTO::getId)) .map(SivilstandDTO::getId) .orElse(0) + 1); - relatertPerson.getPerson().getSivilstand().add(0, relatertSivilstand); + relatertPerson.getPerson().getSivilstand().addFirst(relatertSivilstand); relatertPerson.getPerson().setSivilstand(enforceIntegrity(relatertPerson.getPerson())); personRepository.save(relatertPerson); From 9e021ad06125277e90d8b7767035f24c0d6bcc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Thu, 4 Jan 2024 15:16:25 +0100 Subject: [PATCH 12/13] Feature/slette hodejegeren (#3370) * Fjernet mn-synt-arbeidsforhold-service * Fjerning av hodejegeren og hodejegeren-proxy --- .github/workflows/app.hodejegeren.yml | 27 - .../app.mn-synt-arbeidsforhold-service.yml | 29 -- .github/workflows/proxy.hodejegeren-proxy.yml | 27 - .../config.yml | 2 - .../adapter/TpsIdentAdapter.java | 21 - .../config/Consumers.java | 2 - .../consumer/HodejegerenConsumer.java | 34 -- .../command/GetLevendeIdenterCommand.java | 42 -- .../GenererArbeidsforholdController.java | 13 - .../service/IdentService.java | 21 +- .../service/OrkestratorService.java | 9 - .../src/main/resources/application.yml | 5 - .../config.yml | 2 - apps/hodejegeren/Dockerfile | 8 - apps/hodejegeren/README.md | 26 - apps/hodejegeren/build.gradle | 97 ---- apps/hodejegeren/config.yml | 52 -- .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - apps/hodejegeren/gradlew | 234 --------- apps/hodejegeren/gradlew.bat | 89 ---- apps/hodejegeren/gradlewUpdate.sh | 3 - apps/hodejegeren/settings.gradle | 18 - .../HodejegerenApplicationStarter.java | 12 - .../hodejegeren/config/ApplicationConfig.java | 30 -- .../config/AutoTimingConfiguration.java | 17 - .../apps/hodejegeren/config/Consumers.java | 29 -- .../apps/hodejegeren/config/MongoConfig.java | 30 -- .../hodejegeren/config/OpenApiConfig.java | 69 --- .../hodejegeren/config/SecurityConfig.java | 41 -- .../apps/hodejegeren/config/VaultConfig.java | 37 -- .../hodejegeren/consumer/TpsfConsumer.java | 106 ---- .../command/GetTpsIdenterCommand.java | 37 -- .../GetTpsServiceRoutineV1Command.java | 34 -- .../GetTpsServiceRoutineV2Command.java | 35 -- .../GetTpsStatusPaaIdenterCommand.java | 36 -- .../hodejegeren/consumer/dto/Data1DTO.java | 13 - .../hodejegeren/consumer/dto/ResponseDTO.java | 12 - .../consumer/dto/ServiceRoutineDTO.java | 12 - .../apps/hodejegeren/domain/Person.java | 8 - .../exception/IdentIOException.java | 8 - .../exception/ManglendeInfoITpsException.java | 16 - .../exception/SidetallOverMaksException.java | 8 - .../apps/hodejegeren/logging/Level.java | 7 - .../apps/hodejegeren/logging/LogEvent.java | 28 - .../apps/hodejegeren/logging/LogEventDTO.java | 19 - .../apps/hodejegeren/logging/LogService.java | 30 -- .../apps/hodejegeren/mongodb/Data.java | 23 - .../apps/hodejegeren/mongodb/Kilde.java | 20 - .../hodejegeren/mongodb/SyntHistorikk.java | 28 - .../mongodb/SyntHistorikkRepository.java | 23 - .../hodejegeren/provider/CacheController.java | 41 -- .../provider/HistorikkController.java | 125 ----- .../provider/HodejegerenController.java | 257 ---------- .../provider/requests/DataRequest.java | 20 - .../provider/requests/HistorikkRequest.java | 20 - .../requests/skd/PersonDokumentWrapper.java | 55 -- .../requests/skd/innhold/Boadresse.java | 40 -- .../requests/skd/innhold/Doedshistorikk.java | 26 - .../requests/skd/innhold/Foreldreansvar.java | 28 - .../provider/requests/skd/innhold/Giro.java | 28 - .../requests/skd/innhold/Migrasjon.java | 29 -- .../provider/requests/skd/innhold/Navn.java | 32 -- .../skd/innhold/Oppholdstillatelse.java | 28 - .../requests/skd/innhold/PersonIdent.java | 30 -- .../requests/skd/innhold/PersonInfo.java | 28 - .../provider/requests/skd/innhold/Post.java | 32 -- .../skd/innhold/PrioritertAdresse.java | 28 - .../requests/skd/innhold/Relasjon.java | 31 -- .../requests/skd/innhold/Sivilstand.java | 28 - .../requests/skd/innhold/Statsborger.java | 28 - .../requests/skd/innhold/TelefonJobb.java | 29 -- .../requests/skd/innhold/TelefonMobil.java | 29 -- .../requests/skd/innhold/TelefonPrivat.java | 29 -- .../requests/skd/innhold/Tillegg.java | 39 -- .../provider/responses/NavEnhetResponse.java | 19 - .../kontoinfo/KontoinfoResponse.java | 28 - .../persondata/PersondataResponse.java | 30 -- .../provider/responses/relasjon/Relasjon.java | 27 - .../responses/relasjon/RelasjonsResponse.java | 20 - .../apps/hodejegeren/service/AsyncCache.java | 176 ------- .../hodejegeren/service/CacheService.java | 92 ---- .../service/EksisterendeIdenterService.java | 467 ----------------- .../EndringskodeTilFeltnavnMapperService.java | 55 -- .../hodejegeren/service/Endringskoder.java | 65 --- .../hodejegeren/service/HistorikkService.java | 253 --------- .../service/TpsStatusQuoService.java | 86 ---- .../service/TpsfFiltreringService.java | 65 --- .../utilities/PersonDokumentUtility.java | 481 ------------------ .../src/main/resources/application-local.yml | 4 - .../src/main/resources/application-prod.yml | 13 - .../src/main/resources/application.yml | 50 -- .../src/main/resources/bootstrap.yml | 4 - .../src/main/resources/logback-spring.xml | 40 -- .../hodejegeren/ApplicationContextTest.java | 21 - .../provider/CacheControllerTest.java | 34 -- .../provider/HistorikkControllerTest.java | 73 --- .../provider/HodejegerenControllerTest.java | 173 ------- .../hodejegeren/service/AsyncCacheTest.java | 76 --- .../hodejegeren/service/CacheServiceTest.java | 144 ------ .../EksisterendeIdenterServiceTest.java | 277 ---------- ...ringskodeTilFeltnavnMapperServiceTest.java | 48 -- .../service/HistorikkServiceTest.java | 231 --------- .../service/TpsStatusQuoServiceTest.java | 95 ---- .../service/TpsfFiltreringServiceTest.java | 106 ---- .../src/test/resources/application-test.yml | 25 - .../files/FS02-FDNUMMER-PERSRELA-O.json | 32 -- .../files/FS03-FDNUMMER-KERNINFO-O.json | 233 --------- .../files/historikk/TpsPersonDokumentType.xml | 316 ------------ .../files/historikk/historikk-request1.json | 35 -- .../files/historikk/historikk-request2.json | 35 -- .../resources/files/historikk/historikk1.json | 82 --- .../resources/files/historikk/historikk2.json | 37 -- .../files/persondata/persondata.json | 16 - .../resources/files/relasjoner/relasjon.json | 36 -- .../files/relasjoner/relasjoner.json | 51 -- .../files/relasjoner/tom_relasjon.json | 22 - .../files/tpsStatus/tps_kollisjon.json | 38 -- .../resources/files/tpsStatus/tps_status.json | 38 -- .../mn-synt-arbeidsforhold-service/Dockerfile | 10 - apps/mn-synt-arbeidsforhold-service/README.md | 27 - .../build.gradle | 95 ---- .../mn-synt-arbeidsforhold-service/config.yml | 55 -- .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - apps/mn-synt-arbeidsforhold-service/gradlew | 234 --------- .../gradlew.bat | 89 ---- .../gradlewUpdate.sh | 3 - .../settings.gradle | 19 - ...beidsforholdServiceApplicationStarter.java | 20 - .../adapter/IdentAdapter.java | 7 - .../adapter/TpsIdentAdapter.java | 20 - .../config/ApplicationConfig.java | 35 -- .../config/Consumers.java | 33 -- .../config/OpenApiConfig.java | 56 -- .../config/SecurityConfig.java | 40 -- .../config/SyntetiseringProperties.java | 15 - .../config/VaultConfig.java | 37 -- ...GenererOrganisasjonPopulasjonConsumer.java | 33 -- .../consumer/HodejegerenConsumer.java | 35 -- .../OppsummeringsdokumentConsumer.java | 115 ----- .../consumer/OrganisasjonConsumer.java | 67 --- .../consumer/SyntAmeldingConsumer.java | 121 ----- ...enerateArbeidsforholdHistorikkCommand.java | 45 -- .../GenerateStartArbeidsforholdCommand.java | 57 --- .../command/GetLevendeIdenterCommand.java | 42 -- ...GetOpplysningspliktigOrgnummerCommand.java | 40 -- .../consumer/dto/KodeverkDTO.java | 16 - .../domain/Arbeidsforhold.java | 251 --------- .../domain/ArbeidsforholdMap.java | 36 -- .../domain/Opplysningspliktig.java | 135 ----- .../domain/Organisajon.java | 38 -- .../exception/SyntetiseringException.java | 12 - .../provider/IdentController.java | 28 - .../OpplysningspliktigController.java | 51 -- .../ArbeidsforholdHistorikkService.java | 296 ----------- .../service/ArbeidsforholdSyntService.java | 32 -- .../service/IdentService.java | 48 -- .../service/OpplysningspliktigService.java | 65 --- .../src/main/resources/application-dev.yml | 19 - .../src/main/resources/application-prod.yml | 18 - .../src/main/resources/application.yml | 77 --- .../src/main/resources/bootstrap.yml | 21 - .../db/migration/V1__initial_database.sql | 7 - .../db/migration/V2__recreate_database.sql | 11 - .../src/main/resources/logback-spring.xml | 41 -- .../ApplicationContextTest.java | 21 - .../src/test/resources/bootstrap.yml | 1 - apps/oppsummeringsdokument-service/config.yml | 2 - apps/organisasjon-service/config.yml | 2 - .../README.md | 2 +- .../dto/hodejegeren/v1/PersondataDTO.java | 18 - proxies/hodejegeren-proxy/Dockerfile | 8 - proxies/hodejegeren-proxy/build.gradle | 78 --- proxies/hodejegeren-proxy/config.yml | 57 --- .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - proxies/hodejegeren-proxy/gradlew | 234 --------- proxies/hodejegeren-proxy/gradlew.bat | 89 ---- proxies/hodejegeren-proxy/gradlewUpdate.sh | 3 - proxies/hodejegeren-proxy/settings.gradle | 17 - .../proxies/hodejegerenproxy/Consumers.java | 29 -- .../HodejegerenProxyApplicationStarter.java | 51 -- .../src/main/resources/application-dev.yml | 2 - .../src/main/resources/application.yml | 28 - .../src/main/resources/bootstrap.yml | 4 - .../src/main/resources/logback-spring.xml | 40 -- .../ApplicationContextTest.java | 20 - .../resources/application-test.properties | 3 - proxies/tps-forvalteren-proxy/config.yml | 2 - settings.gradle | 3 - 191 files changed, 5 insertions(+), 10114 deletions(-) delete mode 100644 .github/workflows/app.hodejegeren.yml delete mode 100644 .github/workflows/app.mn-synt-arbeidsforhold-service.yml delete mode 100644 .github/workflows/proxy.hodejegeren-proxy.yml delete mode 100644 apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/adapter/TpsIdentAdapter.java delete mode 100644 apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/HodejegerenConsumer.java delete mode 100644 apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/command/GetLevendeIdenterCommand.java delete mode 100644 apps/hodejegeren/Dockerfile delete mode 100644 apps/hodejegeren/README.md delete mode 100644 apps/hodejegeren/build.gradle delete mode 100644 apps/hodejegeren/config.yml delete mode 100644 apps/hodejegeren/gradle/wrapper/gradle-wrapper.jar delete mode 100644 apps/hodejegeren/gradle/wrapper/gradle-wrapper.properties delete mode 100755 apps/hodejegeren/gradlew delete mode 100644 apps/hodejegeren/gradlew.bat delete mode 100755 apps/hodejegeren/gradlewUpdate.sh delete mode 100644 apps/hodejegeren/settings.gradle delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/HodejegerenApplicationStarter.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/ApplicationConfig.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/AutoTimingConfiguration.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/Consumers.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/MongoConfig.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/OpenApiConfig.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/TpsfConsumer.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsIdenterCommand.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV1Command.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV2Command.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsStatusPaaIdenterCommand.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/Data1DTO.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ResponseDTO.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ServiceRoutineDTO.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/domain/Person.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/IdentIOException.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/ManglendeInfoITpsException.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/SidetallOverMaksException.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/Level.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEvent.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEventDTO.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Data.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Kilde.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikk.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikkRepository.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/CacheController.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkController.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenController.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/DataRequest.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/HistorikkRequest.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/PersonDokumentWrapper.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Boadresse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Doedshistorikk.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Foreldreansvar.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Giro.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Migrasjon.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Navn.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Oppholdstillatelse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonIdent.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonInfo.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Post.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PrioritertAdresse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Relasjon.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Sivilstand.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Statsborger.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonJobb.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonMobil.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonPrivat.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Tillegg.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/NavEnhetResponse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/kontoinfo/KontoinfoResponse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/persondata/PersondataResponse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/Relasjon.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/RelasjonsResponse.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/AsyncCache.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/CacheService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/Endringskoder.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/HistorikkService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringService.java delete mode 100644 apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/utilities/PersonDokumentUtility.java delete mode 100644 apps/hodejegeren/src/main/resources/application-local.yml delete mode 100644 apps/hodejegeren/src/main/resources/application-prod.yml delete mode 100644 apps/hodejegeren/src/main/resources/application.yml delete mode 100644 apps/hodejegeren/src/main/resources/bootstrap.yml delete mode 100644 apps/hodejegeren/src/main/resources/logback-spring.xml delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/ApplicationContextTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/CacheControllerTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkControllerTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenControllerTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/AsyncCacheTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/CacheServiceTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterServiceTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperServiceTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/HistorikkServiceTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoServiceTest.java delete mode 100644 apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringServiceTest.java delete mode 100644 apps/hodejegeren/src/test/resources/application-test.yml delete mode 100644 apps/hodejegeren/src/test/resources/files/FS02-FDNUMMER-PERSRELA-O.json delete mode 100644 apps/hodejegeren/src/test/resources/files/FS03-FDNUMMER-KERNINFO-O.json delete mode 100644 apps/hodejegeren/src/test/resources/files/historikk/TpsPersonDokumentType.xml delete mode 100644 apps/hodejegeren/src/test/resources/files/historikk/historikk-request1.json delete mode 100644 apps/hodejegeren/src/test/resources/files/historikk/historikk-request2.json delete mode 100644 apps/hodejegeren/src/test/resources/files/historikk/historikk1.json delete mode 100644 apps/hodejegeren/src/test/resources/files/historikk/historikk2.json delete mode 100644 apps/hodejegeren/src/test/resources/files/persondata/persondata.json delete mode 100644 apps/hodejegeren/src/test/resources/files/relasjoner/relasjon.json delete mode 100644 apps/hodejegeren/src/test/resources/files/relasjoner/relasjoner.json delete mode 100644 apps/hodejegeren/src/test/resources/files/relasjoner/tom_relasjon.json delete mode 100644 apps/hodejegeren/src/test/resources/files/tpsStatus/tps_kollisjon.json delete mode 100644 apps/hodejegeren/src/test/resources/files/tpsStatus/tps_status.json delete mode 100644 apps/mn-synt-arbeidsforhold-service/Dockerfile delete mode 100644 apps/mn-synt-arbeidsforhold-service/README.md delete mode 100644 apps/mn-synt-arbeidsforhold-service/build.gradle delete mode 100644 apps/mn-synt-arbeidsforhold-service/config.yml delete mode 100644 apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.jar delete mode 100644 apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties delete mode 100755 apps/mn-synt-arbeidsforhold-service/gradlew delete mode 100644 apps/mn-synt-arbeidsforhold-service/gradlew.bat delete mode 100755 apps/mn-synt-arbeidsforhold-service/gradlewUpdate.sh delete mode 100644 apps/mn-synt-arbeidsforhold-service/settings.gradle delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/MNSyntArbeidsforholdServiceApplicationStarter.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/IdentAdapter.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/TpsIdentAdapter.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/ApplicationConfig.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/Consumers.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/OpenApiConfig.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SyntetiseringProperties.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/GenererOrganisasjonPopulasjonConsumer.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/HodejegerenConsumer.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OppsummeringsdokumentConsumer.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OrganisasjonConsumer.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/SyntAmeldingConsumer.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateArbeidsforholdHistorikkCommand.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateStartArbeidsforholdCommand.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetLevendeIdenterCommand.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetOpplysningspliktigOrgnummerCommand.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/dto/KodeverkDTO.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Arbeidsforhold.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/ArbeidsforholdMap.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Opplysningspliktig.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Organisajon.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/exception/SyntetiseringException.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/IdentController.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/OpplysningspliktigController.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdHistorikkService.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdSyntService.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/IdentService.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/OpplysningspliktigService.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/application-dev.yml delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/application-prod.yml delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/application.yml delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/bootstrap.yml delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V1__initial_database.sql delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V2__recreate_database.sql delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/main/resources/logback-spring.xml delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/ApplicationContextTest.java delete mode 100644 apps/mn-synt-arbeidsforhold-service/src/test/resources/bootstrap.yml delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/hodejegeren/v1/PersondataDTO.java delete mode 100644 proxies/hodejegeren-proxy/Dockerfile delete mode 100644 proxies/hodejegeren-proxy/build.gradle delete mode 100644 proxies/hodejegeren-proxy/config.yml delete mode 100644 proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.jar delete mode 100644 proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.properties delete mode 100755 proxies/hodejegeren-proxy/gradlew delete mode 100644 proxies/hodejegeren-proxy/gradlew.bat delete mode 100755 proxies/hodejegeren-proxy/gradlewUpdate.sh delete mode 100644 proxies/hodejegeren-proxy/settings.gradle delete mode 100644 proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/Consumers.java delete mode 100644 proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java delete mode 100644 proxies/hodejegeren-proxy/src/main/resources/application-dev.yml delete mode 100644 proxies/hodejegeren-proxy/src/main/resources/application.yml delete mode 100644 proxies/hodejegeren-proxy/src/main/resources/bootstrap.yml delete mode 100644 proxies/hodejegeren-proxy/src/main/resources/logback-spring.xml delete mode 100644 proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java delete mode 100644 proxies/hodejegeren-proxy/src/test/resources/application-test.properties diff --git a/.github/workflows/app.hodejegeren.yml b/.github/workflows/app.hodejegeren.yml deleted file mode 100644 index 607c0220016..00000000000 --- a/.github/workflows/app.hodejegeren.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: testnorge-hodejegeren - -on: - push: - paths: - - libs/domain - - libs/security-core - - libs/servlet-core - - libs/servlet-security - - apps/hodejegeren/** - - .github/workflows/app.hodejegeren.yml - -jobs: - workflow: - uses: ./.github/workflows/common.workflow.backend.yml - with: - cluster: "dev-fss" - working-directory: "apps/hodejegeren" - deploy-tag: "#deploy-hodejegeren" - permissions: - contents: read - id-token: write - secrets: - NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }} - NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - NAV_TOKEN: ${{ secrets.NAV_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/app.mn-synt-arbeidsforhold-service.yml b/.github/workflows/app.mn-synt-arbeidsforhold-service.yml deleted file mode 100644 index f5e982ab381..00000000000 --- a/.github/workflows/app.mn-synt-arbeidsforhold-service.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: mn-synt-arbeidsforhold-service - -on: - push: - paths: - - libs/commands - - libs/data-transfer-objects - - libs/database - - libs/security-core - - libs/servlet-core - - libs/servlet-security - - apps/mn-synt-arbeidsforhold-service/** - - .github/workflows/app.mn-synt-arbeidsforhold-service.yml - -jobs: - workflow: - uses: ./.github/workflows/common.workflow.backend.yml - with: - cluster: "dev-fss" - working-directory: "apps/mn-synt-arbeidsforhold-service" - deploy-tag: "#deploy-mn-synt-arbeidsforhold-service" - permissions: - contents: read - id-token: write - secrets: - NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }} - NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - NAV_TOKEN: ${{ secrets.NAV_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/proxy.hodejegeren-proxy.yml b/.github/workflows/proxy.hodejegeren-proxy.yml deleted file mode 100644 index 362a1235fe8..00000000000 --- a/.github/workflows/proxy.hodejegeren-proxy.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: hodejegeren-proxy - -on: - push: - paths: - - libs/reactive-core - - libs/reactive-proxy - - libs/reactive-security - - libs/security-core - - proxies/hodejegeren-proxy/** - - .github/workflows/proxy.hodejegeren-proxy.yml - -jobs: - workflow: - uses: ./.github/workflows/common.workflow.backend.yml - with: - cluster: "dev-fss" - working-directory: "proxies/hodejegeren-proxy" - deploy-tag: "#deploy-proxy" - permissions: - contents: read - id-token: write - secrets: - NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }} - NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - NAV_TOKEN: ${{ secrets.NAV_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/apps/generer-arbeidsforhold-populasjon-service/config.yml b/apps/generer-arbeidsforhold-populasjon-service/config.yml index 652323b02bf..c853bf54dd2 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/config.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/config.yml @@ -30,8 +30,6 @@ spec: - application: testnav-generer-organisasjon-populasjon-service - application: testnav-organisasjon-service - application: synthdata-amelding - external: - - host: testnav-hodejegeren-proxy.dev-fss-pub.nais.io liveness: path: /internal/isAlive initialDelay: 4 diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/adapter/TpsIdentAdapter.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/adapter/TpsIdentAdapter.java deleted file mode 100644 index a4a812cbef4..00000000000 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/adapter/TpsIdentAdapter.java +++ /dev/null @@ -1,21 +0,0 @@ -package no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.adapter; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import reactor.core.publisher.Flux; - -import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.consumer.HodejegerenConsumer; - - -@Slf4j -@Component -@RequiredArgsConstructor -public class TpsIdentAdapter implements IdentAdapter { - private final HodejegerenConsumer hodejegerenConsumer; - - @Override - public Flux getIdenter(String miljo, int antall) { - return hodejegerenConsumer.getIdenter(miljo, antall); - } -} diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/Consumers.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/Consumers.java index 52a558dc3f0..76985531a44 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/Consumers.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/Consumers.java @@ -25,9 +25,7 @@ public class Consumers { private ServerProperties testnavGenererOrganisasjonPopulasjonService; - private ServerProperties testnavHodejegerenProxy; private ServerProperties oppsummeringsdokumentService; private ServerProperties testnavOrganisasjonService; private ServerProperties syntAmelding; - } diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/HodejegerenConsumer.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/HodejegerenConsumer.java deleted file mode 100644 index 7cad2607bb2..00000000000 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/HodejegerenConsumer.java +++ /dev/null @@ -1,34 +0,0 @@ -package no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.consumer; - -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.config.Consumers; -import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.consumer.command.GetLevendeIdenterCommand; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; - -@Slf4j -@Component -public class HodejegerenConsumer { - private final WebClient webClient; - private final TokenExchange tokenExchange; - private final ServerProperties serverProperties; - - public HodejegerenConsumer( - TokenExchange tokenExchange, - Consumers consumers) { - - serverProperties = consumers.getTestnavHodejegerenProxy(); - this.tokenExchange = tokenExchange; - this.webClient = WebClient.builder() - .baseUrl(serverProperties.getUrl()) - .build(); - } - - public Flux getIdenter(String miljo, int antall) { - var accessToken = tokenExchange.exchange(serverProperties).block(); - return new GetLevendeIdenterCommand(webClient, miljo, antall, accessToken.getTokenValue()).call(); - } -} diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/command/GetLevendeIdenterCommand.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/command/GetLevendeIdenterCommand.java deleted file mode 100644 index e5a37b7f431..00000000000 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/consumer/command/GetLevendeIdenterCommand.java +++ /dev/null @@ -1,42 +0,0 @@ -package no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.consumer.command; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.commands.utils.WebClientFilter; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; -import reactor.util.retry.Retry; - -import java.time.Duration; -import java.util.concurrent.Callable; - -@Slf4j -@RequiredArgsConstructor -public class GetLevendeIdenterCommand implements Callable> { - private final WebClient webClient; - private final String miljo; - private final int max; - private final String token; - - @Override - public Flux call() { - log.info("Henter {} identer i {}...", max, miljo); - return webClient - .get() - .uri(builder -> builder - .path("/api/v2/levende-identer/100000883") - .queryParam("miljoe", miljo) - .queryParam("max", max) - .queryParam("minimumAlder", 18) - .build() - ) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .retrieve() - .bodyToFlux(String.class) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)); - } -} diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/controller/GenererArbeidsforholdController.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/controller/GenererArbeidsforholdController.java index d9f0102d1c5..b5484bfc465 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/controller/GenererArbeidsforholdController.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/controller/GenererArbeidsforholdController.java @@ -3,15 +3,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.service.OrkestratorService; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDate; - @Slf4j @RestController @RequiredArgsConstructor @@ -20,16 +17,6 @@ public class GenererArbeidsforholdController { private final OrkestratorService orkestratorService; - @PostMapping(value = "/populate") - public void populate( - @RequestHeader String miljo, - @RequestHeader Integer max, - @RequestParam("fom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fom, - @RequestParam("tom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate tom - ) { - orkestratorService.orkestrerUtenArbeidsforhold(max, miljo, fom, tom); - } - @PostMapping(value = "/develop") public void populate( @RequestHeader String miljo, diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/IdentService.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/IdentService.java index bcfe9e9cc3a..e2031c933f2 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/IdentService.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/IdentService.java @@ -2,25 +2,21 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.consumer.OppsummeringsdokumentConsumer; +import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.OppsummeringsdokumentDTO; +import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.PersonDTO; +import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.VirksomhetDTO; import org.springframework.stereotype.Service; -import reactor.core.publisher.Flux; import java.util.Collection; import java.util.Set; import java.util.stream.Collectors; -import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.adapter.TpsIdentAdapter; -import no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.consumer.OppsummeringsdokumentConsumer; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.OppsummeringsdokumentDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.PersonDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.VirksomhetDTO; - @Slf4j @Service @RequiredArgsConstructor public class IdentService { private final OppsummeringsdokumentConsumer arbeidsforholdConsumer; - private final TpsIdentAdapter tpsIdentAdapter; public Set getIdenterMedArbeidsforhold(String miljo) { var identer = arbeidsforholdConsumer @@ -35,13 +31,4 @@ public Set getIdenterMedArbeidsforhold(String miljo) { log.info("Fant {} identer i {}.", identer.size(), miljo); return identer; } - - public Flux getIdenterUtenArbeidsforhold(String miljo, int max) { - var identer = tpsIdentAdapter.getIdenter(miljo, max); - - var identerMedArbeidsforhold = getIdenterMedArbeidsforhold(miljo); - - return identer.filter(ident -> !identerMedArbeidsforhold.contains(ident)); - } - } diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/OrkestratorService.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/OrkestratorService.java index 9b2d4081a46..c442603285d 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/OrkestratorService.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/service/OrkestratorService.java @@ -4,8 +4,6 @@ import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; -import java.time.LocalDate; - @Service @RequiredArgsConstructor public class OrkestratorService { @@ -13,16 +11,9 @@ public class OrkestratorService { private final PersonArbeidsforholdHistorkkService personArbeidsforholdHistorkkService; private final OppsummeringsdokumentService oppsummeringsdokumentService; - public void orkestrerUtenArbeidsforhold(int max, String miljo, LocalDate fom, LocalDate tom) { - var identerUtenArbeidsforhold = identService.getIdenterUtenArbeidsforhold(miljo, max); - var personer = personArbeidsforholdHistorkkService.generer(identerUtenArbeidsforhold, miljo, fom, tom); - oppsummeringsdokumentService.save(personer, miljo); - } - public void orkestrerMedArbeidsforhold(String miljo, int months) { var identerMedArbeidsforhold = identService.getIdenterMedArbeidsforhold(miljo); var personer = personArbeidsforholdHistorkkService.generer(Flux.fromStream(identerMedArbeidsforhold.stream()), miljo, months); oppsummeringsdokumentService.save(personer, miljo); } - } diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml index 76463bb816d..85c6c31d85d 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml @@ -30,11 +30,6 @@ consumers: cluster: dev-gcp namespace: dolly name: synthdata-amelding - testnav-hodejegeren-proxy: - cluster: dev-fss - namespace: dolly - name: testnav-hodejegeren-proxy - url: https://testnav-hodejegeren-proxy.dev-fss-pub.nais.io oppsummeringsdokument-service: cluster: dev-gcp namespace: dolly diff --git a/apps/generer-organisasjon-populasjon-service/config.yml b/apps/generer-organisasjon-populasjon-service/config.yml index 8f2ba32678e..f67f0d39469 100644 --- a/apps/generer-organisasjon-populasjon-service/config.yml +++ b/apps/generer-organisasjon-populasjon-service/config.yml @@ -22,8 +22,6 @@ spec: cluster: dev-gcp - application: testnav-oversikt-frontend cluster: dev-gcp - - application: mn-synt-arbeidsforhold-service - cluster: dev-fss - application: testnav-generer-arbeidsforhold-populasjon-service cluster: dev-gcp outbound: diff --git a/apps/hodejegeren/Dockerfile b/apps/hodejegeren/Dockerfile deleted file mode 100644 index bdb2684b81c..00000000000 --- a/apps/hodejegeren/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ghcr.io/navikt/baseimages/temurin:21 -LABEL maintainer="Team Dolly" - -ADD /build/libs/app.jar /app/app.jar - -ENV JAVA_OPTS="-Dspring.profiles.active=prod" - -EXPOSE 8080 \ No newline at end of file diff --git a/apps/hodejegeren/README.md b/apps/hodejegeren/README.md deleted file mode 100644 index e4d74170302..00000000000 --- a/apps/hodejegeren/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# Hodejegeren -Testnorge-Hodejegeren er en applikasjon som henter identer fra avspillergrupper i TPSF. Den har mulighet til å filtrere -identene på en rekke ulike egenskaper, og kan også returnere detaljert informasjon om identene, hentet fra TPS. - -Applikasjonen tilbyr også en søkefunksjon, der man kan søke etter visse egenskaper, og få identene som tilfredsstiller -egenskapene i retur. Dette er mulig fordi applikasjonen har sin egen database som lagrer informasjon om identene, noe -som muligjør indeksering av egenskaper. - -## Swagger -Swagger finnes under [/swagger](https://testnorge-hodejegeren.dev.intern.nav.no/swagger) -endepunktet til applikasjonen. - -## Lokal kjøring -Ha naisdevice kjørende og kjør HodejegerenApplicationStarter med følgende argumenter: -``` --Dspring.cloud.vault.token=[kopier token fra vault] -``` - -### Utviklerimage -I utviklerimage brukes ikke naisdevice og du må legge til følgende ekstra argumenter: -``` --Djavax.net.ssl.trustStore=[path til lokal truststore] --Djavax.net.ssl.trustStorePassword=[passord til lokal truststore] -``` - -**Notat:** -MongoDB nås ikke utenfor utviklerimage. diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle deleted file mode 100644 index 95cda1b2dbd..00000000000 --- a/apps/hodejegeren/build.gradle +++ /dev/null @@ -1,97 +0,0 @@ -plugins { - id 'java' - id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.3" - id "jacoco" -} - -test { - useJUnitPlatform() -} - -jacocoTestReport { - reports { - xml.required = true - } -} - -sonarqube { - properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true - property "sonar.projectKey", "testnorge-hodejegeren" - property "sonar.projectName", "testnorge-hodejegeren" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -dependencies { - - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:servlet-security' - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:domain' - - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-mongodb' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'com.jayway.jsonpath:json-path:2.7.0' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - implementation 'org.aspectj:aspectjweaver:1.9.7' - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - - implementation 'no.nav.registre:testnorge-consumers:1.12.0-RELEASE' - implementation 'com.google.guava:guava:31.1-jre' - - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/apps/hodejegeren/config.yml b/apps/hodejegeren/config.yml deleted file mode 100644 index a983e80fa5c..00000000000 --- a/apps/hodejegeren/config.yml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: "nais.io/v1alpha1" -kind: "Application" -metadata: - name: testnorge-hodejegeren - namespace: dolly - labels: - team: dolly -spec: - image: "{{image}}" - port: 8080 - webproxy: true - liveness: - path: /internal/isAlive - periodSeconds: 30 - readiness: - path: /internal/isReady - prometheus: - enabled: true - path: /internal/metrics - replicas: - min: 1 - max: 2 - vault: - enabled: true - resources: - requests: - cpu: 1000m - memory: 1024Mi - limits: - memory: 2048Mi - accessPolicy: - inbound: - rules: - - application: team-dolly-lokal-app - cluster: dev-gcp - - application: testnav-hodejegeren-proxy - cluster: dev-fss - - application: mn-synt-arbeidsforhold-service - cluster: dev-fss - - application: testnav-oversikt-frontend - cluster: dev-gcp - outbound: - rules: - - application: tps-forvalteren-proxy - cluster: dev-fss - azure: - application: - allowAllUsers: true - enabled: true - tenant: nav.no - ingresses: - - "https://testnorge-hodejegeren.dev.intern.nav.no" # dev-fss diff --git a/apps/hodejegeren/gradle/wrapper/gradle-wrapper.jar b/apps/hodejegeren/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/apps/hodejegeren/gradle/wrapper/gradle-wrapper.properties b/apps/hodejegeren/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a54a..00000000000 --- a/apps/hodejegeren/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/apps/hodejegeren/gradlew b/apps/hodejegeren/gradlew deleted file mode 100755 index 3da45c161b0..00000000000 --- a/apps/hodejegeren/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright ? 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?, -# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?; -# * compound commands having a testable exit status, especially ?case?; -# * various built-in commands including ?command?, ?set?, and ?ulimit?. -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/apps/hodejegeren/gradlew.bat b/apps/hodejegeren/gradlew.bat deleted file mode 100644 index ac1b06f9382..00000000000 --- a/apps/hodejegeren/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/apps/hodejegeren/gradlewUpdate.sh b/apps/hodejegeren/gradlewUpdate.sh deleted file mode 100755 index e5ee6361152..00000000000 --- a/apps/hodejegeren/gradlewUpdate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gradle wrapper \ No newline at end of file diff --git a/apps/hodejegeren/settings.gradle b/apps/hodejegeren/settings.gradle deleted file mode 100644 index 4e945a03fcf..00000000000 --- a/apps/hodejegeren/settings.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id "com.gradle.enterprise" version "3.12.3" -} - -rootProject.name = 'hodejegeren' - - -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/security-core' -includeBuild '../../libs/servlet-security' -includeBuild '../../libs/domain' - -gradleEnterprise { - buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/HodejegerenApplicationStarter.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/HodejegerenApplicationStarter.java deleted file mode 100644 index b8fdc3e970b..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/HodejegerenApplicationStarter.java +++ /dev/null @@ -1,12 +0,0 @@ -package no.nav.testnav.apps.hodejegeren; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class HodejegerenApplicationStarter { - - public static void main(String[] args) { - SpringApplication.run(HodejegerenApplicationStarter.class, args); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/ApplicationConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/ApplicationConfig.java deleted file mode 100644 index ee6bf2f49ee..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/ApplicationConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.core.task.TaskExecutor; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -@Configuration -@EnableAsync -@Import(value = { - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) -public class ApplicationConfig { - - @Bean - public TaskExecutor executor() { - final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setMaxPoolSize(100); - executor.setCorePoolSize(50); - executor.setThreadNamePrefix("thread-pool-"); - executor.initialize(); - return executor; - } - -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/AutoTimingConfiguration.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/AutoTimingConfiguration.java deleted file mode 100644 index 6662085329b..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/AutoTimingConfiguration.java +++ /dev/null @@ -1,17 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import io.micrometer.core.aop.TimedAspect; -import io.micrometer.core.instrument.MeterRegistry; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; - -@Configuration -@EnableAspectJAutoProxy -public class AutoTimingConfiguration { - - @Bean - public TimedAspect timedAspect(MeterRegistry registry) { - return new TimedAspect(registry); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/Consumers.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/Consumers.java deleted file mode 100644 index fdc9e87ee5d..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/Consumers.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -import static lombok.AccessLevel.PACKAGE; - -/** - * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}. - *

- * Husk at Spring Boot bruker relaxed binding - * mellom configuration properties og field names. - * - * @see ServerProperties - */ -@Configuration -@ConfigurationProperties(prefix = "consumers") -@NoArgsConstructor(access = PACKAGE) -@Getter -@Setter(PACKAGE) -public class Consumers { - - private ServerProperties tpsfProxy; - -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/MongoConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/MongoConfig.java deleted file mode 100644 index ec8a71805b3..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/MongoConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; - -@Configuration -public class MongoConfig extends AbstractMongoClientConfiguration { - - @Value("${spring.data.mongodb.database}") - private String databaseName; - - @Value("${spring.data.mongodb.host}") - private String databaseHost; - - @Value("${spring.data.mongodb.port}") - private Integer databasePort; - - @Override - protected String getDatabaseName() { - return databaseName; - } - - @Override - public MongoClient mongoClient() { - return MongoClients.create("mongodb://" + databaseHost + ":" + databasePort); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/OpenApiConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/OpenApiConfig.java deleted file mode 100644 index da653338edd..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/OpenApiConfig.java +++ /dev/null @@ -1,69 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.security.SecurityRequirement; -import io.swagger.v3.oas.models.security.SecurityScheme; -import no.nav.testnav.libs.securitycore.config.UserConstant; -import no.nav.testnav.libs.servletcore.config.ApplicationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.Arrays; - -@Configuration -@Import(ApplicationProperties.class) -public class OpenApiConfig implements WebMvcConfigurer { - - @Bean - public OpenAPI openApi(ApplicationProperties applicationProperties) { - return new OpenAPI() - .components(new Components() - .addSecuritySchemes("bearer-jwt", new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT") - .in(SecurityScheme.In.HEADER) - .name("Authorization") - .description("Trenger ikke \"Bearer \" foran") - ) - .addSecuritySchemes("user-jwt", new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .scheme("bearer") - .bearerFormat("JWT") - .in(SecurityScheme.In.HEADER) - .name(UserConstant.USER_HEADER_JWT) - )) - .addSecurityItem( - new SecurityRequirement() - .addList("bearer-jwt", Arrays.asList("read", "write")) - .addList("user-jwt", Arrays.asList("read", "write")) - ) - .info(new Info() - .title(applicationProperties.getName()) - .version(applicationProperties.getVersion()) - .description(applicationProperties.getDescription()) - .termsOfService("https://nav.no") - .contact(new Contact() - .url("https://nav-it.slack.com/archives/CA3P9NGA2") - .email("dolly@nav.no") - .name("Team Dolly") - ) - .license(new License() - .name("MIT License") - .url("https://opensource.org/licenses/MIT") - ) - ); - } - - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/swagger").setViewName("redirect:/swagger-ui.html"); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java deleted file mode 100644 index d92f159d314..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; -import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.web.SecurityFilterChain; - - -/** - * Remove this call with AzureAd config - */ -@Slf4j -@Configuration -@Order(1) -public class SecurityConfig { - - @Bean - public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - - httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers( - "/internal/**", - "/webjars/**", - "/swagger-resources/**", - "/v3/api-docs/**", - "/swagger-ui/**", - "/swagger", - "/error", - "/swagger-ui.html" - ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); - - return httpSecurity.build(); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java deleted file mode 100644 index b051e109861..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.vault.annotation.VaultPropertySource; -import org.springframework.vault.authentication.ClientAuthentication; -import org.springframework.vault.authentication.TokenAuthentication; -import org.springframework.vault.client.VaultEndpoint; -import org.springframework.vault.config.AbstractVaultConfiguration; - -import static io.micrometer.common.util.StringUtils.isBlank; - -@Configuration -@Profile("local") -@VaultPropertySource(value = "kv/preprod/fss/testnorge-hodejegeren/local", ignoreSecretNotFound = false) -@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false) -public class VaultConfig extends AbstractVaultConfiguration { - - private static final String VAULT_TOKEN = "spring.cloud.vault.token"; - - @Override - public VaultEndpoint vaultEndpoint() { - return VaultEndpoint.create("vault.adeo.no", 443); - } - - @Override - public ClientAuthentication clientAuthentication() { - if (System.getenv().containsKey("VAULT_TOKEN")) { - System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN")); - } - var token = System.getProperty(VAULT_TOKEN); - if (isBlank(token)) { - throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); - } - return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/TpsfConsumer.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/TpsfConsumer.java deleted file mode 100644 index 25ba1d929e9..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/TpsfConsumer.java +++ /dev/null @@ -1,106 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.micrometer.core.annotation.Timed; -import no.nav.testnav.apps.hodejegeren.config.Consumers; -import no.nav.testnav.apps.hodejegeren.consumer.command.GetTpsIdenterCommand; -import no.nav.testnav.apps.hodejegeren.consumer.command.GetTpsServiceRoutineV1Command; -import no.nav.testnav.apps.hodejegeren.consumer.command.GetTpsServiceRoutineV2Command; -import no.nav.testnav.apps.hodejegeren.consumer.command.GetTpsStatusPaaIdenterCommand; -import no.nav.testnav.apps.hodejegeren.consumer.dto.ServiceRoutineDTO; -import no.nav.testnav.libs.securitycore.domain.AccessToken; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; -import org.apache.tomcat.util.buf.StringUtils; -import org.springframework.http.client.reactive.ReactorClientHttpConnector; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.ExchangeStrategies; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.netty.http.client.HttpClient; - -import java.io.IOException; -import java.time.Duration; -import java.util.List; -import java.util.Set; - -@Component -public class TpsfConsumer { - private final WebClient webClient; - private final TokenExchange tokenExchange; - private final ServerProperties serverProperties; - - public TpsfConsumer( - Consumers consumers, - TokenExchange tokenExchange - ) { - serverProperties = consumers.getTpsfProxy(); - this.tokenExchange = tokenExchange; - HttpClient client = HttpClient - .create() - .responseTimeout(Duration.ofMinutes(2)); - this.webClient = WebClient - .builder() - .exchangeStrategies( - ExchangeStrategies - .builder() - .codecs( - configurer -> configurer - .defaultCodecs() - .maxInMemorySize(16 * 1024 * 1024)) - .build()) - .baseUrl(serverProperties.getUrl()) - .clientConnector(new ReactorClientHttpConnector(client)) - .build(); - } - - @Timed(value = "hodejegeren.resource.latency", extraTags = {"operation", "tpsf"}) - public Set getIdenterFiltrertPaaAarsakskode( - Long avspillergruppeId, - List aarsakskode, - String transaksjonstype - ) { - return tokenExchange.exchange(serverProperties).flatMap(accessToken -> new GetTpsIdenterCommand( - webClient, - accessToken.getTokenValue(), - StringUtils.join(aarsakskode, ','), - transaksjonstype, avspillergruppeId).call()) - .block(); - } - - public JsonNode getTpsServiceRoutine( - String routineName, - String aksjonsKode, - String miljoe, - String fnr - ) throws IOException { - var response = tokenExchange.exchange(serverProperties) - .flatMap(accessToken -> new GetTpsServiceRoutineV1Command( - webClient, accessToken.getTokenValue(), routineName, aksjonsKode, miljoe, fnr).call()).block(); - return new ObjectMapper().readTree(response); - } - - public Mono getToken() { - return tokenExchange.exchange(serverProperties); - } - - public Flux getTpsServiceRoutineV2(String routineName, String aksjonsKode, String miljoe, String fnr, AccessToken token) { - return new GetTpsServiceRoutineV2Command(webClient, token.getTokenValue(), routineName, aksjonsKode, miljoe, fnr).call(); - } - - @Timed(value = "hodejegeren.resource.latency", extraTags = {"operation", "tpsf"}) - public JsonNode hentTpsStatusPaaIdenter( - String aksjonskode, - String miljoe, - List identer - ) throws IOException { - var identerSomString = String.join(",", identer); - var response = tokenExchange.exchange(serverProperties).flatMap(accessToken -> - new GetTpsStatusPaaIdenterCommand( - webClient, accessToken.getTokenValue(), aksjonskode, identer.size(), miljoe, identerSomString).call()) - .block(); - return new ObjectMapper().readTree(response).findValue("response"); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsIdenterCommand.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsIdenterCommand.java deleted file mode 100644 index df145358b83..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsIdenterCommand.java +++ /dev/null @@ -1,37 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.command; - -import lombok.RequiredArgsConstructor; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpHeaders; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; - -import java.util.Set; -import java.util.concurrent.Callable; - -@RequiredArgsConstructor -public class GetTpsIdenterCommand implements Callable>> { - - private static final ParameterizedTypeReference> RESPONSE_TYPE = new ParameterizedTypeReference<>() { - }; - private final WebClient webClient; - private final String token; - private final String aarsakkode; - private final String transaksjonstype; - private final Long avspillergruppeId; - - @Override - public Mono> call() { - return webClient - .get() - .uri(builder -> builder - .path("/api/v1/endringsmelding/skd/identer/{avspillergruppeId}") - .queryParam("aarsakskode", aarsakkode) - .queryParam("transaksjonstype", transaksjonstype) - .build(avspillergruppeId) - ) - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .retrieve() - .bodyToMono(RESPONSE_TYPE); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV1Command.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV1Command.java deleted file mode 100644 index 5bd4af01ebc..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV1Command.java +++ /dev/null @@ -1,34 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.command; - -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpHeaders; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; - -import java.util.concurrent.Callable; - -@RequiredArgsConstructor -public class GetTpsServiceRoutineV1Command implements Callable> { - private final WebClient webClient; - private final String token; - private final String routineName; - private final String aksjonsKode; - private final String miljoe; - private final String fnr; - - @Override - public Mono call() { - return webClient - .get() - .uri(builder -> builder - .path("/api/v1/serviceroutine/{routineName}") - .queryParam("aksjonsKode", aksjonsKode) - .queryParam("environment", miljoe) - .queryParam("fnr", fnr) - .build(routineName) - ) - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .retrieve() - .bodyToMono(String.class); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV2Command.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV2Command.java deleted file mode 100644 index e9960abda37..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsServiceRoutineV2Command.java +++ /dev/null @@ -1,35 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.command; - -import lombok.RequiredArgsConstructor; -import no.nav.testnav.apps.hodejegeren.consumer.dto.ServiceRoutineDTO; -import org.springframework.http.HttpHeaders; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; - -import java.util.concurrent.Callable; - -@RequiredArgsConstructor -public class GetTpsServiceRoutineV2Command implements Callable> { - private final WebClient webClient; - private final String token; - private final String routineName; - private final String aksjonsKode; - private final String miljoe; - private final String fnr; - - @Override - public Flux call() { - return webClient - .get() - .uri(builder -> builder - .path("/api/v1/serviceroutine/{routineName}") - .queryParam("aksjonsKode", aksjonsKode) - .queryParam("environment", miljoe) - .queryParam("fnr", fnr) - .build(routineName) - ) - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .retrieve() - .bodyToFlux(ServiceRoutineDTO.class); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsStatusPaaIdenterCommand.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsStatusPaaIdenterCommand.java deleted file mode 100644 index 81f83c60d68..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/command/GetTpsStatusPaaIdenterCommand.java +++ /dev/null @@ -1,36 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.command; - -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpHeaders; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; - -import java.util.concurrent.Callable; - -@RequiredArgsConstructor -public class GetTpsStatusPaaIdenterCommand implements Callable> { - - private final WebClient webClient; - private final String token; - private final String aksjonsKode; - private final int antallIdenter; - private final String miljoe; - private final String identer; - - @Override - public Mono call() { - return webClient - .get() - .uri(builder -> builder - .path("/api/v1/serviceroutine/FS03-FDLISTER-DISKNAVN-M") - .queryParam("aksjonsKode", aksjonsKode) - .queryParam("antallFnr", antallIdenter) - .queryParam("environment", miljoe) - .queryParam("nFnr", identer) - .build() - ) - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .retrieve() - .bodyToMono(String.class); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/Data1DTO.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/Data1DTO.java deleted file mode 100644 index 44339f28cfd..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/Data1DTO.java +++ /dev/null @@ -1,13 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class Data1DTO { - String datoDo; - String fnr; -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ResponseDTO.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ResponseDTO.java deleted file mode 100644 index 7c09f4082aa..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ResponseDTO.java +++ /dev/null @@ -1,12 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class ResponseDTO { - Data1DTO data1; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ServiceRoutineDTO.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ServiceRoutineDTO.java deleted file mode 100644 index 41cbe4ef1e8..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/consumer/dto/ServiceRoutineDTO.java +++ /dev/null @@ -1,12 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.consumer.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class ServiceRoutineDTO { - ResponseDTO response; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/domain/Person.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/domain/Person.java deleted file mode 100644 index 265e5cb557e..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/domain/Person.java +++ /dev/null @@ -1,8 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.domain; - -import lombok.Value; - -@Value -public class Person { - String fnr; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/IdentIOException.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/IdentIOException.java deleted file mode 100644 index 320e6325368..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/IdentIOException.java +++ /dev/null @@ -1,8 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.exception; - -public class IdentIOException extends RuntimeException { - - public IdentIOException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/ManglendeInfoITpsException.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/ManglendeInfoITpsException.java deleted file mode 100644 index e4352e2fa93..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/ManglendeInfoITpsException.java +++ /dev/null @@ -1,16 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.exception; - -public class ManglendeInfoITpsException extends RuntimeException { - - public ManglendeInfoITpsException() { - super(); - } - - public ManglendeInfoITpsException(String message) { - super(message); - } - - public ManglendeInfoITpsException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/SidetallOverMaksException.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/SidetallOverMaksException.java deleted file mode 100644 index d394957f865..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/exception/SidetallOverMaksException.java +++ /dev/null @@ -1,8 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.exception; - -public class SidetallOverMaksException extends RuntimeException { - - public SidetallOverMaksException(String message) { - super(message); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/Level.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/Level.java deleted file mode 100644 index b37e0beb0b6..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/Level.java +++ /dev/null @@ -1,7 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.logging; - -public enum Level { - WARNING, - ERROR, - INFO -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEvent.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEvent.java deleted file mode 100644 index fb3bf8ddfd5..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEvent.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.logging; - -import lombok.Value; - -import java.util.HashMap; -import java.util.Map; - -@Value -public class LogEvent { - - private Level level; - private String message; - private String key; - - public LogEvent( - LogEventDTO dto - ) { - level = dto.getLevel(); - message = dto.getMessage(); - key = dto.getKey(); - } - - public Map toPropertyMap() { - Map properties = new HashMap<>(); - properties.put("key", key); - return properties; - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEventDTO.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEventDTO.java deleted file mode 100644 index de551b61963..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogEventDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.logging; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LogEventDTO { - - private Level level; - private String message; - private String key; -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogService.java deleted file mode 100644 index 7edc78a12d5..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/logging/LogService.java +++ /dev/null @@ -1,30 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.logging; - -import lombok.extern.slf4j.Slf4j; -import org.slf4j.MDC; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class LogService { - - public void log(LogEvent event) { - MDC.clear(); - MDC.setContextMap(event.toPropertyMap()); - switch (event.getLevel()) { - case INFO: - log.info(event.getMessage()); - break; - case WARNING: - log.warn(event.getMessage()); - break; - case ERROR: - log.error(event.getMessage()); - break; - default: - log.debug(event.getMessage()); - break; - } - MDC.clear(); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Data.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Data.java deleted file mode 100644 index ccdc181a65e..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Data.java +++ /dev/null @@ -1,23 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.mongodb; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class Data { - - private LocalDateTime datoOpprettet; - - private LocalDateTime datoEndret; - - private Object innhold; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Kilde.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Kilde.java deleted file mode 100644 index c241222438f..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/Kilde.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.mongodb; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class Kilde { - - private String navn; - private List data; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikk.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikk.java deleted file mode 100644 index f51bf8b1159..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikk.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.mongodb; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.time.LocalDateTime; -import java.util.List; - -@Document -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class SyntHistorikk { - - @Id - private String id; - - private LocalDateTime datoRekvirert; - - private List kilder; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikkRepository.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikkRepository.java deleted file mode 100644 index e5aee9d4f92..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/mongodb/SyntHistorikkRepository.java +++ /dev/null @@ -1,23 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.mongodb; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.mongodb.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface SyntHistorikkRepository extends MongoRepository { - - @Query(value = "{'kilder.navn' : ?0}", fields = "{'_id':1}") - List findAllIdsByKildenavn(String kilde); - - List findAllByIdIn(List ids); - - Page findAllByIdIn( - List ids, - Pageable pageable - ); -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/CacheController.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/CacheController.java deleted file mode 100644 index 3773f6f380f..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/CacheController.java +++ /dev/null @@ -1,41 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider; - -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Set; - -import no.nav.testnav.apps.hodejegeren.service.CacheService; - -@RestController -@RequestMapping("api/v1/cache") -@RequiredArgsConstructor -public class CacheController { - - private final CacheService cacheService; - - @GetMapping("/oppdaterGruppe/{avspillergruppeId}") - @ApiOperation(value = "Her kan man manuelt trigge oppdatering av en cache med en gitt avspillergruppeId.") - public String oppdaterGruppeCache(@PathVariable Long avspillergruppeId) { - var oppdatertAvspillergruppe = cacheService.oppdaterAlleCacher(avspillergruppeId); - return "Avspillergruppe " + oppdatertAvspillergruppe + " har oppdatert sine cacher."; - } - - @GetMapping("/oppdaterAlle") - @ApiOperation(value = "Her kan man manuelt trigge oppdatering av cachene til alle registrerte avspillergrupper. Endepunktet vil også fjerne " - + "cacher til uregsitrerte avspillergrupper.") - public String oppdaterAlleCaches() { - var oppdaterteAvspillergrupper = cacheService.oppdaterAlleCacher(); - return "Avspillergrupper " + oppdaterteAvspillergrupper.toString() + " har oppdatert sine cacher"; - } - - @GetMapping("/grupper") - @ApiOperation(value = "Her kan man hente id-ene til alle cachede avspillergrupper.") - public Set hentCachedeAvspillergruppeIder() { - return cacheService.hentCachedeAvspillergruppeIder(); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkController.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkController.java deleted file mode 100644 index a576eb83812..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkController.java +++ /dev/null @@ -1,125 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - -import lombok.RequiredArgsConstructor; -import no.nav.testnav.apps.hodejegeren.exception.SidetallOverMaksException; -import no.nav.testnav.apps.hodejegeren.provider.requests.HistorikkRequest; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; - -import no.nav.testnav.apps.hodejegeren.mongodb.SyntHistorikk; -import no.nav.testnav.apps.hodejegeren.service.HistorikkService; -import no.nav.testnav.libs.domain.dto.namespacetps.TpsPersonDokumentType; - -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("api/v1/historikk") -public class HistorikkController { - - private static final String MAX_PAGE_STRING = "Max størrelse på side: "; - private static final int MAX_PAGE_SIZE = 100; - - private final HistorikkService historikkService; - - @ApiOperation(value = "Hent all historikk fra databasen.") - @GetMapping() - public List hentAllHistorikk( - @RequestParam(required = false, defaultValue = "0") Integer pageNumber, - @RequestParam(required = false, defaultValue = "10") Integer pageSize - ) { - if (pageSize > MAX_PAGE_SIZE) { - throw new SidetallOverMaksException(MAX_PAGE_STRING + MAX_PAGE_SIZE); - } - return historikkService.hentAllHistorikk(pageNumber, pageSize); - } - - @ApiOperation(value = "Hent all historikk med en gitt kilde fra databasen.") - @GetMapping("medKilde") - public List hentHistorikkMedKilde( - @RequestParam List kilder, - @RequestParam(required = false, defaultValue = "0") Integer pageNumber, - @RequestParam(required = false, defaultValue = "10") Integer pageSize - ) { - if (pageSize > MAX_PAGE_SIZE) { - throw new SidetallOverMaksException(MAX_PAGE_STRING + MAX_PAGE_SIZE); - } - return historikkService.hentHistorikkMedKilder(kilder, pageNumber, pageSize); - } - - @ApiOperation(value = "Hent historikk med visse kriterier fra databasen.") - @GetMapping("soek/{keywords}") - public List hentHistorikkMedKriterier( - @PathVariable String keywords, - @RequestParam List kilder, - @RequestParam(required = false, defaultValue = "0") Integer pageNumber, - @RequestParam(required = false, defaultValue = "10") Integer pageSize - ) { - if (pageSize > MAX_PAGE_SIZE) { - throw new SidetallOverMaksException(MAX_PAGE_STRING + MAX_PAGE_SIZE); - } - return historikkService.hentHistorikkMedKriterier(kilder, pageNumber, pageSize, new ArrayList<>(Arrays.asList(keywords.split("&")))); - } - - @ApiOperation(value = "Hent alle id-ene som er registrert med en gitt kilde fra databasen.") - @GetMapping("idsMedKilde") - public Set hentIdsMedKilde(@RequestParam List kilder) { - return historikkService.hentIdsMedKilder(kilder); - } - - @ApiOperation(value = "Hent all historikk på en gitt id fra databasen.") - @GetMapping("{id}") - public SyntHistorikk hentHistorikkMedId(@PathVariable String id) { - return historikkService.hentHistorikkMedId(id); - } - - @ApiOperation(value = "Legg til ny historikk i databasen") - @PostMapping() - public List leggTilHistorikk(@RequestBody HistorikkRequest historikkRequest) { - if ("skd".equals(historikkRequest.getKilde())) { - log.error("Skd historikk opprettes gjennom persondokumenter fra orkestratoren."); - return new ArrayList<>(); - } else { - return historikkService.leggTilHistorikkPaaIdent(historikkRequest); - } - } - - @ApiOperation(value = "Oppdater persondokument i databasen.") - @PostMapping(value = "skd/oppdaterDokument/{ident}") - public List oppdaterTpsPersonDokument( - @PathVariable String ident, - @RequestBody TpsPersonDokumentType tpsPersonDokument - ) { - log.info("Oppdaterer persondokument for ident {}", ident); - return historikkService.oppdaterTpsPersonDokument(ident, tpsPersonDokument); - } - - @ApiOperation(value = "Slett historikk med en gitt id fra databasen.") - @DeleteMapping(value = "{id}") - public ResponseEntity slettHistorikk(@PathVariable String id) { - return historikkService.slettHistorikk(id); - } - - @ApiOperation(value = "Slett historikk på en gitt kilde på en gitt id fra databasen.") - @DeleteMapping(value = "kilde/{id}") - public ResponseEntity slettKilde( - @PathVariable String id, - @RequestParam String navnPaaKilde - ) { - return historikkService.slettKilde(id, navnPaaKilde); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenController.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenController.java deleted file mode 100644 index 175f5c2ed1c..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenController.java +++ /dev/null @@ -1,257 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider; - -import com.fasterxml.jackson.databind.JsonNode; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import no.nav.testnav.apps.hodejegeren.provider.responses.NavEnhetResponse; -import no.nav.testnav.apps.hodejegeren.provider.responses.kontoinfo.KontoinfoResponse; -import no.nav.testnav.apps.hodejegeren.provider.responses.persondata.PersondataResponse; -import no.nav.testnav.apps.hodejegeren.provider.responses.relasjon.RelasjonsResponse; -import no.nav.testnav.apps.hodejegeren.service.CacheService; -import no.nav.testnav.apps.hodejegeren.service.EksisterendeIdenterService; -import no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Flux; - -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@RestController -@RequiredArgsConstructor -public class HodejegerenController { - - public static final int MIN_ALDER = 0; - public static final int MAX_ALDER = 200; - - private final EksisterendeIdenterService eksisterendeIdenterService; - private final CacheService cacheService; - private final EndringskodeTilFeltnavnMapperService endringskodeTilFeltnavnMapperService; - - @ApiOperation(value = "Her kan man hente alle identer i en gitt avspillergruppe i TPSF.") - @GetMapping("api/v1/alle-identer/{avspillergruppeId}") - public List hentAlleIdenterIGruppe( - @PathVariable("avspillergruppeId") Long avspillergruppeId - ) { - return cacheService.hentAlleIdenterCache(avspillergruppeId); - } - - @ApiOperation(value = "Her kan man hente alle levende identer i en gitt avspillergruppe i TPSF.") - @GetMapping("api/v1/alle-levende-identer/{avspillergruppeId}") - public List hentLevendeIdenterIGruppe( - @PathVariable("avspillergruppeId") Long avspillergruppeId - ) { - return cacheService.hentLevendeIdenterCache(avspillergruppeId); - } - - @ApiOperation(value = "Her kan man hente alle døde og utvandrede identer fra en gitt avspillergruppe i TPSF.") - @GetMapping("api/v1/doede-identer/{avspillergruppeId}") - public List hentDoedeOgUtvandredeIdenterIGruppe( - @PathVariable("avspillergruppeId") Long avspillergruppeId - ) { - return cacheService.hentDoedeOgUtvandredeIdenterCache(avspillergruppeId); - } - - @ApiOperation(value = "Her kan man hente et gitt antall gifte identer fra en gitt avspillergruppe i TPSF.") - @GetMapping("api/v1/gifte-identer/{avspillergruppeId}") - public List hentGifteIdenterIGruppe( - @PathVariable("avspillergruppeId") Long avspillergruppeId - ) { - return cacheService.hentGifteIdenterCache(avspillergruppeId); - } - - @ApiOperation(value = "Her kan et gitt antall levende identer hentes fra en gitt avspillergruppe i TPSF. " - + "Systemet sjekker status-quo på personen i det angitte miljø. En minimum alder på personene kan oppgis.") - @GetMapping("api/v1/levende-identer/{avspillergruppeId}") - public List hentLevendeIdenter( - @PathVariable("avspillergruppeId") Long avspillergruppeId, - @RequestParam("miljoe") String miljoe, - @RequestParam(value = "antallIdenter", required = false) Integer antallIdenter, - @RequestParam(value = "minimumAlder", required = false) Integer minimumAlder - ) { - if (minimumAlder == null || minimumAlder < MIN_ALDER) { - minimumAlder = MIN_ALDER; - } - return eksisterendeIdenterService - .hentLevendeIdenter(avspillergruppeId, miljoe, antallIdenter, minimumAlder) - .collectList() - .block(); - } - - @ApiOperation(value = "Her kan et gitt antall levende identer hentes fra en gitt avspillergruppe i TPSF. " - + "Systemet sjekker status-quo på personen i det angitte miljø. En minimum alder på personene kan oppgis.") - @GetMapping(value = "api/v2/levende-identer/{avspillergruppeId}", produces = MediaType.TEXT_EVENT_STREAM_VALUE) - public Flux hentLevendeIdenterV2( - @PathVariable("avspillergruppeId") Long avspillergruppeId, - @RequestParam("miljoe") String miljoe, - @RequestParam(value = "max", required = false) Integer antallIdenter, - @RequestParam(value = "minimumAlder", required = false) Integer minimumAlder - ) { - if (minimumAlder == null || minimumAlder < MIN_ALDER) { - minimumAlder = MIN_ALDER; - } - return eksisterendeIdenterService - .hentLevendeIdenter(avspillergruppeId, miljoe, antallIdenter, minimumAlder); - } - - @ApiOperation(value = "Her kan man hente ut alle levende identer over en viss alder.") - @GetMapping("api/v1/levende-identer-over-alder/{avspillergruppeId}") - public List hentAlleLevendeIdenterOverAlder( - @PathVariable Long avspillergruppeId, - @RequestParam int minimumAlder - ) { - if (minimumAlder < MIN_ALDER) { - throw new IllegalArgumentException("Minimum alder kan ikke være lavere enn " + MIN_ALDER); - } - return eksisterendeIdenterService.finnAlleIdenterOverAlder(avspillergruppeId, minimumAlder); - } - - @ApiOperation(value = "Her kan man hente ut alle levende identer i en viss aldersgruppe.") - @GetMapping("api/v1/levende-identer-i-aldersgruppe/{avspillergruppeId}") - public List hentAlleIdenterIAldersgruppe( - @PathVariable Long avspillergruppeId, - @RequestParam int minimumAlder, - @RequestParam int maksimumAlder - ) { - validerAlder(minimumAlder, maksimumAlder); - return eksisterendeIdenterService.finnLevendeIdenterIAldersgruppe(avspillergruppeId, minimumAlder, maksimumAlder); - } - - @ApiOperation(value = """ - Her bestilles et gitt antall identer med tilhørende nav-enhet som hentes tilfeldig fra TPSF. - Disse er føreløpig ikke garantert til å være gyldige fnr med tilhørende arbeidsforhold for å få en sykemelding. - De er garantert til å være myndige.""") - @GetMapping("api/v1/fnr-med-navkontor/{avspillergruppeId}") - public List hentEksisterendeMyndigeIdenterMedNavKontor( - @PathVariable("avspillergruppeId") Long avspillergruppeId, - @RequestParam("miljoe") String miljoe, - @RequestParam("antallIdenter") int antallIdenter - ) { - var myndigeIdenter = eksisterendeIdenterService - .hentLevendeIdenter(avspillergruppeId, miljoe, antallIdenter, 18) - .collectList() - .block(); - return eksisterendeIdenterService.hentFnrMedNavKontor(miljoe, myndigeIdenter); - } - - @ApiOperation(value = "Her kan man sjekke status quo på en ident i TPS.") - @GetMapping("api/v1/status-quo") - public Map hentStatusQuoFraEndringskode( - @RequestParam("endringskode") String endringskode, - @RequestParam("miljoe") String miljoe, - @RequestParam("fnr") String fnr - ) throws IOException { - return new HashMap<>(endringskodeTilFeltnavnMapperService.getStatusQuoFraAarsakskode(endringskode, miljoe, fnr)); - } - - @ApiOperation(value = "Her kan man hente en liste over identer i en gitt avspillergruppe med tilhørende status-quo " - + "i et gitt miljø.") - @GetMapping("api/v1/status-quo-identer/{avspillergruppeId}") - public Map hentEksisterendeIdenterMedStatusQuo( - @PathVariable("avspillergruppeId") Long avspillergruppeId, - @RequestParam("miljoe") String miljoe, - @RequestParam("antallIdenter") int antallIdenter, - @RequestParam(value = "minimumAlder", required = false, defaultValue = "" + MIN_ALDER) Integer minimumAlder, - @RequestParam(value = "maksimumAlder", required = false, defaultValue = "" + MAX_ALDER) Integer maksimumAlder - ) { - validerAlder(minimumAlder, maksimumAlder); - return eksisterendeIdenterService.hentGittAntallIdenterMedStatusQuo(avspillergruppeId, miljoe, antallIdenter, minimumAlder, maksimumAlder); - } - - @ApiOperation(value = "Her kan man hente navn- og adresseinformasjon til gitte identer i et gitt miljø.") - @PostMapping("api/v1/adresse-paa-identer") - public Map hentAdressePaaIdenter( - @RequestParam String miljoe, - @RequestBody List identer - ) { - return eksisterendeIdenterService.hentAdressePaaIdenter(miljoe, identer); - } - - @ApiOperation(value = "Her kan man hente alle fødte identer fra en gitt avspillergruppe i TPSF.") - @GetMapping("api/v1/foedte-identer/{avspillergruppeId}") - public List hentFoedteIdenter( - @PathVariable Long avspillergruppeId, - @RequestParam(required = false, defaultValue = "" + MIN_ALDER) Integer minimumAlder, - @RequestParam(required = false, defaultValue = "" + MAX_ALDER) Integer maksimumAlder - ) { - validerAlder(minimumAlder, maksimumAlder); - return eksisterendeIdenterService.finnFoedteIdenter(avspillergruppeId, minimumAlder, maksimumAlder); - } - - @ApiOperation(value = "Her kan man hente persondata til en ident i et gitt miljø i TPS.") - @GetMapping("api/v1/persondata") - public PersondataResponse hentPersondataTilIdent( - @RequestParam String ident, - @RequestParam String miljoe - ) { - return eksisterendeIdenterService.hentPersondata(ident, miljoe); - } - - @ApiOperation(value = "Her kan man hente identer med norsk kontonummer og tilhørende kjerneinfo") - @GetMapping("api/v1/identer-med-kontonummer/{avspillergruppeId}") - public List hentPersondataMedKontoinformasjon( - @PathVariable("avspillergruppeId") Long avspillergruppeId, - @RequestParam("miljoe") String miljoe, - @RequestParam("antallIdenter") int antallIdenter, - @RequestParam(value = "minimumAlder", required = false, defaultValue = "" + MIN_ALDER) Integer minimumAlder, - @RequestParam(value = "maksimumAlder", required = false, defaultValue = "" + MAX_ALDER) Integer maksimumAlder - ) { - validerAlder(minimumAlder, maksimumAlder); - return eksisterendeIdenterService.hentGittAntallIdenterMedKononummerinfo(avspillergruppeId, miljoe, antallIdenter, minimumAlder, maksimumAlder); - } - - @ApiOperation(value = "Her kan man hente relasjonene til en ident i et gitt miljø i TPS.") - @GetMapping("api/v1/relasjoner-til-ident") - public RelasjonsResponse hentRelasjonerTilIdent( - @RequestParam String ident, - @RequestParam String miljoe - ) { - return eksisterendeIdenterService.hentRelasjoner(ident, miljoe); - } - - @ApiOperation(value = "Her kan man hente identer som er i avspillergruppe, men ikke i TPS i gitt miljø.") - @GetMapping("api/v1/identer-ikke-i-tps/{avspillergruppeId}") - public List hentIdenterSomIkkeErITps( - @PathVariable Long avspillergruppeId, - @RequestParam String miljoe - ) { - return eksisterendeIdenterService.hentIdenterSomIkkeErITps(avspillergruppeId, miljoe); - } - - @ApiOperation(value = "Her kan man hente identer som er i avspillergruppe, og som kolliderer med miljø p i TPS.") - @GetMapping("api/v1/identer-som-kolliderer/{avspillergruppeId}") - public List hentIdenterSomKolliderer( - @PathVariable Long avspillergruppeId - ) { - return eksisterendeIdenterService.hentIdenterSomKolliderer(avspillergruppeId); - } - - @ApiOperation(value = "Her kan man finne ut hvilke identer i en gitt liste, som finnes i en gitt avspillergruppe. Endepunktet returnerer de identene i lista som også finnes i avspillergruppen.") - @PostMapping("api/v1/filtrerIdenter/{avspillergruppeId}") - public Set filtrerIdenter( - @PathVariable Long avspillergruppeId, - @RequestBody Set identer - ) { - Set identerIGruppe = new HashSet<>(cacheService.hentAlleIdenterCache(avspillergruppeId)); - identerIGruppe.retainAll(identer); - return identerIGruppe; - } - - private static void validerAlder( - Integer minimumAlder, - Integer maksimumAlder - ) { - if (minimumAlder < MIN_ALDER || maksimumAlder < minimumAlder) { - throw new IllegalArgumentException("Minimum alder kan ikke være høyere enn maksimum alder"); - } - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/DataRequest.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/DataRequest.java deleted file mode 100644 index 0cf9eb6fae8..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/DataRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class DataRequest { - - private String id; - private List data; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/HistorikkRequest.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/HistorikkRequest.java deleted file mode 100644 index f588eecca24..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/HistorikkRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class HistorikkRequest { - - private String kilde; - private List identMedData; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/PersonDokumentWrapper.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/PersonDokumentWrapper.java deleted file mode 100644 index 436d473b5a0..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/PersonDokumentWrapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; - -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Boadresse; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Doedshistorikk; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Foreldreansvar; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Giro; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Migrasjon; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Navn; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Oppholdstillatelse; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.PersonIdent; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.PersonInfo; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Post; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.PrioritertAdresse; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Relasjon; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Sivilstand; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Statsborger; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.TelefonJobb; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.TelefonMobil; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.TelefonPrivat; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Tillegg; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class PersonDokumentWrapper { - - private PersonIdent personIdent; - private PersonInfo personInfo; - private Navn navn; - private Sivilstand sivilstand; - private Statsborger statsborger; - private Doedshistorikk doedshistorikk; - private TelefonPrivat telefonPrivat; - private TelefonJobb telefonJobb; - private TelefonMobil telefonMobil; - private Boadresse boadresse; - private PrioritertAdresse prioritertAdresse; - private List foreldreansvar; - private Oppholdstillatelse oppholdstillatelse; - private Giro giro; - private Tillegg tillegg; - private Post post; - private Migrasjon migrasjon; - private List relasjoner; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Boadresse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Boadresse.java deleted file mode 100644 index ab4cb443024..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Boadresse.java +++ /dev/null @@ -1,40 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Boadresse { - - private String adresse; - private String land; - private String kommune; - private String postnr; - private String bydel; - private String offentligGateKode; - private String offentligHusnr; - private String offentligBokstav; - private String offentligBolignr; - private String matrikkelGardsnr; - private String matrikkelBruksnr; - private String matrikkelFestenr; - private String matrikkelUndernr; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Doedshistorikk.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Doedshistorikk.java deleted file mode 100644 index 36f56f4e0a2..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Doedshistorikk.java +++ /dev/null @@ -1,26 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Doedshistorikk { - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate dato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate regDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Foreldreansvar.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Foreldreansvar.java deleted file mode 100644 index eeac35a91aa..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Foreldreansvar.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Foreldreansvar { - - private String ident; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Giro.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Giro.java deleted file mode 100644 index df253a02811..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Giro.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Giro { - - private String nummer; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Migrasjon.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Migrasjon.java deleted file mode 100644 index c1e2559c300..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Migrasjon.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Migrasjon { - - private String type; - private String land; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Navn.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Navn.java deleted file mode 100644 index 721fec09eb8..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Navn.java +++ /dev/null @@ -1,32 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Navn { - - private String forkortet; - private String slektsnavn; - private String fornavn; - private String mellomnavn; - private String slektsnavnUgift; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Oppholdstillatelse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Oppholdstillatelse.java deleted file mode 100644 index 2d6c7fe0d8f..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Oppholdstillatelse.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Oppholdstillatelse { - - private String status; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonIdent.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonIdent.java deleted file mode 100644 index f7f394e5183..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonIdent.java +++ /dev/null @@ -1,30 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class PersonIdent { - - private String id; - private String type; - private String status; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonInfo.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonInfo.java deleted file mode 100644 index 70f0e9c39ff..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PersonInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class PersonInfo { - - private String kjoenn; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate datoFoedt; - private String foedtLand; - private String foedtKommune; - private String status; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Post.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Post.java deleted file mode 100644 index dcc41e30a31..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Post.java +++ /dev/null @@ -1,32 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Post { - - private String adresse1; - private String adresse2; - private String adresse3; - private String postnr; - private String postland; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PrioritertAdresse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PrioritertAdresse.java deleted file mode 100644 index 11a732b1d3d..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/PrioritertAdresse.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class PrioritertAdresse { - - private String type; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Relasjon.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Relasjon.java deleted file mode 100644 index 0ad9b37a0a0..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Relasjon.java +++ /dev/null @@ -1,31 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Relasjon { - - private String ident; - private String type; - private String status; - private String rolle; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Sivilstand.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Sivilstand.java deleted file mode 100644 index 4d2f9a9a787..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Sivilstand.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Sivilstand { - - private String type; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Statsborger.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Statsborger.java deleted file mode 100644 index 5198f07bf38..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Statsborger.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Statsborger { - - private String land; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonJobb.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonJobb.java deleted file mode 100644 index 3e91caeeca8..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonJobb.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class TelefonJobb { - - private String retningslinje; - private String nummer; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonMobil.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonMobil.java deleted file mode 100644 index 4407e939616..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonMobil.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class TelefonMobil { - - private String retningslinje; - private String nummer; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonPrivat.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonPrivat.java deleted file mode 100644 index ab684ff53be..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/TelefonPrivat.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class TelefonPrivat { - - private String retningslinje; - private String nummer; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Tillegg.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Tillegg.java deleted file mode 100644 index 0768957df20..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/requests/skd/innhold/Tillegg.java +++ /dev/null @@ -1,39 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class Tillegg { - - private String adresse1; - private String adresse2; - private String adresse3; - private String postnr; - private String kommunenr; - private String gateKode; - private String husnummer; - private String husbokstav; - private String bolignummer; - private String bydel; - private String postboksnr; - private String postboksAnlegg; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate fraDato; - - @JsonFormat(shape = JsonFormat.Shape.STRING) - private LocalDate tilDato; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/NavEnhetResponse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/NavEnhetResponse.java deleted file mode 100644 index 70df3043806..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/NavEnhetResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.responses; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class NavEnhetResponse { - - private String ident; - private String navEnhet; - private String navEnhetBeskrivelse; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/kontoinfo/KontoinfoResponse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/kontoinfo/KontoinfoResponse.java deleted file mode 100644 index 91ed102f234..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/kontoinfo/KontoinfoResponse.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.responses.kontoinfo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class KontoinfoResponse { - - private String fnr; - private String kortnavn; - private String fornavn; - private String mellomnavn; - private String etternavn; - private String kontonummer; - private String navn; - private String adresseLinje1; - private String adresseLinje2; - private String adresseLinje3; - private String postnr; - private String landkode; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/persondata/PersondataResponse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/persondata/PersondataResponse.java deleted file mode 100644 index 5c3d5760734..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/persondata/PersondataResponse.java +++ /dev/null @@ -1,30 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.responses.persondata; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class PersondataResponse { - - private String fnr; - private String kortnavn; - private String fornavn; - private String mellomnavn; - private String etternavn; - private String kodeStatsborger; - private String statsborger; - private String datoStatsborger; - private String kodeSivilstand; - private String sivilstand; - private String datoSivilstand; - private String kodeInnvandretFra; - private String innvandretFra; - private String datoInnvandret; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/Relasjon.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/Relasjon.java deleted file mode 100644 index 37156d0f79d..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/Relasjon.java +++ /dev/null @@ -1,27 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.responses.relasjon; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class Relasjon { - - private String kortnavn; - private String datoDo; - private String typeRelBeskr; - private String mellomnavn; - private String etternavn; - private int adresseStatus; - private String adrStatusBeskr; - private String spesregType; - private String fornavn; - private String fnrRelasjon; - private String typeRelasjon; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/RelasjonsResponse.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/RelasjonsResponse.java deleted file mode 100644 index aa6e7e9cb8f..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/provider/responses/relasjon/RelasjonsResponse.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider.responses.relasjon; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class RelasjonsResponse { - - private String fnr; - private List relasjoner; -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/AsyncCache.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/AsyncCache.java deleted file mode 100644 index 1df11c08cba..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/AsyncCache.java +++ /dev/null @@ -1,176 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Klasse som håndterer caching av avspillergrupper for å gjøre hodejegeren mer responsiv. - * Avspillergrupper i listen fasteAvspillergrupper blir oppdatert regelmessig. Ved dette tidspunkt blir andre grupper slettet fra cachen. - * Hodejegeren oppdaterer cachen på en gruppe etter at et kall har blitt gjort mot den gitte gruppen, for å holde cachen oppdatert til senere kall. - */ -@Slf4j -@Service -@Getter -@Setter -@RequiredArgsConstructor -@EnableScheduling -public class AsyncCache { - - private final TpsfFiltreringService tpsfFiltreringService; - - @Value("#{'${cache.avspillergrupper}'.split(',')}") - private List fasteAvspillergrupper; - - private Map> alleIdenterCache; - private Map> levendeIdenterCache; - private Map> doedeOgUtvandredeIdenterCache; - private Map> gifteIdenterCache; - private Map> foedteIdenterCache; - - @Async - public void asyncOppdaterAlleIdenterCache(Long avspillergruppeId) { - oppdaterCache(alleIdenterCache, avspillergruppeId, tpsfFiltreringService.finnAlleIdenter(avspillergruppeId)); - } - - @Async - public void asyncOppdaterLevendeIdenterCache(Long avspillergruppeId) { - oppdaterCache(levendeIdenterCache, avspillergruppeId, tpsfFiltreringService.finnLevendeIdenter(avspillergruppeId)); - } - - @Async - public void asyncOppdaterDoedeOgUtvandredeIdenterCache(Long avspillergruppeId) { - oppdaterCache(doedeOgUtvandredeIdenterCache, avspillergruppeId, tpsfFiltreringService.finnDoedeOgUtvandredeIdenter(avspillergruppeId)); - } - - @Async - public void asyncOppdaterGifteIdenterCache(Long avspillergruppeId) { - oppdaterCache(gifteIdenterCache, avspillergruppeId, tpsfFiltreringService.finnGifteIdenter(avspillergruppeId)); - } - - @Async - public void asyncOppdaterFoedteIdenterCache(Long avspillergruppeId) { - oppdaterCache(foedteIdenterCache, avspillergruppeId, tpsfFiltreringService.finnFoedteIdenter(avspillergruppeId)); - } - - /** - * Oppdaterer cachene hver sjette time. De avspillergruppene som ikke er registrert som faste cacher blir nullstilt ved dette tidspunkt - */ - @Scheduled(cron = "0 0 */6 * * *") - public void oppdaterAlleCacherRutine() { - oppdaterAlleCacher(); - } - - public List oppdaterAlleCacher() { - log.info("Oppdaterer cacher til avspillergrupper: {}", fasteAvspillergrupper.toString()); - sjekkOmCacherErNull(); - fjernUregistrerteCacher(); - - for (Long avspillergruppeId : fasteAvspillergrupper) { - oppdaterAlleIdenterCache(avspillergruppeId); - oppdaterLevendeIdenterCache(avspillergruppeId); - oppdaterDoedeOgUtvandredeIdenterCache(avspillergruppeId); - oppdaterGifteIdenterCache(avspillergruppeId); - oppdaterFoedteIdenterCache(avspillergruppeId); - } - - log.info("Faste cacher har blitt oppdatert"); - return fasteAvspillergrupper; - } - - public Long oppdaterAlleCacher(Long avspillergruppeId) { - log.info("Oppdaterer cacher til avspillergruppe: " + avspillergruppeId.toString().replaceAll("[\r\n]", "")); - oppdaterAlleIdenterCache(avspillergruppeId); - oppdaterLevendeIdenterCache(avspillergruppeId); - oppdaterDoedeOgUtvandredeIdenterCache(avspillergruppeId); - oppdaterGifteIdenterCache(avspillergruppeId); - return avspillergruppeId; - } - - public void sjekkOmCacherErNull() { - if (alleIdenterCache == null) { - alleIdenterCache = new HashMap<>(); - } - if (levendeIdenterCache == null) { - levendeIdenterCache = new HashMap<>(); - } - if (doedeOgUtvandredeIdenterCache == null) { - doedeOgUtvandredeIdenterCache = new HashMap<>(); - } - if (gifteIdenterCache == null) { - gifteIdenterCache = new HashMap<>(); - } - if (foedteIdenterCache == null) { - foedteIdenterCache = new HashMap<>(); - } - } - - public void fjernUregistrerteCacher() { - fjernCache(alleIdenterCache); - fjernCache(levendeIdenterCache); - fjernCache(doedeOgUtvandredeIdenterCache); - fjernCache(gifteIdenterCache); - fjernCache(foedteIdenterCache); - } - - public List oppdaterAlleIdenterCache(Long avspillergruppeId) { - if (alleIdenterCache == null) { - alleIdenterCache = new HashMap<>(); - } - return oppdaterCache(alleIdenterCache, avspillergruppeId, tpsfFiltreringService.finnAlleIdenter(avspillergruppeId)).get(avspillergruppeId); - } - - public List oppdaterLevendeIdenterCache(Long avspillergruppeId) { - if (levendeIdenterCache == null) { - levendeIdenterCache = new HashMap<>(); - } - return oppdaterCache(levendeIdenterCache, avspillergruppeId, tpsfFiltreringService.finnLevendeIdenter(avspillergruppeId)).get(avspillergruppeId); - } - - public List oppdaterDoedeOgUtvandredeIdenterCache(Long avspillergruppeId) { - if (doedeOgUtvandredeIdenterCache == null) { - doedeOgUtvandredeIdenterCache = new HashMap<>(); - } - return oppdaterCache(doedeOgUtvandredeIdenterCache, avspillergruppeId, tpsfFiltreringService.finnDoedeOgUtvandredeIdenter(avspillergruppeId)).get(avspillergruppeId); - } - - public List oppdaterGifteIdenterCache(Long avspillergruppeId) { - if (gifteIdenterCache == null) { - gifteIdenterCache = new HashMap<>(); - } - return oppdaterCache(gifteIdenterCache, avspillergruppeId, tpsfFiltreringService.finnGifteIdenter(avspillergruppeId)).get(avspillergruppeId); - } - - public List oppdaterFoedteIdenterCache(Long avspillergruppeId) { - if (foedteIdenterCache == null) { - foedteIdenterCache = new HashMap<>(); - } - return oppdaterCache(foedteIdenterCache, avspillergruppeId, tpsfFiltreringService.finnFoedteIdenter(avspillergruppeId)).get(avspillergruppeId); - } - - private void fjernCache(Map> cache) { - for (var avspillergruppeId : cache.keySet()) { - if (!fasteAvspillergrupper.contains(avspillergruppeId)) { - cache.remove(avspillergruppeId); - } - } - } - - private Map> oppdaterCache(Map> cache, Long avspillergruppeId, List innhold) { - if (cache.containsKey(avspillergruppeId)) { - cache.get(avspillergruppeId).clear(); - } - cache.put(avspillergruppeId, innhold); - return cache; - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/CacheService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/CacheService.java deleted file mode 100644 index 07812dda5c9..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/CacheService.java +++ /dev/null @@ -1,92 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -@Service -@RequiredArgsConstructor -public class CacheService { - - private final AsyncCache asyncCache; - - public Set hentCachedeAvspillergruppeIder() { - var alleIdenterCache = asyncCache.getAlleIdenterCache(); - if (alleIdenterCache == null) { - return new HashSet<>(); - } else { - return alleIdenterCache.keySet(); - } - } - - public List hentAlleIdenterCache(Long avspillergruppeId) { - List alleIdenter; - var alleIdenterCache = asyncCache.getAlleIdenterCache(); - if (alleIdenterCache == null || !alleIdenterCache.containsKey(avspillergruppeId) || alleIdenterCache.get(avspillergruppeId).isEmpty()) { - alleIdenter = asyncCache.oppdaterAlleIdenterCache(avspillergruppeId); - } else { - alleIdenter = alleIdenterCache.get(avspillergruppeId); - asyncCache.asyncOppdaterAlleIdenterCache(avspillergruppeId); - } - return alleIdenter; - } - - public List hentLevendeIdenterCache(Long avspillergruppeId) { - List levendeIdenter; - var levendeIdenterCache = asyncCache.getLevendeIdenterCache(); - if (levendeIdenterCache == null || !levendeIdenterCache.containsKey(avspillergruppeId) || levendeIdenterCache.get(avspillergruppeId).isEmpty()) { - levendeIdenter = asyncCache.oppdaterLevendeIdenterCache(avspillergruppeId); - } else { - levendeIdenter = levendeIdenterCache.get(avspillergruppeId); - asyncCache.asyncOppdaterLevendeIdenterCache(avspillergruppeId); - } - return levendeIdenter; - } - - public List hentDoedeOgUtvandredeIdenterCache(Long avspillergruppeId) { - List doedeOgUtvandredeIdenter; - var doedeOgUtvandredeIdenterCache = asyncCache.getDoedeOgUtvandredeIdenterCache(); - if (doedeOgUtvandredeIdenterCache == null || !doedeOgUtvandredeIdenterCache.containsKey(avspillergruppeId) || doedeOgUtvandredeIdenterCache.get(avspillergruppeId).isEmpty()) { - doedeOgUtvandredeIdenter = asyncCache.oppdaterDoedeOgUtvandredeIdenterCache(avspillergruppeId); - } else { - doedeOgUtvandredeIdenter = doedeOgUtvandredeIdenterCache.get(avspillergruppeId); - asyncCache.asyncOppdaterDoedeOgUtvandredeIdenterCache(avspillergruppeId); - } - return doedeOgUtvandredeIdenter; - } - - public List hentGifteIdenterCache(Long avspillergruppeId) { - List gifteIdenter; - var gifteIdenterCache = asyncCache.getGifteIdenterCache(); - if (gifteIdenterCache == null || !gifteIdenterCache.containsKey(avspillergruppeId) || gifteIdenterCache.get(avspillergruppeId).isEmpty()) { - gifteIdenter = asyncCache.oppdaterGifteIdenterCache(avspillergruppeId); - } else { - gifteIdenter = gifteIdenterCache.get(avspillergruppeId); - asyncCache.asyncOppdaterGifteIdenterCache(avspillergruppeId); - } - return gifteIdenter; - } - - public List hentFoedteIdenterCache(Long avspillergruppeId) { - List foedteIdenter; - var foedteIdenterCache = asyncCache.getFoedteIdenterCache(); - if (foedteIdenterCache == null || !foedteIdenterCache.containsKey(avspillergruppeId) || foedteIdenterCache.get(avspillergruppeId).isEmpty()) { - foedteIdenter = asyncCache.oppdaterFoedteIdenterCache(avspillergruppeId); - } else { - foedteIdenter = foedteIdenterCache.get(avspillergruppeId); - asyncCache.asyncOppdaterFoedteIdenterCache(avspillergruppeId); - } - return foedteIdenter; - } - - public List oppdaterAlleCacher() { - return asyncCache.oppdaterAlleCacher(); - } - - public Long oppdaterAlleCacher(Long avspillergruppeId) { - return asyncCache.oppdaterAlleCacher(avspillergruppeId); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterService.java deleted file mode 100644 index 3da1a61307b..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterService.java +++ /dev/null @@ -1,467 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static java.util.Objects.isNull; -import static java.util.Objects.nonNull; -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.NAV_ENHET; -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.NAV_ENHET_BESKRIVELSE; -import static no.nav.testnav.apps.hodejegeren.service.TpsStatusQuoService.AKSJONSKODE; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.common.collect.Lists; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.apps.hodejegeren.consumer.TpsfConsumer; -import no.nav.testnav.apps.hodejegeren.exception.IdentIOException; -import no.nav.testnav.apps.hodejegeren.exception.ManglendeInfoITpsException; -import no.nav.testnav.apps.hodejegeren.provider.responses.NavEnhetResponse; -import no.nav.testnav.apps.hodejegeren.provider.responses.kontoinfo.KontoinfoResponse; -import no.nav.testnav.apps.hodejegeren.provider.responses.persondata.PersondataResponse; -import no.nav.testnav.apps.hodejegeren.provider.responses.relasjon.Relasjon; -import no.nav.testnav.apps.hodejegeren.provider.responses.relasjon.RelasjonsResponse; -import org.apache.commons.lang3.StringUtils; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; -import org.springframework.web.server.ResponseStatusException; -import reactor.core.publisher.Flux; - -import java.io.IOException; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -import no.nav.testnav.libs.servletcore.util.IdentUtil; - -@Slf4j -@Service -@RequiredArgsConstructor -public class EksisterendeIdenterService { - - private static final String STATUS_QUO_FEILMELDING = "Kunne ikke hente status quo på ident {} - "; - private static final String BOSTEDSADRESSE = "bostedsAdresse"; - private static final String KORTNAVN = "kortnavn"; - private static final String FORNAVN = "fornavn"; - private static final String MELLOMNAVN = "mellomnavn"; - private static final String ETTERNAVN = "etternavn"; - private static final String SVARSTATUS = "svarStatus"; - private static final int TPSF_PAGE_SIZE = 80; - private static final String ROUTINE_PERSDATA = "FS03-FDNUMMER-PERSDATA-O"; - private static final String ROUTINE_KERNINFO = "FS03-FDNUMMER-KERNINFO-O"; - private static final String ROUTINE_PERSRELA = "FS03-FDNUMMER-PERSRELA-O"; - private static final String AKSJONSKODE_A0 = "A0"; - private static final String AKSJONSKODE_A2 = "A2"; - public static final String TRANSAKSJONSTYPE = "1"; - - private final TpsfConsumer tpsfConsumer; - private final TpsStatusQuoService tpsStatusQuoService; - private final CacheService cacheService; - private final TpsfFiltreringService tpsfFiltreringService; - private final Random rand = new Random(); - - public Flux hentLevendeIdenter( - Long gruppeId, - String miljoe, - Integer henteAntall, - Integer minimumAlder - ) { - log.info("Henter identer med minimum alder {}...", minimumAlder); - var gyldigeIdenter = finnAlleIdenterOverAlder(gruppeId, minimumAlder); - var antallGyldige = gyldigeIdenter.size(); - log.info("Fant {} identer over alder {} i avspillergruppe.", antallGyldige, minimumAlder); - List utvalgteIdenter; - - if (gyldigeIdenter.isEmpty()) { - return Flux.empty(); - } - - log.info("Fjerner personer som er død..."); - if (isNull(henteAntall) || antallGyldige <= henteAntall) { - utvalgteIdenter = new ArrayList<>(gyldigeIdenter); - return filtrerUtDoedeIdenter(utvalgteIdenter, miljoe); - } else { - Collections.shuffle(gyldigeIdenter); - - var index = henteAntall; - var initialIdenter = gyldigeIdenter.subList(0, index); - utvalgteIdenter = filtrerUtDoedeIdenter(initialIdenter, miljoe).collectList().block(); - while (nonNull(utvalgteIdenter) && utvalgteIdenter.size() < henteAntall && index < antallGyldige){ - var antallMangler = henteAntall - utvalgteIdenter.size(); - - var maxIndex = Math.min(index + antallMangler, antallGyldige); - var ekstraUtvalg = gyldigeIdenter.subList(index, maxIndex); - var extraIdenter = filtrerUtDoedeIdenter(ekstraUtvalg, miljoe).collectList().block(); - utvalgteIdenter.addAll(extraIdenter); - index = maxIndex; - } - - log.info("Fant {} levende identer", isNull(utvalgteIdenter) ? 0 : utvalgteIdenter.size()); - return isNull(utvalgteIdenter) ? Flux.empty() : Flux.fromIterable(utvalgteIdenter); - } - } - - private Flux filtrerUtDoedeIdenter( - List utvalgteIdenter, - String miljoe - ){ - var count = new AtomicInteger(); - return tpsfConsumer.getToken() - .flatMapMany(accessToken -> Flux.fromIterable(utvalgteIdenter) - .flatMap(ident -> tpsfConsumer.getTpsServiceRoutineV2(ROUTINE_PERSDATA, AKSJONSKODE, miljoe, ident, accessToken)) - .filter(Objects::nonNull) - .filter(value -> StringUtils.isBlank(value.getResponse().getData1().getDatoDo()) && StringUtils.isNotBlank(value.getResponse().getData1().getFnr())) - .map(value -> { - var index = count.incrementAndGet(); - if (index % 10 == 0) { - log.info("Hentet {}", index); - } - return value.getResponse().getData1().getFnr(); - })); - } - - public List hentFnrMedNavKontor( - String miljoe, - List identer - ) { - List navEnhetResponseListe = new ArrayList<>(identer.size()); - - int antallFeilet = 0; - - for (String ident : identer) { - try { - var feltMedStatusQuo = tpsStatusQuoService.hentStatusQuo(ROUTINE_KERNINFO, Arrays.asList(NAV_ENHET, NAV_ENHET_BESKRIVELSE), miljoe, ident); - var navEnhet = feltMedStatusQuo.get(NAV_ENHET); - var navEnhetBeskrivelse = feltMedStatusQuo.get(NAV_ENHET_BESKRIVELSE); - if (!navEnhet.isEmpty() && !navEnhetBeskrivelse.isEmpty()) { - navEnhetResponseListe.add( - NavEnhetResponse.builder() - .ident(ident) - .navEnhet(navEnhet) - .navEnhetBeskrivelse(navEnhetBeskrivelse) - .build()); - } else { - antallFeilet++; - log.warn("Person med fnr {} hadde ingen tilknytning til NAV-enhet.", ident); - } - } catch (IOException e) { - log.warn(e.getMessage(), e); - antallFeilet++; - } catch (ManglendeInfoITpsException e) { - log.warn(e.getMessage()); - antallFeilet++; - } - } - - if (antallFeilet > 0) { - log.warn("Kunne ikke finne NAV-enhet for {} av identene.", antallFeilet); - } - - return navEnhetResponseListe; - } - - public Map hentGittAntallIdenterMedStatusQuo( - Long avspillergruppeId, - String miljoe, - int antallIdenter, - int minimumAlder, - int maksimumAlder - ) { - var alleIdenter = finnLevendeIdenterIAldersgruppe(avspillergruppeId, minimumAlder, maksimumAlder); - if (alleIdenter.size() < antallIdenter) { - log.info("Antall ønskede identer å hente er større enn tilgjengelige identer i avspillergruppe. - HenteAntall:{} TilgjengeligeIdenter:{}", antallIdenter, alleIdenter.size()); - antallIdenter = alleIdenter.size(); - } - - Map utvalgteIdenterMedStatusQuo = new HashMap<>(antallIdenter); - for (int i = 0; i < antallIdenter; i++) { - var tilfeldigIdent = alleIdenter.remove(rand.nextInt(alleIdenter.size())); - try { - utvalgteIdenterMedStatusQuo.put(tilfeldigIdent, tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, tilfeldigIdent)); - } catch (IOException e) { - log.error(STATUS_QUO_FEILMELDING, tilfeldigIdent, e); - } - } - - return utvalgteIdenterMedStatusQuo; - } - - public List hentGittAntallIdenterMedKononummerinfo( - Long avspillergruppeId, - String miljoe, - int antallIdenter, - int minimumAlder, - int maksimumAlder - ) { - var alleIdenter = finnLevendeIdenterIAldersgruppe(avspillergruppeId, minimumAlder, maksimumAlder); - if (alleIdenter.size() < antallIdenter) { - log.info("Antall ønskede identer å hente er større enn tilgjengelige identer i avspillergruppe. - HenteAntall:{} TilgjengeligeIdenter:{}", antallIdenter, alleIdenter.size()); - antallIdenter = alleIdenter.size(); - } - - List identerMedKontoinformasjon = new ArrayList<>(antallIdenter); - int i = 0; - while (i < antallIdenter && !alleIdenter.isEmpty()) { - String ident = alleIdenter.remove(rand.nextInt(alleIdenter.size())); - try { - var statusQuoTilIdent = tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, ident); - if (statusQuoTilIdent == null) { - continue; - } - var kontonummerNode = statusQuoTilIdent.findValue("kontoNummer"); - if (kontonummerNode == null) { - continue; - } - var kontonummer = kontonummerNode.asText(); - if (kontonummer.isEmpty()) { - continue; - } - JsonNode bostedsAdresse = statusQuoTilIdent.findValue(BOSTEDSADRESSE); - identerMedKontoinformasjon.add(KontoinfoResponse.builder() - .fnr(statusQuoTilIdent.findValue("fodselsnummer").asText()) - .kortnavn(statusQuoTilIdent.findValue(KORTNAVN).asText()) - .fornavn(statusQuoTilIdent.findValue(FORNAVN).asText()) - .mellomnavn(statusQuoTilIdent.findValue(MELLOMNAVN).asText()) - .etternavn(statusQuoTilIdent.findValue(ETTERNAVN).asText()) - .kontonummer(kontonummer) - .navn(statusQuoTilIdent.findValue("banknavn").asText()) - .adresseLinje1(bostedsAdresse.findValue("adresse1").asText()) - .adresseLinje2(bostedsAdresse.findValue("adresse2").asText()) - .adresseLinje3("") // finnes ikke i rutine-kerninfo under bostedsadresse - .postnr(bostedsAdresse.findValue("postnr").asText()) - .landkode(bostedsAdresse.findValue("landKode").asText()) - .build()); - i++; - } catch (IOException e) { - log.error(STATUS_QUO_FEILMELDING, ident, e); - throw new IdentIOException("Kunne ikke hente status quo på ident " + ident, e); - } - } - return identerMedKontoinformasjon; - } - - public Map hentAdressePaaIdenter( - String miljoe, - List identer - ) { - Map utvalgteIdenterMedStatusQuo = new HashMap<>(identer.size()); - - ObjectNode navnOgAdresse; - ObjectMapper mapper = new ObjectMapper(); - for (var ident : identer) { - navnOgAdresse = mapper.createObjectNode(); - try { - var infoOnRoutineName = tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, ident); - - navnOgAdresse.set("personnavn", infoOnRoutineName.findValue("personnavn")); - navnOgAdresse.set(BOSTEDSADRESSE, infoOnRoutineName.findValue(BOSTEDSADRESSE)); - navnOgAdresse.set("NAVenhetDetalj", infoOnRoutineName.findValue("NAVenhetDetalj")); - - utvalgteIdenterMedStatusQuo.put(ident, navnOgAdresse); - } catch (IOException e) { - log.error(STATUS_QUO_FEILMELDING, ident, e); - } - } - return utvalgteIdenterMedStatusQuo; - } - - public List finnAlleIdenterOverAlder( - Long avspillergruppeId, - int minimumAlder - ) { - var identer = cacheService.hentLevendeIdenterCache(avspillergruppeId); - return identer.stream() - .filter(ident -> IdentUtil.getFoedselsdatoFraIdent(ident) - .isBefore(LocalDate.now().minusYears(minimumAlder))) - .collect(Collectors.toCollection(ArrayList::new)); - } - - public List finnLevendeIdenterIAldersgruppe( - Long avspillergruppeId, - int minimumAlder, - int maksimumAlder - ) { - var identer = cacheService.hentLevendeIdenterCache(avspillergruppeId); - return filtrerIdenterIAldersgruppe(identer, minimumAlder, maksimumAlder); - } - - public List finnFoedteIdenter( - Long avspillergruppeId, - int minimumAlder, - int maksimumAlder - ) { - var identer = cacheService.hentFoedteIdenterCache(avspillergruppeId); - return filtrerIdenterIAldersgruppe(new ArrayList<>(identer), minimumAlder, maksimumAlder); - } - - public PersondataResponse hentPersondata( - String ident, - String miljoe - ) { - try { - var statusQuoTilIdent = tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_PERSDATA, AKSJONSKODE, miljoe, ident); - log.trace("Status Quo til identen: {}", statusQuoTilIdent); - if (statusQuoTilIdent.toString().contains("PERSON IKKE FUNNET")) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, String.format("Fant ingen personer med ident: %s", ident)); - } - return PersondataResponse.builder() - .fnr(statusQuoTilIdent.findValue("fnr").asText()) - .kortnavn(statusQuoTilIdent.findValue(KORTNAVN).asText()) - .fornavn(statusQuoTilIdent.findValue(FORNAVN).asText()) - .mellomnavn(statusQuoTilIdent.findValue(MELLOMNAVN).asText()) - .etternavn(statusQuoTilIdent.findValue(ETTERNAVN).asText()) - .kodeStatsborger(statusQuoTilIdent.findValue("kodeStatsborger").asText()) - .statsborger(statusQuoTilIdent.findValue("statsborger").asText()) - .datoStatsborger(statusQuoTilIdent.findValue("datoStatsborger").asText()) - .kodeSivilstand(statusQuoTilIdent.findValue("kodeSivilstand").asText()) - .sivilstand(statusQuoTilIdent.findValue("sivilstand").asText()) - .datoSivilstand(statusQuoTilIdent.findValue("datoSivilstand").asText()) - .kodeInnvandretFra(statusQuoTilIdent.findValue("kodeInnvandretFra").asText()) - .innvandretFra(statusQuoTilIdent.findValue("innvandretFra").asText()) - .datoInnvandret(statusQuoTilIdent.findValue("datoInnvandret").asText()) - .build(); - } catch (IOException e) { - log.error(STATUS_QUO_FEILMELDING, ident, e); - throw new IdentIOException("Kunne ikke hente status quo på ident " + ident, e); - } - } - - public RelasjonsResponse hentRelasjoner( - String ident, - String miljoe - ) { - RelasjonsResponse relasjonsResponse = null; - try { - var statusQuoTilIdent = tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_PERSRELA, AKSJONSKODE, miljoe, ident); - var antallRelasjoner = 0; - JsonNode antallRelasjonerJsonNode = statusQuoTilIdent.findValue("antallRelasjoner"); - if (antallRelasjonerJsonNode != null) { - antallRelasjoner = antallRelasjonerJsonNode.asInt(); - } - - if (antallRelasjoner == 1) { - relasjonsResponse = RelasjonsResponse.builder() - .fnr(statusQuoTilIdent.findValue("fnr").asText()) - .relasjoner(Collections.singletonList(parseRelasjonNode(statusQuoTilIdent.findValue("relasjon")))).build(); - } else if (antallRelasjoner > 1) { - var relasjonNode = (ArrayNode) statusQuoTilIdent.findValue("relasjon"); - List relasjoner = new ArrayList<>(relasjonNode.size()); - for (var relasjonselement : relasjonNode) { - relasjoner.add(parseRelasjonNode(relasjonselement)); - } - relasjonsResponse = RelasjonsResponse.builder().fnr(ident).relasjoner(relasjoner).build(); - } else { - relasjonsResponse = RelasjonsResponse.builder().fnr(ident).relasjoner(new ArrayList<>()).build(); - } - } catch (IOException e) { - log.error(STATUS_QUO_FEILMELDING, ident, e); - } - return relasjonsResponse; - } - - public List hentIdenterSomIkkeErITps( - Long avspillergruppeId, - String miljoe - ) { - var alleIdenter = tpsfFiltreringService.finnAlleIdenter(avspillergruppeId); - List identerIkkeITps = new ArrayList<>(); - var objectMapper = new ObjectMapper(); - for (var identer : Lists.partition(alleIdenter, TPSF_PAGE_SIZE)) { - try { - var jsonNode = tpsfConsumer.hentTpsStatusPaaIdenter(AKSJONSKODE_A0, miljoe, identer); - var status = jsonNode.findValue("status"); - if (status != null) { - var kode = status.findValue("kode"); - if (kode != null && !"00".equals(kode.asText())) { - var statusFromTps = jsonNode.findValue("EFnr"); - var identStatus = objectMapper.convertValue(statusFromTps, new TypeReference>>() { - }); - identStatus.stream().filter(map -> map.containsKey(SVARSTATUS)) - .forEach(map -> { - var svarStatus = objectMapper.convertValue(map.get(SVARSTATUS), new TypeReference>() { - }); - if ("08".equals(svarStatus.get("returStatus"))) { - identerIkkeITps.add(String.valueOf(map.get("fnr"))); - } - }); - - } - } - } catch (IOException e) { - log.error("Kunne ikke hente status fra TPS", e); - } - } - return identerIkkeITps; - } - - public List hentIdenterSomKolliderer( - Long avspillergruppeId - ) { - var alleIdenter = tpsfFiltreringService.finnAlleIdenter(avspillergruppeId); - List identerITps = new ArrayList<>(); - ObjectMapper objectMapper = new ObjectMapper(); - - for (var identer : Lists.partition(alleIdenter, TPSF_PAGE_SIZE)) { - try { - var jsonNode = tpsfConsumer.hentTpsStatusPaaIdenter(AKSJONSKODE_A2, "q2", identer); - var statusFromTps = jsonNode.findValue("EFnr"); - if (statusFromTps != null) { - var identStatus = objectMapper.convertValue(statusFromTps, new TypeReference>>() { - }); - for (var map : identStatus) { - if (!map.containsKey(SVARSTATUS)) { - identerITps.add(String.valueOf(map.get("fnr"))); - } - } - } else { - log.warn("Kunne ikke ekstrahere status fra TPS."); - } - } catch (IOException e) { - log.error("Kunne ikke hente status fra TPS", e); - } - } - return identerITps; - } - - private Relasjon parseRelasjonNode( - JsonNode relasjonNode - ) { - return Relasjon.builder() - .kortnavn(relasjonNode.findValue(KORTNAVN).asText()) - .datoDo(relasjonNode.findValue("datoDo").asText()) - .typeRelBeskr(relasjonNode.findValue("typeRelBeskr").asText()) - .mellomnavn(relasjonNode.findValue(MELLOMNAVN).asText()) - .etternavn(relasjonNode.findValue(ETTERNAVN).asText()) - .adresseStatus(relasjonNode.findValue("adresseStatus").asInt()) - .adrStatusBeskr(relasjonNode.findValue("adrStatusBeskr").asText()) - .spesregType(relasjonNode.findValue("spesregType").asText()) - .fornavn(relasjonNode.findValue(FORNAVN).asText()) - .fnrRelasjon(relasjonNode.findValue("fnrRelasjon").asText()) - .typeRelasjon(relasjonNode.findValue("typeRelasjon").asText()) - .build(); - } - - private static List filtrerIdenterIAldersgruppe( - List identer, - int minimumAlder, - int maksimumAlder - ) { - var identerOverAlder = identer.stream() - .filter(ident -> IdentUtil.getFoedselsdatoFraIdent(ident) - .isBefore(LocalDate.now().minusYears(minimumAlder))) - .collect(Collectors.toCollection(ArrayList::new)); - return identerOverAlder.stream() - .filter(ident -> IdentUtil.getFoedselsdatoFraIdent(ident) - .isAfter(LocalDate.now().minusYears(maksimumAlder))) - .collect(Collectors.toCollection(ArrayList::new)); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperService.java deleted file mode 100644 index 27f4e399604..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperService.java +++ /dev/null @@ -1,55 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -@RequiredArgsConstructor -public class EndringskodeTilFeltnavnMapperService { - - public static final String DATO_DO = "datoDo"; - public static final String STATSBORGER = "statsborger"; // lagret i persdata - public static final String STATSBORGERSKAP = "statsborgerskap"; // lagret i kerninfo - public static final String NAV_ENHET = "kodeNAVenhet"; // lagret i kerninfo - public static final String NAV_ENHET_BESKRIVELSE = "kodeNAVenhetBeskr"; // lagret i kerninfo - public static final String FNR_RELASJON = "$..relasjon[?(@.typeRelasjon=='EKTE')].fnrRelasjon"; - private static final String ROUTINE_PERSDATA = "FS03-FDNUMMER-PERSDATA-O"; - private static final String ROUTINE_PERSRELA = "FS03-FDNUMMER-PERSRELA-O"; - - private final TpsStatusQuoService tpsStatusQuoService; - - public Map getStatusQuoFraAarsakskode(String endringskode, String environment, String fnr) throws IOException { - Map personStatusQuo = new HashMap<>(); - List feltnavn; - - var endringskoden = Endringskoder.getEndringskodeFraVerdi(endringskode); - - switch (endringskoden) { - case NAVNEENDRING_FOERSTE, NAVNEENDRING_MELDING, NAVNEENDRING_KORREKSJON, ADRESSEENDRING_UTEN_FLYTTING, ADRESSEKORREKSJON, UTVANDRING, FARSKAP_MEDMORSKAP, ENDRING_STATSBORGERSKAP_BIBEHOLD, ENDRING_FAMILIENUMMER, FOEDSELSNUMMERKORREKSJON, ENDRING_FORELDREANSVAR, ENDRING_OPPHOLDSTILLATELSE, ENDRING_POSTADRESSE_TILLEGGSADRESSE, ENDRING_POSTNUMMER_SKOLE_VALG_GRUNNKRETS, KOMMUNEREGULERING, ADRESSEENDRING_GAB, ENDRING_KORREKSJON_FOEDESTED, ENDRING_DUF_NUMMER, FLYTTING_INNEN_KOMMUNEN, FOEDSELSMELDING, UREGISTRERT_PERSON -> { - feltnavn = Arrays.asList(DATO_DO, STATSBORGER); - personStatusQuo.putAll(tpsStatusQuoService.hentStatusQuo(ROUTINE_PERSDATA, feltnavn, environment, fnr)); - } - case VIGSEL, SEPERASJON, SKILSMISSE, KORREKSJON_FAMILIEOPPLYSNINGER, DOEDSMELDING -> { - feltnavn = Arrays.asList(DATO_DO, STATSBORGER, "sivilstand", "datoSivilstand"); - personStatusQuo.putAll(tpsStatusQuoService.hentStatusQuo(ROUTINE_PERSDATA, feltnavn, environment, fnr)); - feltnavn = Collections.singletonList(FNR_RELASJON); - personStatusQuo.putAll(tpsStatusQuoService.hentStatusQuo(ROUTINE_PERSRELA, feltnavn, environment, fnr)); - } - case ANNULERING_FLYTTING_ADRESSEENDRING, INNFLYTTING_ANNEN_KOMMUNE -> { - feltnavn = Arrays.asList(DATO_DO, STATSBORGER, "kommunenr", "datoFlyttet"); - personStatusQuo.putAll(tpsStatusQuoService.hentStatusQuo(ROUTINE_PERSDATA, feltnavn, environment, fnr)); - } - default -> { - } - } - - return personStatusQuo; - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/Endringskoder.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/Endringskoder.java deleted file mode 100644 index 41a7678f633..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/Endringskoder.java +++ /dev/null @@ -1,65 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * Endringskode er en samling av kode-verdier som identifiserer en skdmelding. - * Endringsmelding er firesifret. Sifferposisjon: - * * 1-2: Årsakskode - * * 3: Transaksjonskode - * * 4: Tildelingskode - */ -@Getter -@AllArgsConstructor -public enum Endringskoder { - TILDELING_DNUMMER("9110"), - INNVANDRING("0211"), - FOEDSELSMELDING("0110"), - FOEDSELSNUMMERKORREKSJON("3910"), - NAVNEENDRING_FOERSTE("0610"), - NAVNEENDRING_MELDING("0710"), - NAVNEENDRING_KORREKSJON("1010"), - VIGSEL("1110"), - SEPERASJON("1410"), - SKILSMISSE("1810"), - FLYTTING_INNEN_KOMMUNEN("2410"), - ANNULERING_FLYTTING_ADRESSEENDRING("2510"), - INNFLYTTING_ANNEN_KOMMUNE("2610"), - ADRESSEENDRING_UTEN_FLYTTING("2810"), - ADRESSEKORREKSJON("2910"), - FARSKAP_MEDMORSKAP("3410"), - ENDRING_STATSBORGERSKAP_BIBEHOLD("3510"), - ENDRING_FAMILIENUMMER("3810"), - ENDRING_FORELDREANSVAR("4010"), - ENDRING_OPPHOLDSTILLATELSE("4110"), - ENDRING_POSTADRESSE_TILLEGGSADRESSE("4410"), - ENDRING_POSTNUMMER_SKOLE_VALG_GRUNNKRETS("4710"), - KOMMUNEREGULERING("4810"), - ADRESSEENDRING_GAB("4910"), - ENDRING_KORREKSJON_FOEDESTED("5110"), - UREGISTRERT_PERSON("5610"), - ENDRING_DUF_NUMMER("8110"), - KORREKSJON_FAMILIEOPPLYSNINGER("9810"), - DOEDSMELDING("4310"), - UTVANDRING("3210"); - - private String endringskode; - - public String getAarsakskode() { - return endringskode.substring(0, 2); - } - - public String getTranskode() { - return endringskode.substring(2, 3); - } - - public static Endringskoder getEndringskodeFraVerdi(String endringskodeVerdi) { - for (Endringskoder endringskode : values()) { - if (endringskode.endringskode.equals(endringskodeVerdi)) { - return endringskode; - } - } - throw new IllegalArgumentException(endringskodeVerdi); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/HistorikkService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/HistorikkService.java deleted file mode 100644 index 7a492f4c203..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/HistorikkService.java +++ /dev/null @@ -1,253 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import lombok.RequiredArgsConstructor; -import no.nav.testnav.apps.hodejegeren.logging.LogEvent; -import no.nav.testnav.apps.hodejegeren.logging.LogEventDTO; -import no.nav.testnav.apps.hodejegeren.logging.LogService; -import no.nav.testnav.apps.hodejegeren.provider.requests.DataRequest; -import no.nav.testnav.apps.hodejegeren.provider.requests.HistorikkRequest; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.PersonDokumentWrapper; -import no.nav.testnav.apps.hodejegeren.service.utilities.PersonDokumentUtility; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import no.nav.testnav.apps.hodejegeren.logging.Level; -import no.nav.testnav.apps.hodejegeren.mongodb.Data; -import no.nav.testnav.apps.hodejegeren.mongodb.Kilde; -import no.nav.testnav.apps.hodejegeren.mongodb.SyntHistorikk; -import no.nav.testnav.apps.hodejegeren.mongodb.SyntHistorikkRepository; -import no.nav.testnav.libs.domain.dto.namespacetps.TpsPersonDokumentType; - -@Service -@RequiredArgsConstructor -public class HistorikkService { - - private static final int INCREASE_IN_NUMBER_OF_RESULTS = 100; - private final SyntHistorikkRepository syntHistorikkRepository; - private final MongoTemplate mongoTemplate; - private final LogService logService; - - public List hentAllHistorikk( - int pageNumber, - int pageSize - ) { - var pageableRequest = PageRequest.of(pageNumber, pageSize); - Page page = syntHistorikkRepository.findAll(pageableRequest); - return page.getContent(); - } - - public SyntHistorikk hentHistorikkMedId(String id) { - return syntHistorikkRepository.findById(id).orElse(null); - } - - public List hentHistorikkMedKilder( - List kilder, - int pageNumber, - int pageSize - ) { - return syntHistorikkRepository.findAllByIdIn(new ArrayList<>(hentIdsMedKilder(kilder)), PageRequest.of(pageNumber, pageSize)).getContent(); - } - - public List hentHistorikkMedKriterier( - List kilder, - int pageNumber, - int pageSize, - List keywordList - ) { - var query = new Query(); - for (var keyword : keywordList) { - var keyValue = keyword.split("="); - // query.addCriteria(Criteria.where("kilder.data.innhold." + keyValue[0]).is(Pattern.compile(keyValue[1], Pattern.CASE_INSENSITIVE))); // finner også substrings. Sikkerhet? - query.addCriteria(Criteria.where("kilder.data.innhold." + keyValue[0]).is(keyValue[1])); - logService.log(new LogEvent(LogEventDTO.builder() - .level(Level.INFO) - .message("testnorge-hodejegeren-search - search for key: " + keyValue[0]) - .key(keyValue[0]) - .build())); - - } - query.limit(pageSize * INCREASE_IN_NUMBER_OF_RESULTS); - query.skip((long) pageNumber * pageSize); - - - List results = new ArrayList<>(mongoTemplate.find(query, SyntHistorikk.class)); - results.forEach(historikk -> historikk.getKilder().removeIf(kilde -> !kilder.contains(kilde.getNavn()))); - - Collections.shuffle(results); - return results.stream().limit(pageSize).toList(); - } - - public Set hentIdsMedKilder(List kilder) { - Set idsMedAlleKilder = new HashSet<>(); - for (String kilde : kilder) { - var historikkByKildenavn = syntHistorikkRepository.findAllIdsByKildenavn(kilde); - Set ids = new HashSet<>(historikkByKildenavn.size()); - for (var historikk : historikkByKildenavn) { - ids.add(historikk.getId()); - } - if (idsMedAlleKilder.isEmpty()) { - idsMedAlleKilder.addAll(ids); - } else { - idsMedAlleKilder.retainAll(ids); - } - } - return idsMedAlleKilder; - } - - public SyntHistorikk opprettHistorikk(SyntHistorikk syntHistorikk) { - var kilder = syntHistorikk.getKilder(); - for (var kilde : kilder) { - for (var d : kilde.getData()) { - if (d.getDatoOpprettet() == null) { - d.setDatoOpprettet(LocalDateTime.now()); - } - if (d.getDatoEndret() == null) { - d.setDatoEndret(d.getDatoOpprettet()); - } - } - } - return syntHistorikkRepository.save(syntHistorikk); - } - - public List leggTilHistorikkPaaIdent(HistorikkRequest historikkRequest) { - List opprettedeIder = new ArrayList<>(); - var kilder = historikkRequest.getIdentMedData(); - - for (var kilde : kilder) { - var id = kilde.getId(); - List nyData = new ArrayList<>(kilde.getData().size()); - - leggTilDataFraKilde(kilde, nyData); - - var eksisterendeHistorikk = hentHistorikkMedId(id); - if (eksisterendeHistorikk != null) { - var eksisterendeKilder = eksisterendeHistorikk.getKilder(); - List eksisterendeData = null; - for (var k : eksisterendeKilder) { - if (historikkRequest.getKilde().equals(k.getNavn())) { - eksisterendeData = k.getData(); - break; - } - } - - if (eksisterendeData != null) { - eksisterendeData.addAll(nyData); - } else { - eksisterendeKilder.add(Kilde.builder().navn(historikkRequest.getKilde()).data(nyData).build()); - } - - opprettedeIder.add(syntHistorikkRepository.save(eksisterendeHistorikk).getId()); - } else { - var nyKilde = Kilde.builder().navn(historikkRequest.getKilde()).data(nyData).build(); - opprettedeIder.add(opprettHistorikk(SyntHistorikk.builder().id(id).kilder(Collections.singletonList(nyKilde)).build()).getId()); - } - } - return opprettedeIder; - } - - private void leggTilDataFraKilde(DataRequest kilde, List nyData) { - var opprettelsesTidspunkt = LocalDateTime.now(); - for (var o : kilde.getData()) { - nyData.add(Data.builder() - .innhold(o) - .datoOpprettet(opprettelsesTidspunkt) - .datoEndret(opprettelsesTidspunkt) - .build()); - } - } - - public List oppdaterTpsPersonDokument( - String ident, - TpsPersonDokumentType tpsPersonDokument - ) { - var syntHistorikk = hentHistorikkMedId(ident); - var personDokumentWrapper = PersonDokumentUtility.convertToPersonDokumentWrapper(tpsPersonDokument); - if (syntHistorikk != null) { - Kilde kilde = null; - for (var k : syntHistorikk.getKilder()) { - if ("skd".equals(k.getNavn())) { - kilde = k; - break; - } - } - if (kilde != null) { - var eksisterendeSkdData = kilde.getData().get(0); - eksisterendeSkdData.setInnhold(personDokumentWrapper); - eksisterendeSkdData.setDatoEndret(LocalDateTime.now()); - return Collections.singletonList(syntHistorikkRepository.save(syntHistorikk).getId()); - } else { - return leggTilSkdData(ident, personDokumentWrapper); - } - } else { - return leggTilSkdData(ident, personDokumentWrapper); - } - } - - public ResponseEntity slettHistorikk(String id) { - var historikk = syntHistorikkRepository.findById(id).orElse(null); - if (historikk != null) { - syntHistorikkRepository.deleteById(id); - return ResponseEntity.ok(String.format("Historikk tilhørende id '%s' ble slettet", id)); - } else { - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(String.format("Fant ingen historikk tilhørende id '%s'", id)); - } - } - - public ResponseEntity slettKilde( - String id, - String navnPaaKilde - ) { - var historikk = syntHistorikkRepository.findById(id).orElse(null); - - if (historikk != null) { - List kilder = historikk.getKilder(); - Kilde kilde = null; - for (Kilde k : kilder) { - if (navnPaaKilde.equals(k.getNavn())) { - kilde = k; - break; - } - } - if (kilde != null) { - kilder.remove(kilde); - if (historikk.getKilder().isEmpty()) { - slettHistorikk(id); - } else { - syntHistorikkRepository.save(historikk); - } - return ResponseEntity.ok(String.format("Kilde '%s' tilhørende id '%s' ble slettet", navnPaaKilde, id)); - } else { - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(String.format("Fant ingen identMedData med navn '%s' tilhørende id '%s'", navnPaaKilde, id)); - } - } else { - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(String.format("Fant ingen historikk tilhørende id '%s'", id)); - } - } - - private List leggTilSkdData( - String ident, - PersonDokumentWrapper personDokumentWrapper - ) { - var historikkRequest = HistorikkRequest.builder() - .kilde("skd") - .identMedData(Collections.singletonList(DataRequest.builder() - .id(ident) - .data(Collections.singletonList(personDokumentWrapper)) - .build())) - .build(); - return leggTilHistorikkPaaIdent(historikkRequest); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoService.java deleted file mode 100644 index 4d90d904113..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoService.java +++ /dev/null @@ -1,86 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import com.fasterxml.jackson.databind.JsonNode; -import com.jayway.jsonpath.Configuration; -import com.jayway.jsonpath.JsonPath; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import net.minidev.json.JSONArray; -import no.nav.testnav.apps.hodejegeren.consumer.TpsfConsumer; -import no.nav.testnav.apps.hodejegeren.exception.ManglendeInfoITpsException; -import org.springframework.stereotype.Service; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Slf4j -@Service -@RequiredArgsConstructor -public class TpsStatusQuoService { - - public static final String AKSJONSKODE = "B0"; - - private final TpsfConsumer tpsfConsumer; - - public Map hentStatusQuo( - String routineName, - List feltnavn, - String environment, - String fnr - ) throws IOException { - Map personStatusQuo = new HashMap<>(feltnavn.size()); - - for (String felt : feltnavn) { - var root = getInfoOnRoutineName(routineName, AKSJONSKODE, environment, fnr); - - if (root == null) { - log.error("Fant ikke rutine {} på fnr {}", routineName.replaceAll("[\r\n]", ""), fnr.replaceAll("[\r\n]", "")); - - throw new ManglendeInfoITpsException("Fant ikke rutine " + routineName + " på fnr " + fnr); - } else { - personStatusQuo.put(felt, extractStatusQuoInfoFromTps(root, felt, fnr)); - } - } - - return personStatusQuo; - } - - public JsonNode getInfoOnRoutineName( - String routineName, - String aksjonsKode, - String environment, - String fnr - ) throws IOException { - return tpsfConsumer.getTpsServiceRoutine(routineName, aksjonsKode, environment, fnr); - } - - private String extractStatusQuoInfoFromTps( - JsonNode root, - String felt, - String fnr - ) { - if (felt.contains("$")) { - var document = Configuration.defaultConfiguration().jsonProvider().parse(root.toString()); - JSONArray jsonArray = JsonPath.read(document, felt); - if (jsonArray.isEmpty()) { - return ""; - } - return jsonArray.get(0).toString(); - } else { - var statusQuoFromTPS = root.findValue(felt); - if (statusQuoFromTPS == null) { - var utfyllendeMelding = root.findValue("utfyllendeMelding"); - if (utfyllendeMelding == null) { - throw new ManglendeInfoITpsException( - "Kunne ikke finne status quo på person med fnr " + fnr + " for felt '" + felt); - } else { - throw new ManglendeInfoITpsException( - "Kunne ikke finne status quo på person med fnr " + fnr + " for felt '" + felt + "'. Utfyllende melding fra TPS: " + utfyllendeMelding.asText()); - } - } - return statusQuoFromTPS.asText(); - } - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringService.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringService.java deleted file mode 100644 index 02805cc211c..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringService.java +++ /dev/null @@ -1,65 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static no.nav.testnav.apps.hodejegeren.service.EksisterendeIdenterService.TRANSAKSJONSTYPE; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.FOEDSELSMELDING; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.FOEDSELSNUMMERKORREKSJON; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.INNVANDRING; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.TILDELING_DNUMMER; - -import lombok.RequiredArgsConstructor; -import no.nav.testnav.apps.hodejegeren.consumer.TpsfConsumer; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -@Service -@RequiredArgsConstructor -public class TpsfFiltreringService { - - private final TpsfConsumer tpsfConsumer; - - public List finnAlleIdenter(Long gruppeId) { - return new ArrayList<>(tpsfConsumer.getIdenterFiltrertPaaAarsakskode( - gruppeId, Arrays.asList( - FOEDSELSMELDING.getAarsakskode(), - INNVANDRING.getAarsakskode(), - FOEDSELSNUMMERKORREKSJON.getAarsakskode(), - TILDELING_DNUMMER.getAarsakskode()), - TRANSAKSJONSTYPE)); - } - - public List finnLevendeIdenter(Long gruppeId) { - var opprettedeIdenterITpsf = finnAlleIdenter(gruppeId); - var doedeOgUtvandredeIdenter = finnDoedeOgUtvandredeIdenter(gruppeId); - - var levendeIdenterINorge = new ArrayList<>(opprettedeIdenterITpsf); - levendeIdenterINorge.removeAll(doedeOgUtvandredeIdenter); - - return levendeIdenterINorge; - } - - public List finnDoedeOgUtvandredeIdenter(Long gruppeId) { - return new ArrayList<>(tpsfConsumer.getIdenterFiltrertPaaAarsakskode( - gruppeId, Arrays.asList( - Endringskoder.DOEDSMELDING.getAarsakskode(), - Endringskoder.UTVANDRING.getAarsakskode()), - TRANSAKSJONSTYPE)); - } - - public List finnGifteIdenter(Long gruppeId) { - return new ArrayList<>(tpsfConsumer.getIdenterFiltrertPaaAarsakskode( - gruppeId, Collections.singletonList( - Endringskoder.VIGSEL.getAarsakskode()), - TRANSAKSJONSTYPE)); - } - - public List finnFoedteIdenter(Long gruppeId) { - return new ArrayList<>(tpsfConsumer.getIdenterFiltrertPaaAarsakskode( - gruppeId, Collections.singletonList( - FOEDSELSMELDING.getAarsakskode()), - TRANSAKSJONSTYPE)); - } -} diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/utilities/PersonDokumentUtility.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/utilities/PersonDokumentUtility.java deleted file mode 100644 index 6af5cf684b6..00000000000 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/service/utilities/PersonDokumentUtility.java +++ /dev/null @@ -1,481 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service.utilities; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; - -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.PersonDokumentWrapper; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Boadresse; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Doedshistorikk; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Foreldreansvar; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Giro; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Migrasjon; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Navn; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Oppholdstillatelse; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.PersonIdent; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.PersonInfo; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Post; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.PrioritertAdresse; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Relasjon; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Sivilstand; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Statsborger; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.TelefonJobb; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.TelefonMobil; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.TelefonPrivat; -import no.nav.testnav.apps.hodejegeren.provider.requests.skd.innhold.Tillegg; -import no.nav.testnav.libs.domain.dto.namespacetps.BoadresseType; -import no.nav.testnav.libs.domain.dto.namespacetps.DodType; -import no.nav.testnav.libs.domain.dto.namespacetps.ForeldreansvarType; -import no.nav.testnav.libs.domain.dto.namespacetps.GironummerType; -import no.nav.testnav.libs.domain.dto.namespacetps.MigrasjonType; -import no.nav.testnav.libs.domain.dto.namespacetps.NavnType; -import no.nav.testnav.libs.domain.dto.namespacetps.OppholdstillatelseType; -import no.nav.testnav.libs.domain.dto.namespacetps.PersonIdentStatusType; -import no.nav.testnav.libs.domain.dto.namespacetps.PersonIdentType; -import no.nav.testnav.libs.domain.dto.namespacetps.PersonInfoType; -import no.nav.testnav.libs.domain.dto.namespacetps.PersonStatusType; -import no.nav.testnav.libs.domain.dto.namespacetps.PostType; -import no.nav.testnav.libs.domain.dto.namespacetps.PrioritertadresseType; -import no.nav.testnav.libs.domain.dto.namespacetps.RelasjonType; -import no.nav.testnav.libs.domain.dto.namespacetps.SivilstandType; -import no.nav.testnav.libs.domain.dto.namespacetps.StatsborgerType; -import no.nav.testnav.libs.domain.dto.namespacetps.TelefonJobbType; -import no.nav.testnav.libs.domain.dto.namespacetps.TelefonMobilType; -import no.nav.testnav.libs.domain.dto.namespacetps.TelefonPrivatType; -import no.nav.testnav.libs.domain.dto.namespacetps.TelefonType; -import no.nav.testnav.libs.domain.dto.namespacetps.TilleggType; -import no.nav.testnav.libs.domain.dto.namespacetps.TpsPersonDokumentType; - -public class PersonDokumentUtility { - - private PersonDokumentUtility() { - } - - public static PersonDokumentWrapper convertToPersonDokumentWrapper(TpsPersonDokumentType tpsPersonDokumentType) { - List foreldreansvar = new ArrayList<>(); - List relasjoner = new ArrayList<>(); - - var personIdentType = extractPersonIdent(tpsPersonDokumentType); - var personIdentStatusType = extractPersonIdentStatus(tpsPersonDokumentType); - var personInfoType = extractPersonInfoType(tpsPersonDokumentType); - var personStatusType = extractPersonStatusType(tpsPersonDokumentType); - var navnType = extractNavnType(tpsPersonDokumentType); - var sivilstandType = extractSivilstandType(tpsPersonDokumentType); - var statsborgerType = extractStatsborgerType(tpsPersonDokumentType); - var dodType = extractDodType(tpsPersonDokumentType); - var telefonPrivatType = extractTelefonPrivatType(tpsPersonDokumentType); - var telefonJobbType = extractTelefonJobbType(tpsPersonDokumentType); - var telefonMobilType = extractTelefonmobilType(tpsPersonDokumentType); - var boadresseType = extractBoadresseType(tpsPersonDokumentType); - var prioritertadresseType = extractPrioritertadresseType(tpsPersonDokumentType); - - var foreldreansvarTypeListe = extractForeldreansvarType(tpsPersonDokumentType); - for (var foreldreansvarType : foreldreansvarTypeListe) { - var foreldreansvaret = buildForeldreansvar(foreldreansvarType); - if (!foreldreansvaret.getIdent().isEmpty()) { - foreldreansvar.add(foreldreansvaret); - } - } - - var oppholdstillatelseType = extractOppholdstillatelseType(tpsPersonDokumentType); - var gironummerType = extractGironummerType(tpsPersonDokumentType); - var tilleggType = extractTilleggType(tpsPersonDokumentType); - var postType = extractPostType(tpsPersonDokumentType); - var migrasjonType = extractmigrasjonType(tpsPersonDokumentType); - - var relasjonTypeListe = extractRelasjonType(tpsPersonDokumentType); - for (var relasjonType : relasjonTypeListe) { - var relasjonen = buildRelasjon(relasjonType); - if (!relasjonen.getIdent().isEmpty() && !relasjonen.getType().isEmpty() && !relasjonen.getStatus().isEmpty() && !relasjonen.getRolle().isEmpty()) { - relasjoner.add(relasjonen); - } - } - - return PersonDokumentWrapper.builder() - .personIdent(buildPersonident(personIdentType, personIdentStatusType)) - .personInfo(buildPersonInfo(personInfoType, personStatusType)) - .navn(buildNavn(navnType)) - .sivilstand(buildSivilstand(sivilstandType)) - .statsborger(buildStatsborger(statsborgerType)) - .doedshistorikk(buildDoedshistorikk(dodType)) - .telefonPrivat(buildTelefonPrivat(telefonPrivatType)) - .telefonJobb(buildTelefonJobb(telefonJobbType)) - .telefonMobil(buildTelefonMobil(telefonMobilType)) - .boadresse(buildBoadresse(boadresseType)) - .prioritertAdresse(buildPrioritertAdresse(prioritertadresseType)) - .foreldreansvar(foreldreansvar) - .oppholdstillatelse(buildOppholdstillatelse(oppholdstillatelseType)) - .giro(buildGiro(gironummerType)) - .tillegg(buildTillegg(tilleggType)) - .post(buildPost(postType)) - .migrasjon(buildMigrasjon(migrasjonType)) - .relasjoner(relasjoner) - .build(); - } - - private static PersonIdentType extractPersonIdent(TpsPersonDokumentType tpsPersonDokumentType) { - return (PersonIdentType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getPersonIdent()); - } - - private static PersonIdentStatusType extractPersonIdentStatus(TpsPersonDokumentType tpsPersonDokumentType) { - return (PersonIdentStatusType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getPersonIdentstatus()); - } - - private static PersonInfoType extractPersonInfoType(TpsPersonDokumentType tpsPersonDokumentType) { - return (PersonInfoType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getPersonInfo()); - } - - private static PersonStatusType extractPersonStatusType(TpsPersonDokumentType tpsPersonDokumentType) { - return (PersonStatusType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getPersonStatus()); - } - - private static NavnType extractNavnType(TpsPersonDokumentType tpsPersonDokumentType) { - return (NavnType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getNavn()); - } - - private static SivilstandType extractSivilstandType(TpsPersonDokumentType tpsPersonDokumentType) { - return (SivilstandType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getSivilstand()); - } - - private static StatsborgerType extractStatsborgerType(TpsPersonDokumentType tpsPersonDokumentType) { - return (StatsborgerType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getStatsborger()); - } - - private static DodType extractDodType(TpsPersonDokumentType tpsPersonDokumentType) { - return (DodType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getDod()); - } - - private static TelefonPrivatType extractTelefonPrivatType(TpsPersonDokumentType tpsPersonDokumentType) { - TelefonType telefonType = (TelefonType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getTelefon()); - if (telefonType != null) { - return telefonType.getTlfPrivat(); - } else { - return null; - } - } - - private static TelefonJobbType extractTelefonJobbType(TpsPersonDokumentType tpsPersonDokumentType) { - TelefonType telefonType = (TelefonType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getTelefon()); - if (telefonType != null) { - return telefonType.getTlfJobb(); - } else { - return null; - } - } - - private static TelefonMobilType extractTelefonmobilType(TpsPersonDokumentType tpsPersonDokumentType) { - TelefonType telefonType = (TelefonType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getTelefon()); - if (telefonType != null) { - return telefonType.getTlfMobil(); - } else { - return null; - } - } - - private static BoadresseType extractBoadresseType(TpsPersonDokumentType tpsPersonDokumentType) { - return (BoadresseType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getBoadresse()); - } - - private static PrioritertadresseType extractPrioritertadresseType(TpsPersonDokumentType tpsPersonDokumentType) { - return (PrioritertadresseType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getPrioritertadresse()); - } - - private static List extractForeldreansvarType(TpsPersonDokumentType tpsPersonDokumentType) { - var foreldreansvar = tpsPersonDokumentType.getPerson().getForeldreansvar(); - if (foreldreansvar == null) { - return new ArrayList<>(); - } - return foreldreansvar; - } - - private static OppholdstillatelseType extractOppholdstillatelseType(TpsPersonDokumentType tpsPersonDokumentType) { - return (OppholdstillatelseType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getOppholdstillatelse()); - } - - private static GironummerType extractGironummerType(TpsPersonDokumentType tpsPersonDokumentType) { - return (GironummerType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getGironummer()); - } - - private static TilleggType extractTilleggType(TpsPersonDokumentType tpsPersonDokumentType) { - return (TilleggType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getTillegg()); - } - - private static PostType extractPostType(TpsPersonDokumentType tpsPersonDokumentType) { - return (PostType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getPost()); - } - - private static MigrasjonType extractmigrasjonType(TpsPersonDokumentType tpsPersonDokumentType) { - return (MigrasjonType) extractIfNotEmpty(tpsPersonDokumentType.getPerson().getMigrasjon()); - } - - private static List extractRelasjonType(TpsPersonDokumentType tpsPersonDokumentType) { - var relasjoner = tpsPersonDokumentType.getRelasjon(); - if (relasjoner == null) { - return new ArrayList<>(); - } - return relasjoner; - } - - private static Object extractIfNotEmpty(List list) { - if (list != null && !list.isEmpty()) { - return list.get(0); - } else { - return null; - } - } - - private static PersonIdent buildPersonident( - PersonIdentType personIdentType, - PersonIdentStatusType personIdentStatusType - ) { - PersonIdent personIdent = PersonIdent.builder().build(); - if (personIdentType != null) { - personIdent.setId(personIdentType.getPersonIdent().trim()); - personIdent.setType(personIdentType.getPersonIdenttype().trim()); - personIdent.setFraDato(checkIfDateIsEmpty(personIdentType.getPersonIdentFraDato().trim())); - personIdent.setTilDato(checkIfDateIsEmpty(personIdentType.getPersonIdentTilDato().trim())); - } - if (personIdentStatusType != null) { - personIdent.setStatus(personIdentStatusType.getPersonIdentStatus().trim()); - } - return personIdent; - } - - private static PersonInfo buildPersonInfo( - PersonInfoType personInfoType, - PersonStatusType personStatusType - ) { - PersonInfo personInfo = PersonInfo.builder().build(); - if (personInfoType != null) { - personInfo.setKjoenn(personInfoType.getPersonKjonn().trim()); - personInfo.setDatoFoedt(checkIfDateIsEmpty(personInfoType.getPersonDatofodt().trim())); - personInfo.setFoedtLand(personInfoType.getPersonFodtLand().trim()); - personInfo.setFoedtKommune(personInfoType.getPersonFodtKommune().trim()); - } - if (personStatusType != null) { - personInfo.setStatus(personStatusType.getPersonStatus().trim()); - } - return personInfo; - } - - private static Navn buildNavn(NavnType navnType) { - if (navnType == null) { - return Navn.builder().build(); - } - return Navn.builder() - .forkortet(navnType.getForkortetNavn().trim()) - .slektsnavn(navnType.getSlektsNavn().trim()) - .fornavn(navnType.getForNavn().trim()) - .mellomnavn(navnType.getMellomNavn().trim()) - .slektsnavnUgift(navnType.getSlektsNavnugift().trim()) - .fraDato(checkIfDateIsEmpty(navnType.getNavnFraDato().trim())) - .tilDato(checkIfDateIsEmpty(navnType.getNavnTilDato().trim())) - .build(); - } - - private static Sivilstand buildSivilstand(SivilstandType sivilstandType) { - if (sivilstandType == null) { - return Sivilstand.builder().build(); - } - return Sivilstand.builder() - .type(sivilstandType.getSivilstand().trim()) - .fraDato(checkIfDateIsEmpty(sivilstandType.getSivilstandFraDato().trim())) - .tilDato(checkIfDateIsEmpty(sivilstandType.getSivilstandTilDato().trim())) - .build(); - } - - private static Statsborger buildStatsborger(StatsborgerType statsborgerType) { - if (statsborgerType == null) { - return Statsborger.builder().build(); - } - return Statsborger.builder() - .land(statsborgerType.getStatsborger().trim()) - .fraDato(checkIfDateIsEmpty(statsborgerType.getStatsborgerFraDato().trim())) - .tilDato(checkIfDateIsEmpty(statsborgerType.getStatsborgerTilDato().trim())) - .build(); - } - - private static Doedshistorikk buildDoedshistorikk(DodType dodType) { - if (dodType == null) { - return Doedshistorikk.builder().build(); - } - return Doedshistorikk.builder() - .dato(checkIfDateIsEmpty(dodType.getDatoDod().trim())) - .regDato(checkIfDateIsEmpty(dodType.getDodDatoReg().trim())) - .build(); - } - - private static TelefonPrivat buildTelefonPrivat(TelefonPrivatType telefonPrivatType) { - if (telefonPrivatType == null) { - return TelefonPrivat.builder().build(); - } - return TelefonPrivat.builder() - .retningslinje(telefonPrivatType.getTlfPrivatRetningslinje().trim()) - .nummer(telefonPrivatType.getTlfPrivatNummer().trim()) - .fraDato(checkIfDateIsEmpty(telefonPrivatType.getTlfPrivatFraDato().trim())) - .tilDato(checkIfDateIsEmpty(telefonPrivatType.getTlfPrivatTilDato().trim())) - .build(); - } - - private static TelefonJobb buildTelefonJobb(TelefonJobbType telefonJobbType) { - if (telefonJobbType == null) { - return TelefonJobb.builder().build(); - } - return TelefonJobb.builder() - .retningslinje(telefonJobbType.getTlfJobbRetningslinje().trim()) - .nummer(telefonJobbType.getTlfJobbNummer().trim()) - .fraDato(checkIfDateIsEmpty(telefonJobbType.getTlfJobbFraDato().trim())) - .tilDato(checkIfDateIsEmpty(telefonJobbType.getTlfJobbTilDato().trim())) - .build(); - } - - private static TelefonMobil buildTelefonMobil(TelefonMobilType telefonMobilType) { - if (telefonMobilType == null) { - return TelefonMobil.builder().build(); - } - return TelefonMobil.builder() - .retningslinje(telefonMobilType.getTlfMobilRetningslinje().trim()) - .nummer(telefonMobilType.getTlfMobilNummer().trim()) - .fraDato(checkIfDateIsEmpty(telefonMobilType.getTlfMobilFraDato().trim())) - .tilDato(checkIfDateIsEmpty(telefonMobilType.getTlfMobilTilDato().trim())) - .build(); - } - - private static Boadresse buildBoadresse(BoadresseType boadresseType) { - if (boadresseType == null) { - return Boadresse.builder().build(); - } - return Boadresse.builder() - .adresse(boadresseType.getBoAdresse().trim()) - .land(boadresseType.getBoKodeLand().trim()) - .kommune(boadresseType.getBoKommune().trim()) - .postnr(boadresseType.getBoPostnr().trim()) - .bydel(boadresseType.getBoBydel().trim()) - .offentligGateKode(boadresseType.getBooffaGateKode().trim()) - .offentligHusnr(boadresseType.getBooffaHusnr().trim()) - .offentligBokstav(boadresseType.getBooffaBokstav().trim()) - .offentligBolignr(boadresseType.getBooffaBolignr().trim()) - .matrikkelGardsnr(boadresseType.getBomatrGardsnr().trim()) - .matrikkelBruksnr(boadresseType.getBomatrBruksnr().trim()) - .matrikkelFestenr(boadresseType.getBomatrFestenr().trim()) - .matrikkelUndernr(boadresseType.getBomatrUndernr().trim()) - .fraDato(checkIfDateIsEmpty(boadresseType.getBoAdresseFraDato().trim())) - .tilDato(checkIfDateIsEmpty(boadresseType.getBoAdresseTilDato().trim())) - .build(); - } - - private static PrioritertAdresse buildPrioritertAdresse(PrioritertadresseType prioritertadresseType) { - if (prioritertadresseType == null) { - return PrioritertAdresse.builder().build(); - } - return PrioritertAdresse.builder() - .type(prioritertadresseType.getPrioritertAdresseType().trim()) - .fraDato(checkIfDateIsEmpty(prioritertadresseType.getPrioritertAdresseFraDato().trim())) - .tilDato(checkIfDateIsEmpty(prioritertadresseType.getPrioritertAdresseTilDato().trim())) - .build(); - } - - private static Foreldreansvar buildForeldreansvar(ForeldreansvarType foreldreansvarType) { - if (foreldreansvarType == null) { - return Foreldreansvar.builder().build(); - } - return Foreldreansvar.builder() - .ident(foreldreansvarType.getForeldreAnsvar().trim()) - .fraDato(checkIfDateIsEmpty(foreldreansvarType.getForeldreAnsvarFraDato().trim())) - .tilDato(checkIfDateIsEmpty(foreldreansvarType.getForeldreAnsvarTilDato().trim())) - .build(); - } - - private static Oppholdstillatelse buildOppholdstillatelse(OppholdstillatelseType oppholdstillatelseType) { - if (oppholdstillatelseType == null) { - return Oppholdstillatelse.builder().build(); - } - return Oppholdstillatelse.builder() - .status(oppholdstillatelseType.getOppholdsTillatelse().trim()) - .fraDato(checkIfDateIsEmpty(oppholdstillatelseType.getOppholdsTillatelseFraDato().trim())) - .tilDato(checkIfDateIsEmpty(oppholdstillatelseType.getOppholdsTillatelseTilDato().trim())) - .build(); - } - - private static Giro buildGiro(GironummerType gironummerType) { - if (gironummerType == null) { - return Giro.builder().build(); - } - return Giro.builder() - .nummer(gironummerType.getGironummer().trim()) - .fraDato(checkIfDateIsEmpty(gironummerType.getGironummerFraDato().trim())) - .tilDato(checkIfDateIsEmpty(gironummerType.getGironummerTilDato().trim())) - .build(); - } - - private static Tillegg buildTillegg(TilleggType tilleggType) { - if (tilleggType == null) { - return Tillegg.builder().build(); - } - return Tillegg.builder() - .adresse1(tilleggType.getTilleggAdresse1().trim()) - .adresse2(tilleggType.getTilleggAdresse2().trim()) - .adresse3(tilleggType.getTilleggAdresse3().trim()) - .postnr(tilleggType.getTilleggPostnr().trim()) - .kommunenr(tilleggType.getTilleggKommunenr().trim()) - .gateKode(tilleggType.getTilleggGateKode().trim()) - .husnummer(tilleggType.getTilleggHusnummer().trim()) - .husbokstav(tilleggType.getTilleggHusbokstav().trim()) - .bolignummer(tilleggType.getTilleggBolignummer().trim()) - .bydel(tilleggType.getTilleggBydel().trim()) - .postboksnr(tilleggType.getTilleggPostboksnr().trim()) - .postboksAnlegg(tilleggType.getTilleggPostboksAnlegg().trim()) - .fraDato(checkIfDateIsEmpty(tilleggType.getTilleggAdresseFraDato().trim())) - .tilDato(checkIfDateIsEmpty(tilleggType.getTilleggAdresseTilDato().trim())) - .build(); - } - - private static Post buildPost(PostType postType) { - if (postType == null) { - return Post.builder().build(); - } - return Post.builder() - .adresse1(postType.getPostAdresse1().trim()) - .adresse2(postType.getPostAdresse2().trim()) - .adresse3(postType.getPostAdresse3().trim()) - .postnr(postType.getPostpostnr().trim()) - .postland(postType.getPostLand().trim()) - .fraDato(checkIfDateIsEmpty(postType.getPostAdresseFraDato().trim())) - .tilDato(checkIfDateIsEmpty(postType.getPostAdresseTilDato().trim())) - .build(); - } - - private static Migrasjon buildMigrasjon(MigrasjonType migrasjonType) { - if (migrasjonType == null) { - return Migrasjon.builder().build(); - } - return Migrasjon.builder() - .type(migrasjonType.getMigrasjon().trim()) - .land(migrasjonType.getMigrasjonLand().trim()) - .fraDato(checkIfDateIsEmpty(migrasjonType.getMigrasjonFraDato().trim())) - .tilDato(checkIfDateIsEmpty(migrasjonType.getMigrasjonTilDato().trim())) - .build(); - } - - private static Relasjon buildRelasjon(RelasjonType relasjonType) { - if (relasjonType == null) { - return Relasjon.builder().build(); - } - return Relasjon.builder() - .ident(relasjonType.getRelasjonIdent().trim()) - .type(relasjonType.getRelasjonIdentType().trim()) - .status(relasjonType.getRelasjonIdentStatus().trim()) - .rolle(relasjonType.getRelasjonRolle().trim()) - .fraDato(checkIfDateIsEmpty(relasjonType.getRelasjonFraDato().trim())) - .tilDato(checkIfDateIsEmpty(relasjonType.getRelasjonTilDato().trim())) - .build(); - } - - private static LocalDate checkIfDateIsEmpty(String date) { - if (date.isEmpty()) { - return null; - } else { - return LocalDate.parse(date); - } - } -} diff --git a/apps/hodejegeren/src/main/resources/application-local.yml b/apps/hodejegeren/src/main/resources/application-local.yml deleted file mode 100644 index 41bbe038934..00000000000 --- a/apps/hodejegeren/src/main/resources/application-local.yml +++ /dev/null @@ -1,4 +0,0 @@ - -consumers: - tpsf-proxy: - url: https://tps-forvalteren-proxy.dev-fss-pub.nais.io diff --git a/apps/hodejegeren/src/main/resources/application-prod.yml b/apps/hodejegeren/src/main/resources/application-prod.yml deleted file mode 100644 index e87b13239f0..00000000000 --- a/apps/hodejegeren/src/main/resources/application-prod.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - data: - mongodb: - authentication-database: ${SPRING_DATA_MONGODB_AUTHENTICATION_DATABASE} - username: ${HODEJEGEREN_DB_USERNAME} - password: ${HODEJEGEREN_DB_PASSWORD} - database: ${SPRING_DATA_MONGODB_DATABASE} - port: ${SPRING_DATA_MONGODB_PORT} - host: ${SPRING_DATA_MONGODB_HOST} - main: - banner-mode: off - -cache.avspillergrupper: ${CACHE_AVSPILLERGRUPPER} diff --git a/apps/hodejegeren/src/main/resources/application.yml b/apps/hodejegeren/src/main/resources/application.yml deleted file mode 100644 index bb055a3db23..00000000000 --- a/apps/hodejegeren/src/main/resources/application.yml +++ /dev/null @@ -1,50 +0,0 @@ -AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b - -spring: - application: - version: application.version.todo - name: testnorge-hodejegeren - description: Testnorge-Hodejegeren jakter på hoder/testpersoner i TPSF og TPS i testmiljø for å fylle meldingene med identer som oppfyller visse kriterier. - security: - oauth2: - resourceserver: - aad: - issuer-uri: ${AAD_ISSUER_URI}/v2.0 - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} - tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-fss:dolly:testnorge-hodejegeren - -consumers: - tpsf-proxy: - name: tps-forvalteren-proxy - url: http://tps-forvalteren-proxy.dolly.svc.nais.local - namespace: dolly - cluster: dev-fss - -springdoc: - swagger-ui: - disable-swagger-default-url: true - url: /v3/api-docs - -management: - endpoints: - enabled-by-default: true - web: - base-path: /internal - exposure.include: prometheus,heapdump,health - path-mapping: - prometheus: metrics - endpoint: - prometheus.enabled: true - heapdump.enabled: true - prometheus: - metrics: - export: - enabled: true -server: - servlet: - encoding: - charset: UTF-8 diff --git a/apps/hodejegeren/src/main/resources/bootstrap.yml b/apps/hodejegeren/src/main/resources/bootstrap.yml deleted file mode 100644 index 0451449ca23..00000000000 --- a/apps/hodejegeren/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - cloud: - vault: - enabled: false \ No newline at end of file diff --git a/apps/hodejegeren/src/main/resources/logback-spring.xml b/apps/hodejegeren/src/main/resources/logback-spring.xml deleted file mode 100644 index 0e5541455d2..00000000000 --- a/apps/hodejegeren/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - 256 - 10280 - 20 - ^sun\.reflect\..*\.invoke - ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke - java\.util\.concurrent\..* - org\.apache\.catalina\..* - org\.apache\.coyote\..* - org\.apache\.tomcat\..* - - - - - - - - - - - - - %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n - - utf8 - - - - - - - - - \ No newline at end of file diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/ApplicationContextTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/ApplicationContextTest.java deleted file mode 100644 index 35487ce5ace..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/ApplicationContextTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package no.nav.testnav.apps.hodejegeren; - -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -class ApplicationContextTest { - - @MockBean - public JwtDecoder jwtDecoder; - - @Test - @SuppressWarnings("java:S2699") - void load_app_context() { - } -} - diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/CacheControllerTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/CacheControllerTest.java deleted file mode 100644 index 1a844275026..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/CacheControllerTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider; - -import static org.mockito.Mockito.verify; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import no.nav.testnav.apps.hodejegeren.service.CacheService; - -@RunWith(MockitoJUnitRunner.class) -public class CacheControllerTest { - - @Mock - private CacheService cacheService; - - @InjectMocks - private CacheController cacheController; - - @Test - public void shouldOppdatereCacheTilGruppe() { - var avspillergruppeId = 123L; - cacheController.oppdaterGruppeCache(avspillergruppeId); - verify(cacheService).oppdaterAlleCacher(avspillergruppeId); - } - - @Test - public void shouldOppdatereAlleCacher() { - cacheController.oppdaterAlleCaches(); - verify(cacheService).oppdaterAlleCacher(); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkControllerTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkControllerTest.java deleted file mode 100644 index 04a3c2dcfac..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HistorikkControllerTest.java +++ /dev/null @@ -1,73 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider; - -import static org.mockito.Mockito.verify; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.util.ArrayList; -import java.util.Arrays; - -import no.nav.testnav.apps.hodejegeren.provider.requests.HistorikkRequest; -import no.nav.testnav.apps.hodejegeren.service.HistorikkService; - -@RunWith(MockitoJUnitRunner.class) -public class HistorikkControllerTest { - - @Mock - private HistorikkService historikkService; - - @InjectMocks - private HistorikkController historikkController; - - private String id = "01010101010"; - - @Test - public void shouldHenteAllHistorikk() { - historikkController.hentAllHistorikk(0, 10); - verify(historikkService).hentAllHistorikk(0, 10); - } - - @Test - public void shouldHenteHistorikkMedKilder() { - var kilder = new ArrayList<>(Arrays.asList("aareg", "inst")); - historikkController.hentHistorikkMedKilde(kilder, 0, 10); - verify(historikkService).hentHistorikkMedKilder(kilder, 0, 10); - } - - @Test - public void shouldHenteIdsMedKilder() { - var kilder = new ArrayList<>(Arrays.asList("aareg", "inst")); - historikkController.hentIdsMedKilde(kilder); - verify(historikkService).hentIdsMedKilder(kilder); - } - - @Test - public void shouldHenteHistorikkMedId() { - historikkController.hentHistorikkMedId(id); - verify(historikkService).hentHistorikkMedId(id); - } - - @Test - public void shouldLeggeTilHistorikk() { - var historikkRequest = HistorikkRequest.builder().build(); - historikkController.leggTilHistorikk(historikkRequest); - verify(historikkService).leggTilHistorikkPaaIdent(historikkRequest); - } - - @Test - public void shouldSletteHistorikk() { - historikkController.slettHistorikk(id); - verify(historikkService).slettHistorikk(id); - } - - @Test - public void shouldSletteKilde() { - var navnPaaKilde = "identMedData"; - historikkController.slettKilde(id, navnPaaKilde); - verify(historikkService).slettKilde(id, navnPaaKilde); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenControllerTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenControllerTest.java deleted file mode 100644 index 30a10c565a1..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/provider/HodejegerenControllerTest.java +++ /dev/null @@ -1,173 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.provider; - -import static no.nav.testnav.apps.hodejegeren.provider.HodejegerenController.MAX_ALDER; -import static no.nav.testnav.apps.hodejegeren.provider.HodejegerenController.MIN_ALDER; -import static org.mockito.Mockito.verify; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import no.nav.testnav.apps.hodejegeren.service.CacheService; -import no.nav.testnav.apps.hodejegeren.service.EksisterendeIdenterService; -import no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService; -import no.nav.testnav.apps.hodejegeren.service.Endringskoder; - -@RunWith(MockitoJUnitRunner.class) -public class HodejegerenControllerTest { - - @Mock - private EksisterendeIdenterService eksisterendeIdenterService; - - @Mock - private CacheService cacheService; - - @Mock - private EndringskodeTilFeltnavnMapperService endringskodeTilFeltnavnMapperService; - - @InjectMocks - private HodejegerenController hodejegerenController; - - private String fnr; - private Long avspillergruppeId; - private String miljoe; - private String endringskode; - private int antallIdenter; - private int minimumAlder; - private int maksimumAlder; - private List myndigeIdenter; - - @Before - public void setUp() { - fnr = "01010101010"; - avspillergruppeId = 100000445L; - miljoe = "t9"; - endringskode = Endringskoder.FOEDSELSMELDING.getEndringskode(); - antallIdenter = 10; - minimumAlder = 18; - maksimumAlder = 67; - myndigeIdenter = new ArrayList<>(); - myndigeIdenter.add(fnr); - } - - /** - * Scenario: HVIS hodejeger-controlleren får et request om å hente identer i gruppe, skal metoden kalle på - * {@link CacheService#hentAlleIdenterCache(Long)} - */ - @Test - public void shouldHenteAlleIdenterIGruppe() { - hodejegerenController.hentAlleIdenterIGruppe(avspillergruppeId); - verify(cacheService).hentAlleIdenterCache(avspillergruppeId); - } - - /** - * Scenario: HVIS hodejeger-controlleren får et request om å hente levende identer i gruppe, skal metoden kalle på - * {@link CacheService#hentLevendeIdenterCache(Long)} - */ - @Test - public void shouldHenteLevendeIdenterIGruppe() { - hodejegerenController.hentLevendeIdenterIGruppe(avspillergruppeId); - verify(cacheService).hentLevendeIdenterCache(avspillergruppeId); - } - - /** - * Scenario: HVIS hodejeger-controlleren får et request om å hente døde og utvandrede identer i gruppe, skal metoden kalle på - * {@link CacheService#hentDoedeOgUtvandredeIdenterCache(Long)} - */ - @Test - public void shouldHenteDoedeOgUtvandredeIdenterIGruppe() { - hodejegerenController.hentDoedeOgUtvandredeIdenterIGruppe(avspillergruppeId); - verify(cacheService).hentDoedeOgUtvandredeIdenterCache(avspillergruppeId); - } - - /** - * Scenario: HVIS hodejeger-controlleren får et request om å hente gifte identer i gruppe, skal metoden kalle på - * {@link CacheService#hentGifteIdenterCache(Long)} - */ - @Test - public void shouldHenteGifteIdenterIGruppe() { - hodejegerenController.hentGifteIdenterIGruppe(avspillergruppeId); - verify(cacheService).hentGifteIdenterCache(avspillergruppeId); - } - - /** - * Scenario: HVIS hodejeger-controlleren får et request om å hente hente status quo på et fnr i et miljø med en viss endringskode, skal metoden kalle på - * {@link EndringskodeTilFeltnavnMapperService#getStatusQuoFraAarsakskode} - */ - @Test - public void shouldHenteStatusQuoFraEndringskode() throws IOException { - hodejegerenController.hentStatusQuoFraEndringskode(endringskode, miljoe, fnr); - verify(endringskodeTilFeltnavnMapperService).getStatusQuoFraAarsakskode(endringskode, miljoe, fnr); - } - - @Test - public void hentAlleLevendeOverAlderTest() { - hodejegerenController.hentAlleLevendeIdenterOverAlder(avspillergruppeId, 13); - verify(eksisterendeIdenterService).finnAlleIdenterOverAlder(avspillergruppeId, 13); - } - - @Test - public void shouldHenteAlleIdenterIAldersgruppe() { - hodejegerenController.hentAlleIdenterIAldersgruppe(avspillergruppeId, minimumAlder, maksimumAlder); - verify(eksisterendeIdenterService).finnLevendeIdenterIAldersgruppe(avspillergruppeId, minimumAlder, maksimumAlder); - } - - @Test - public void shouldHenteIdenterMedStatusQuo() { - hodejegerenController.hentEksisterendeIdenterMedStatusQuo(avspillergruppeId, miljoe, 1, MIN_ALDER, MAX_ALDER); - verify(eksisterendeIdenterService).hentGittAntallIdenterMedStatusQuo(avspillergruppeId, miljoe, 1, MIN_ALDER, MAX_ALDER); - } - - @Test - public void shouldHenteAdresserPaaIdenter() { - List identer = new ArrayList<>(Collections.singleton(fnr)); - hodejegerenController.hentAdressePaaIdenter(miljoe, identer); - verify(eksisterendeIdenterService).hentAdressePaaIdenter(miljoe, identer); - } - - @Test - public void shouldHenteAlleFoedteIdenter() { - hodejegerenController.hentFoedteIdenter(avspillergruppeId, minimumAlder, maksimumAlder); - verify(eksisterendeIdenterService).finnFoedteIdenter(avspillergruppeId, minimumAlder, maksimumAlder); - } - - @Test - public void shouldHentePersondataTilIdent() { - String ident = "01010101010"; - hodejegerenController.hentPersondataTilIdent(ident, miljoe); - verify(eksisterendeIdenterService).hentPersondata(ident, miljoe); - } - - @Test - public void shouldHenteIdenterMedKontoinformasjon() { - hodejegerenController.hentPersondataMedKontoinformasjon(avspillergruppeId, miljoe, antallIdenter, minimumAlder, maksimumAlder); - verify(eksisterendeIdenterService).hentGittAntallIdenterMedKononummerinfo(avspillergruppeId, miljoe, antallIdenter, minimumAlder, maksimumAlder); - } - - @Test - public void shouldHenteRelasjonerTilIdent() { - String ident = "01010101010"; - hodejegerenController.hentRelasjonerTilIdent(ident, miljoe); - verify(eksisterendeIdenterService).hentRelasjoner(ident, miljoe); - } - - @Test - public void shouldHenteIdenterSomIkkeErITps() { - hodejegerenController.hentIdenterSomIkkeErITps(avspillergruppeId, miljoe); - verify(eksisterendeIdenterService).hentIdenterSomIkkeErITps(avspillergruppeId, miljoe); - } - - @Test - public void shouldHenteIdenterSomKolliderer() { - hodejegerenController.hentIdenterSomKolliderer(avspillergruppeId); - verify(eksisterendeIdenterService).hentIdenterSomKolliderer(avspillergruppeId); - } -} diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/AsyncCacheTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/AsyncCacheTest.java deleted file mode 100644 index 85408049b95..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/AsyncCacheTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.test.util.ReflectionTestUtils; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -@RunWith(MockitoJUnitRunner.class) -public class AsyncCacheTest { - - @Mock - private TpsfFiltreringService tpsfFiltreringService; - - @InjectMocks - private AsyncCache asyncCache; - - private String fnr1 = "01010101010"; - private String fnr2 = "02020202020"; - private String fnr3 = "03030303030"; - private String fnr4 = "04040404040"; - private List alleIdenter; - private List levendeIdenter; - private List doedeOgUtvandredeIdenter; - private List gifteIdenter; - private List foedteIdenter; - private long avspillergruppeId = 123L; - private List fasteAvspillergrupper; - - @Before - public void setUp() { - fasteAvspillergrupper = new ArrayList<>(Collections.singletonList(avspillergruppeId)); - - ReflectionTestUtils.setField(asyncCache, "fasteAvspillergrupper", fasteAvspillergrupper); - - alleIdenter = new ArrayList<>(Arrays.asList(fnr1, fnr2, fnr3, fnr4)); - levendeIdenter = new ArrayList<>(Arrays.asList(fnr1, fnr2, fnr3)); - doedeOgUtvandredeIdenter = new ArrayList<>(Collections.singletonList(fnr4)); - gifteIdenter = new ArrayList<>(Arrays.asList(fnr1, fnr2)); - foedteIdenter = new ArrayList<>(Arrays.asList(fnr3, fnr4)); - } - - @Test - public void shouldOppdatereAlleCacherForFasteAvspillergrupper() { - when(tpsfFiltreringService.finnAlleIdenter(avspillergruppeId)).thenReturn(alleIdenter); - when(tpsfFiltreringService.finnLevendeIdenter(avspillergruppeId)).thenReturn(levendeIdenter); - when(tpsfFiltreringService.finnDoedeOgUtvandredeIdenter(avspillergruppeId)).thenReturn(doedeOgUtvandredeIdenter); - when(tpsfFiltreringService.finnGifteIdenter(avspillergruppeId)).thenReturn(gifteIdenter); - when(tpsfFiltreringService.finnFoedteIdenter(avspillergruppeId)).thenReturn(foedteIdenter); - - asyncCache.oppdaterAlleCacher(); - - assertThat(asyncCache.getAlleIdenterCache().get(avspillergruppeId)).containsExactlyInAnyOrderElementsOf(alleIdenter); - assertThat(asyncCache.getLevendeIdenterCache().get(avspillergruppeId)).containsExactlyInAnyOrderElementsOf(levendeIdenter); - assertThat(asyncCache.getDoedeOgUtvandredeIdenterCache().get(avspillergruppeId)).containsExactlyInAnyOrderElementsOf(doedeOgUtvandredeIdenter); - assertThat(asyncCache.getGifteIdenterCache().get(avspillergruppeId)).containsExactlyInAnyOrderElementsOf(gifteIdenter); - assertThat(asyncCache.getFoedteIdenterCache().get(avspillergruppeId)).containsExactlyInAnyOrderElementsOf(foedteIdenter); - - verify(tpsfFiltreringService).finnAlleIdenter(avspillergruppeId); - verify(tpsfFiltreringService).finnLevendeIdenter(avspillergruppeId); - verify(tpsfFiltreringService).finnDoedeOgUtvandredeIdenter(avspillergruppeId); - verify(tpsfFiltreringService).finnGifteIdenter(avspillergruppeId); - verify(tpsfFiltreringService).finnFoedteIdenter(avspillergruppeId); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/CacheServiceTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/CacheServiceTest.java deleted file mode 100644 index c071bb0fe9f..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/CacheServiceTest.java +++ /dev/null @@ -1,144 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RunWith(MockitoJUnitRunner.class) -public class CacheServiceTest { - - @Mock - private AsyncCache asyncCache; - - @InjectMocks - private CacheService cacheService; - - private Long avspillergruppeId = 123L; - private static final String FNR1 = "01010101010"; - - @Test - public void shouldHenteAlleIdenterMedTomCache() { - when(asyncCache.getAlleIdenterCache()).thenReturn(new HashMap<>()); - - cacheService.hentAlleIdenterCache(avspillergruppeId); - - verify(asyncCache).oppdaterAlleIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteAlleIdenterMedEksisterendeCache() { - Map> alleIdenterCache = new HashMap<>(); - alleIdenterCache.put(avspillergruppeId, Collections.singletonList(FNR1)); - - when(asyncCache.getAlleIdenterCache()).thenReturn(alleIdenterCache); - - var result = cacheService.hentAlleIdenterCache(avspillergruppeId); - - assertThat(result).hasSize(1).contains(FNR1); - - verify(asyncCache).asyncOppdaterAlleIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteLevendeIdenterMedTomCache() { - when(asyncCache.getLevendeIdenterCache()).thenReturn(new HashMap<>()); - - cacheService.hentLevendeIdenterCache(avspillergruppeId); - - verify(asyncCache).oppdaterLevendeIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteLevendeIdenterMedEksisterendeCache() { - Map> levendeIdenterCache = new HashMap<>(); - levendeIdenterCache.put(avspillergruppeId, Collections.singletonList(FNR1)); - - when(asyncCache.getLevendeIdenterCache()).thenReturn(levendeIdenterCache); - - var result = cacheService.hentLevendeIdenterCache(avspillergruppeId); - - assertThat(result).hasSize(1).contains(FNR1); - - verify(asyncCache).asyncOppdaterLevendeIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteDoedeOgUtvandredeIdenterMedTomCache() { - when(asyncCache.getDoedeOgUtvandredeIdenterCache()).thenReturn(new HashMap<>()); - - cacheService.hentDoedeOgUtvandredeIdenterCache(avspillergruppeId); - - verify(asyncCache).oppdaterDoedeOgUtvandredeIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteDoedeOgUtvandredeIdenterMedEksisterendeCache() { - Map> doedeOgUtvandredeIdenterCache = new HashMap<>(); - doedeOgUtvandredeIdenterCache.put(avspillergruppeId, Collections.singletonList(FNR1)); - - when(asyncCache.getDoedeOgUtvandredeIdenterCache()).thenReturn(doedeOgUtvandredeIdenterCache); - - var result = cacheService.hentDoedeOgUtvandredeIdenterCache(avspillergruppeId); - - assertThat(result).hasSize(1).contains(FNR1); - - verify(asyncCache).asyncOppdaterDoedeOgUtvandredeIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteGifteIdenterAndUpdateCache() { - when(asyncCache.getGifteIdenterCache()).thenReturn(new HashMap<>()); - - cacheService.hentGifteIdenterCache(avspillergruppeId); - - verify(asyncCache).oppdaterGifteIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteGifteIdenterMedEksisterendeCache() { - Map> gifteIdenterCache = new HashMap<>(); - gifteIdenterCache.put(avspillergruppeId, Collections.singletonList(FNR1)); - - when(asyncCache.getGifteIdenterCache()).thenReturn(gifteIdenterCache); - - var result = cacheService.hentGifteIdenterCache(avspillergruppeId); - - assertThat(result).hasSize(1).contains(FNR1); - - verify(asyncCache).asyncOppdaterGifteIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteFoedteIdenterAndUpdateCache() { - when(asyncCache.getFoedteIdenterCache()).thenReturn(new HashMap<>()); - - cacheService.hentFoedteIdenterCache(avspillergruppeId); - - verify(asyncCache).oppdaterFoedteIdenterCache(avspillergruppeId); - } - - @Test - public void shouldHenteFoedteIdenterMedEksisterendeCache() { - Map> foedteIdenterCache = new HashMap<>(); - foedteIdenterCache.put(avspillergruppeId, Collections.singletonList(FNR1)); - - when(asyncCache.getFoedteIdenterCache()).thenReturn(foedteIdenterCache); - - var result = cacheService.hentFoedteIdenterCache(avspillergruppeId); - - assertThat(result).hasSize(1).contains(FNR1); - - verify(asyncCache).asyncOppdaterFoedteIdenterCache(avspillergruppeId); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterServiceTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterServiceTest.java deleted file mode 100644 index 1b6d76fe28f..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EksisterendeIdenterServiceTest.java +++ /dev/null @@ -1,277 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static no.nav.testnav.apps.hodejegeren.provider.HodejegerenController.MAX_ALDER; -import static no.nav.testnav.apps.hodejegeren.provider.HodejegerenController.MIN_ALDER; -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.NAV_ENHET; -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.NAV_ENHET_BESKRIVELSE; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.fasterxml.jackson.databind.ObjectMapper; -import no.nav.testnav.apps.hodejegeren.provider.responses.kontoinfo.KontoinfoResponse; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import wiremock.com.google.common.io.Resources; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import no.nav.testnav.apps.hodejegeren.consumer.TpsfConsumer; - -@RunWith(MockitoJUnitRunner.class) -public class EksisterendeIdenterServiceTest { - - private static final String ROUTINE_KERNINFO = "FS03-FDNUMMER-KERNINFO-O"; - private static final String AKSJONSKODE = "B0"; - private static final int MINIMUM_ALDER = 18; - - private final String miljoe = "t1"; - - @Mock - private TpsStatusQuoService tpsStatusQuoService; - - @Mock - private TpsfConsumer tpsfConsumer; - - @Mock - private TpsfFiltreringService tpsfFiltreringService; - - @Mock - private CacheService cacheService; - - @InjectMocks - private EksisterendeIdenterService eksisterendeIdenterService; - - private Long avspillergruppeId1 = 1L; - private Long avspillergruppeId2 = 2L; - private List foedteIdenter; - - @Before - public void setUp() { - foedteIdenter = new ArrayList<>(); - foedteIdenter.add("20041751231"); - - when(cacheService.hentFoedteIdenterCache(avspillergruppeId2)).thenReturn(foedteIdenter); - } - - /** - * Scenario: - * Henter identer fra en tom gruppe - */ - @Test - public void hentMyndigeIdenterIGruppeIngenIdenterTest() { - var identer = eksisterendeIdenterService.hentLevendeIdenter(2L, miljoe, 2, MINIMUM_ALDER).collectList().block(); - assertThat(identer).isEmpty(); - } - - - /** - * Scenario: - * Finn fødte identer - */ - @Test - public void finnFoedteIdenterTest() { - var minAlder = 0; - var maksAlder = 200; - var foedte = eksisterendeIdenterService.finnFoedteIdenter(avspillergruppeId2, minAlder, maksAlder); - - assertThat(foedte).hasSize(1).contains(foedteIdenter.get(0)); - } - - /** - * Gitt en liste med identer, skal systemet finne tilhørende nav-kontor og returnere et map med fnr-navKontor - */ - @Test - public void hentFnrMedNavKontor() throws IOException { - var navEnhet = "123"; - var beskrivelse = "test"; - - Map status = new HashMap<>(); - status.put(NAV_ENHET, navEnhet); - status.put(NAV_ENHET_BESKRIVELSE, beskrivelse); - when(tpsStatusQuoService.hentStatusQuo(eq("FS03-FDNUMMER-KERNINFO-O"), eq(Arrays.asList(NAV_ENHET, NAV_ENHET_BESKRIVELSE)), eq(miljoe), any())).thenReturn(status); - - List levendeIdenter = new ArrayList<>(); - levendeIdenter.add("20044249945"); - levendeIdenter.add("20044249946"); - - var navEnhetResponse = eksisterendeIdenterService.hentFnrMedNavKontor(miljoe, levendeIdenter); - - assertThat(navEnhetResponse.get(0).getIdent()).isEqualTo(levendeIdenter.get(0)); - assertThat(navEnhetResponse.get(0).getNavEnhet()).isEqualTo(navEnhet); - assertThat(navEnhetResponse.get(0).getNavEnhetBeskrivelse()).isEqualTo(beskrivelse); - - assertThat(navEnhetResponse.get(1).getIdent()).isEqualTo(levendeIdenter.get(1)); - assertThat(navEnhetResponse.get(1).getNavEnhet()).isEqualTo(navEnhet); - assertThat(navEnhetResponse.get(1).getNavEnhetBeskrivelse()).isEqualTo(beskrivelse); - } - - /** - * Gitt et antall identer med tilhørende miljø i TPS, returner en liste med objekter med fnr og tilhørende nav-enhet - */ - @Test - @Ignore - public void hentGittAntallIdenterMedStatusQuoTest() throws IOException { - var jsonContent = Resources.getResource("files/FS03-FDNUMMER-KERNINFO-O.json"); - var jsonNode = new ObjectMapper().readTree(jsonContent); - var fnr1 = "23048801390"; - List identer = new ArrayList<>(); - identer.add(fnr1); - - when(cacheService.hentLevendeIdenterCache(avspillergruppeId1)).thenReturn(identer); - when(tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, fnr1)).thenReturn(jsonNode); - - var fnrMedStatusQuo = eksisterendeIdenterService.hentGittAntallIdenterMedStatusQuo(avspillergruppeId1, miljoe, identer.size(), MIN_ALDER, MAX_ALDER); - - verify(cacheService).hentLevendeIdenterCache(avspillergruppeId1); - verify(tpsStatusQuoService).getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, fnr1); - - assertThat(fnrMedStatusQuo).containsEntry(fnr1, jsonNode); - } - - @Test - @Ignore - public void hentGittAntallIdenterMedKontonummerTest() throws IOException { - var jsonContent = Resources.getResource("files/FS03-FDNUMMER-KERNINFO-O.json"); - var jsonNode = new ObjectMapper().readTree(jsonContent); - var fnr1 = "23048801390"; - List identer = new ArrayList<>(); - identer.add(fnr1); - - when(cacheService.hentLevendeIdenterCache(avspillergruppeId1)).thenReturn(identer); - when(tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, fnr1)).thenReturn(jsonNode); - - List fnrMedKontoinfo = eksisterendeIdenterService.hentGittAntallIdenterMedKononummerinfo(avspillergruppeId1, miljoe, identer.size(), MIN_ALDER, MAX_ALDER); - - verify(cacheService).hentLevendeIdenterCache(avspillergruppeId1); - verify(tpsStatusQuoService).getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, fnr1); - - assertThat(fnrMedKontoinfo.get(0).getFnr()).isEqualTo(fnr1); - assertThat(fnrMedKontoinfo.get(0).getKontonummer()).isEqualTo("20000723267"); - } - - @Test - public void shouldHenteAdresserPaaIdent() throws IOException { - var jsonContent = Resources.getResource("files/FS03-FDNUMMER-KERNINFO-O.json"); - var jsonNode = new ObjectMapper().readTree(jsonContent); - var fnr1 = "23048801390"; - var identer = new ArrayList<>(Collections.singleton(fnr1)); - - when(tpsStatusQuoService.getInfoOnRoutineName(ROUTINE_KERNINFO, AKSJONSKODE, miljoe, identer.get(0))).thenReturn(jsonNode); - - var adressePaaIdenter = eksisterendeIdenterService.hentAdressePaaIdenter(miljoe, identer); - - assertThat(adressePaaIdenter.get("23048801390").findValue("boAdresse1").asText()).isEqualTo("WALLDORFERSTRABE 1289"); - } - - @Test - public void shouldHentePersondataPaaIdent() throws IOException { - var fnr = "12101816735"; - var miljoe = "t1"; - - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/persondata/persondata.json")); - - when(tpsStatusQuoService.getInfoOnRoutineName(anyString(), anyString(), anyString(), anyString())).thenReturn(jsonNode); - var response = eksisterendeIdenterService.hentPersondata(fnr, miljoe); - - assertThat(response.getFnr()).isEqualTo(fnr); - assertThat(response.getFornavn()).isEqualTo("USTABIL"); - assertThat(response.getEtternavn()).isEqualTo("PARASOLL"); - assertThat(response.getStatsborger()).isEqualTo("NORGE"); - } - - @Test - public void shouldHandleEmptyRelasjon() throws IOException { - var fnr = "12090080405"; - var miljoe = "t1"; - - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/relasjoner/tom_relasjon.json")); - - when(tpsStatusQuoService.getInfoOnRoutineName(anyString(), anyString(), anyString(), anyString())).thenReturn(jsonNode); - var response = eksisterendeIdenterService.hentRelasjoner(fnr, miljoe); - - assertThat(response.getFnr()).isEqualTo(fnr); - assertThat(response.getRelasjoner()).isEmpty(); - } - - @Test - public void shouldHandleSingleRelasjon() throws IOException { - var fnr = "12090080405"; - var miljoe = "t1"; - - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/relasjoner/relasjon.json")); - - when(tpsStatusQuoService.getInfoOnRoutineName(anyString(), anyString(), anyString(), anyString())).thenReturn(jsonNode); - var response = eksisterendeIdenterService.hentRelasjoner(fnr, miljoe); - - assertThat(response.getFnr()).isEqualTo(fnr); - assertThat(response.getRelasjoner()).hasSize(1); - assertThat(response.getRelasjoner().get(0).getFnrRelasjon()).isEqualTo("12021790069"); - } - - @Test - public void shouldHandleMultipleRelasjoner() throws IOException { - var fnr = "12090080405"; - var miljoe = "t1"; - - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/relasjoner/relasjoner.json")); - - when(tpsStatusQuoService.getInfoOnRoutineName(anyString(), anyString(), anyString(), anyString())).thenReturn(jsonNode); - var response = eksisterendeIdenterService.hentRelasjoner(fnr, miljoe); - - assertThat(response.getFnr()).isEqualTo(fnr); - assertThat(response.getRelasjoner()).hasSize(2); - assertThat(response.getRelasjoner().get(0).getFnrRelasjon()).isEqualTo("12021790069"); - assertThat(response.getRelasjoner().get(1).getFnrRelasjon()).isEqualTo("17120080318"); - } - - @Test - public void shouldHenteIdenterNotInTps() throws IOException { - var avspillergruppeId = 123L; - var fnr1 = "20092943861"; - var fnr2 = "12345678910"; - var identer = new ArrayList<>(Arrays.asList(fnr1, fnr2)); - - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/tpsStatus/tps_status.json")); - - when(tpsfFiltreringService.finnAlleIdenter(avspillergruppeId)).thenReturn(identer); - when(tpsfConsumer.hentTpsStatusPaaIdenter(eq("A0"), eq(miljoe), anyList())).thenReturn(jsonNode); - - var identerIkkeITps = eksisterendeIdenterService.hentIdenterSomIkkeErITps(avspillergruppeId, miljoe); - - assertThat(identerIkkeITps).contains(fnr2).doesNotContain(fnr1); - } - - @Test - public void shouldHenteIdenterSomKolliderer() throws IOException { - var avspillergruppeId = 123L; - var fnr1 = "20092943861"; - var fnr2 = "12345678910"; - var identer = new ArrayList<>(Arrays.asList(fnr1, fnr2)); - - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/tpsStatus/tps_kollisjon.json")); - - when(tpsfFiltreringService.finnAlleIdenter(avspillergruppeId)).thenReturn(identer); - when(tpsfConsumer.hentTpsStatusPaaIdenter(eq("A2"), eq("q2"), anyList())).thenReturn(jsonNode); - - var identerSomKolliderer = eksisterendeIdenterService.hentIdenterSomKolliderer(avspillergruppeId); - - assertThat(identerSomKolliderer).contains(fnr1).doesNotContain(fnr2); - } -} diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperServiceTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperServiceTest.java deleted file mode 100644 index 2569da27201..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/EndringskodeTilFeltnavnMapperServiceTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.DATO_DO; -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.STATSBORGER; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.eq; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; - -import java.io.IOException; -import java.util.List; - -@RunWith(MockitoJUnitRunner.class) -public class EndringskodeTilFeltnavnMapperServiceTest { - - @InjectMocks - private EndringskodeTilFeltnavnMapperService endringskodeTilFeltnavnMapperService; - - @Mock - private TpsStatusQuoService tpsStatusQuoService; - - /** - * Testscenario: HVIS et kall gjøres til getStatusQuoFraAarsakskode med en aarsakskode, skal riktig servicerutine og feltnavn - * bli sendt til hentStatusQuo() - */ - @Test - public void shouldFindFeltnavnAndServiceRoutineFromAarsakskode() throws IOException { - var fnr = "12345678901"; - var environment = "t1"; - var routineName = "FS03-FDNUMMER-PERSDATA-O"; - - var endringskode = Endringskoder.NAVNEENDRING_FOERSTE.getEndringskode(); - - endringskodeTilFeltnavnMapperService.getStatusQuoFraAarsakskode(endringskode, environment, fnr); - - ArgumentCaptor> captor = ArgumentCaptor.forClass(List.class); - Mockito.verify(tpsStatusQuoService).hentStatusQuo(eq(routineName), captor.capture(), eq(environment), eq(fnr)); - List actualRequestParams = captor.getValue(); - - assertThat(actualRequestParams).hasSize(2).contains(DATO_DO, STATSBORGER); - } -} diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/HistorikkServiceTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/HistorikkServiceTest.java deleted file mode 100644 index 2ecf4d49615..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/HistorikkServiceTest.java +++ /dev/null @@ -1,231 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.google.common.io.Resources; - -import no.nav.testnav.apps.hodejegeren.provider.requests.HistorikkRequest; -import no.nav.testnav.libs.domain.dto.namespacetps.TpsPersonDokumentType; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; - -import java.io.IOException; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import no.nav.testnav.apps.hodejegeren.mongodb.Data; -import no.nav.testnav.apps.hodejegeren.mongodb.Kilde; -import no.nav.testnav.apps.hodejegeren.mongodb.SyntHistorikk; -import no.nav.testnav.apps.hodejegeren.mongodb.SyntHistorikkRepository; - -@RunWith(MockitoJUnitRunner.class) -public class HistorikkServiceTest { - - @Mock - private SyntHistorikkRepository syntHistorikkRepository; - - @InjectMocks - private HistorikkService historikkService; - - private String id1 = "01010101010"; - private String id2 = "02020202020"; - private SyntHistorikk syntHistorikk1; - private SyntHistorikk syntHistorikk2; - private List lagretHistorikk; - private HistorikkRequest historikkRequest1; - private HistorikkRequest historikkRequest2; - - @Before - public void setUp() throws IOException { - var objectMapper = new ObjectMapper(); - syntHistorikk1 = objectMapper.treeToValue(objectMapper.readTree(Resources.getResource("files/historikk/historikk1.json")), SyntHistorikk.class); - syntHistorikk2 = objectMapper.treeToValue(objectMapper.readTree(Resources.getResource("files/historikk/historikk2.json")), SyntHistorikk.class); - - lagretHistorikk = new ArrayList<>(Arrays.asList(syntHistorikk1, syntHistorikk2)); - - when(syntHistorikkRepository.findAll(any(Pageable.class))).thenReturn(new PageImpl<>(lagretHistorikk)); - when(syntHistorikkRepository.findById(id1)).thenReturn(Optional.ofNullable(lagretHistorikk.get(0))); - when(syntHistorikkRepository.findById(id2)).thenReturn(Optional.ofNullable(lagretHistorikk.get(1))); - - when(syntHistorikkRepository.findAllIdsByKildenavn("aareg")).thenReturn(lagretHistorikk); - - when(syntHistorikkRepository.save(syntHistorikk1)).thenReturn(syntHistorikk1); - when(syntHistorikkRepository.save(syntHistorikk2)).thenReturn(syntHistorikk2); - - historikkRequest1 = objectMapper.treeToValue(objectMapper.readTree(Resources.getResource("files/historikk/historikk-request1.json")), HistorikkRequest.class); - historikkRequest2 = objectMapper.treeToValue(objectMapper.readTree(Resources.getResource("files/historikk/historikk-request2.json")), HistorikkRequest.class); - } - - @Test - public void shouldHenteAllHistorikk() { - var historikk = historikkService.hentAllHistorikk(0, 10); - - assertThat(historikk).hasSize(2); - assertThat(historikk.get(0).getId()).isEqualTo(id1); - assertThat(historikk.get(1).getId()).isEqualTo(id2); - } - - @Test - public void shouldHenteHistorikkMedId() { - var historikk1 = historikkService.hentHistorikkMedId(id1); - var historikk2 = historikkService.hentHistorikkMedId(id2); - - assertThat(historikk1.getId()).isEqualTo(id1); - assertThat(historikk2.getId()).isEqualTo(id2); - } - - @Test - public void shouldHenteHistorikkMedKilde() { - when(syntHistorikkRepository.findAllByIdIn(anyList(), any(Pageable.class))).thenReturn(new PageImpl<>(lagretHistorikk)); - var historikkMedKilde = historikkService.hentHistorikkMedKilder(Collections.singletonList("aareg"), 0, 10); - - var historikkIds = new ArrayList<>(Arrays.asList(historikkMedKilde.get(0).getId(), historikkMedKilde.get(1).getId())); - - assertThat(historikkIds).hasSize(2).contains(id1, id2); - } - - @Test - public void shouldHenteIdsMedKilde() { - var idsMedKilde = historikkService.hentIdsMedKilder(Collections.singletonList("aareg")); - - assertThat(idsMedKilde).hasSize(2).contains(id1, id2); - } - - @Test - public void shouldOppretteHistorikk() { - var historikk1 = historikkService.opprettHistorikk(syntHistorikk1); - var historikk2 = historikkService.opprettHistorikk(syntHistorikk2); - - assertThat(historikk1.getId()).isEqualTo(syntHistorikk1.getId()); - assertThat(historikk1.getKilder().get(0).getNavn()).isEqualTo("aareg"); - assertThat(historikk1.getKilder().get(0).getData().get(0).getDatoOpprettet()).isNotNull(); - assertThat(historikk1.getKilder().get(0).getData().get(0).getDatoEndret()).isNotNull(); - - assertThat(historikk2.getId()).isEqualTo(syntHistorikk2.getId()); - assertThat(historikk2.getKilder().get(0).getNavn()).isEqualTo("aareg"); - assertThat(historikk2.getKilder().get(0).getData().get(0).getDatoOpprettet()).isNotNull(); - assertThat(historikk2.getKilder().get(0).getData().get(0).getDatoEndret()).isNotNull(); - } - - @Test - public void shouldLeggeTilHistorikkPaaIdent() { - var identerLagtTil = historikkService.leggTilHistorikkPaaIdent(historikkRequest1); - assertThat(identerLagtTil).hasSize(1).contains(id1); - - identerLagtTil = historikkService.leggTilHistorikkPaaIdent(historikkRequest2); - assertThat(identerLagtTil).hasSize(1).contains(id2); - - verify(syntHistorikkRepository, times(2)).save(any()); - } - - @Test - public void shouldOppdatereTpsPersonDokument() throws IOException { - var datoOpprettet = LocalDateTime.of(2000, 1, 1, 1, 1); - var skdFnr = "19040979827"; - List data = new ArrayList<>(); - data.add(Data.builder().datoOpprettet(datoOpprettet).datoEndret(datoOpprettet).build()); - List kilder = new ArrayList<>(); - kilder.add(Kilde.builder() - .navn("skd") - .data(data) - .build()); - var skdHistorikk = SyntHistorikk.builder() - .id(skdFnr) - .kilder(kilder) - .build(); - - when(syntHistorikkRepository.findById(skdFnr)).thenReturn(Optional.ofNullable(skdHistorikk)); - when(syntHistorikkRepository.save(any())).thenReturn(skdHistorikk); - - var resource = Resources.getResource("files/historikk/TpsPersonDokumentType.xml"); - var xmlMapper = new XmlMapper(); - var tpsPersonDokumentType = xmlMapper.readValue(resource, TpsPersonDokumentType.class); - - var identerOppdatert = historikkService.oppdaterTpsPersonDokument(skdFnr, tpsPersonDokumentType); - - assertThat(identerOppdatert).hasSize(1).contains(skdFnr);; - - verify(syntHistorikkRepository).findById(skdFnr); - verify(syntHistorikkRepository).save(any()); - } - - @Test - public void shouldOppretteNyttSkdDokument() throws IOException { - var skdFnr = "03030303030"; - List kilder = new ArrayList<>(); - kilder.add(Kilde.builder() - .navn("skd") - .build()); - var skdHistorikk = SyntHistorikk.builder() - .id(skdFnr) - .kilder(kilder) - .build(); - - when(syntHistorikkRepository.findById(skdFnr)).thenReturn(Optional.empty()); - when(syntHistorikkRepository.save(any())).thenReturn(skdHistorikk); - - var resource = Resources.getResource("files/historikk/TpsPersonDokumentType.xml"); - var xmlMapper = new XmlMapper(); - var tpsPersonDokumentType = xmlMapper.readValue(resource, TpsPersonDokumentType.class); - - var identerLagtTil = historikkService.oppdaterTpsPersonDokument(skdFnr, tpsPersonDokumentType); - - assertThat(identerLagtTil).hasSize(1).contains(skdFnr); - - verify(syntHistorikkRepository, times(2)).findById(skdFnr); - verify(syntHistorikkRepository).save(any()); - } - - @Test - public void shouldSletteHistorikk() { - var response = historikkService.slettHistorikk(id1); - - verify(syntHistorikkRepository).deleteById(id1); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).contains("Historikk tilhørende id '" + id1 + "' ble slettet"); - } - - @Test - public void shouldReturnErrorOnUnsuccessfulDeleteOfHistorikk() { - var response = historikkService.slettHistorikk("03030303030"); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - assertThat(response.getBody()).contains("Fant ingen historikk tilhørende id '03030303030'"); - } - - @Test - public void shouldSletteKilde() { - var response = historikkService.slettKilde(id1, "aareg"); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).contains("Kilde 'aareg' tilhørende id '" + id1 + "' ble slettet"); - } - - @Test - public void shouldReturnErrorOnUnsuccessfulDeleteOfKilde() { - var response = historikkService.slettKilde(id1, "bisys"); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - assertThat(response.getBody()).contains("Fant ingen identMedData med navn 'bisys' tilhørende id '" + id1 + "'"); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoServiceTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoServiceTest.java deleted file mode 100644 index d646c1dafad..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsStatusQuoServiceTest.java +++ /dev/null @@ -1,95 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.FNR_RELASJON; -import static no.nav.testnav.apps.hodejegeren.service.EndringskodeTilFeltnavnMapperService.STATSBORGERSKAP; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.io.Resources; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import no.nav.testnav.apps.hodejegeren.consumer.TpsfConsumer; - -@RunWith(MockitoJUnitRunner.class) -public class TpsStatusQuoServiceTest { - - @InjectMocks - private TpsStatusQuoService tpsStatusQuoService; - - @Mock - private TpsfConsumer tpsfConsumer; - - private static final String FNR = "12345678901"; - private static final String MILJOE = "t1"; - private static final String ROUTINE_NAME = "FS03-FDNUMMER-KERNINFO-O"; - private URL jsonContent = Resources.getResource("files/FS03-FDNUMMER-KERNINFO-O.json"); - - /** - * Testscenario: HVIS hentStatusQuo blir kalt med et simpelt feltnavn, så skal den returnere servicerutine-feltets verdi i en - * map. - */ - @Test - public void shouldGetStatusQuoForFeltnavn() throws IOException { - var jsonNode = new ObjectMapper().readTree(jsonContent); - - List feltNavn = new ArrayList<>(); - feltNavn.add(STATSBORGERSKAP); - - when(tpsfConsumer.getTpsServiceRoutine(any(), any(), any(), any())).thenReturn(jsonNode); - - var statusQuoValues = tpsStatusQuoService.hentStatusQuo(ROUTINE_NAME, feltNavn, MILJOE, FNR); - - assertThat(statusQuoValues).hasSize(1).containsEntry(STATSBORGERSKAP, "NOR"); - } - - /** - * Testscenario: HVIS hentStatusQuo blir kalt med feltnavn som er avhengig av et annet felt, skal man få tilbake riktig felt gitt - * korrekt spørring - */ - @Test - public void shouldGetStatusQuoForFeltnavnRelasjon() throws IOException { - var jsonNode = new ObjectMapper().readTree(Resources.getResource("files/FS02-FDNUMMER-PERSRELA-O.json")); - - List feltNavn = new ArrayList<>(); - feltNavn.add(FNR_RELASJON); - - when(tpsfConsumer.getTpsServiceRoutine(any(), any(), any(), any())).thenReturn(jsonNode); - - var statusQuoValues = tpsStatusQuoService.hentStatusQuo(ROUTINE_NAME, feltNavn, MILJOE, FNR); - - assertThat(statusQuoValues).hasSize(1).containsEntry(FNR_RELASJON, "01065500791"); - } - - /** - * Testscenario: HVIS hentStatusQuo blir kalt med feltnavn på formen "felt1/felt2/.../feltX, så skal den returnere - * servicerutine-feltX sin verdi i en map. - */ - @Test - public void shouldGetStatusQuoForFeltnavnPath() throws IOException { - var jsonNode = new ObjectMapper().readTree(jsonContent); - - List feltNavn = new ArrayList<>(); - feltNavn.add("$..bostedsAdresse.fullBostedsAdresse.adrSaksbehandler"); - feltNavn.add("$..bostedsAdresse.fullBostedsAdresse.offAdresse.husnr"); - - when(tpsfConsumer.getTpsServiceRoutine(any(), any(), any(), any())).thenReturn(jsonNode); - - var statusQuoValues = tpsStatusQuoService.hentStatusQuo(ROUTINE_NAME, feltNavn, MILJOE, FNR); - - assertThat(statusQuoValues) - .hasSize(2) - .containsEntry("$..bostedsAdresse.fullBostedsAdresse.adrSaksbehandler", "AJOURHD") - .containsEntry("$..bostedsAdresse.fullBostedsAdresse.offAdresse.husnr", "1289"); - } -} diff --git a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringServiceTest.java b/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringServiceTest.java deleted file mode 100644 index e646bd08ac3..00000000000 --- a/apps/hodejegeren/src/test/java/no/nav/testnav/apps/hodejegeren/service/TpsfFiltreringServiceTest.java +++ /dev/null @@ -1,106 +0,0 @@ -package no.nav.testnav.apps.hodejegeren.service; - -import static no.nav.testnav.apps.hodejegeren.service.EksisterendeIdenterService.TRANSAKSJONSTYPE; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.FOEDSELSMELDING; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.FOEDSELSNUMMERKORREKSJON; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.INNVANDRING; -import static no.nav.testnav.apps.hodejegeren.service.Endringskoder.TILDELING_DNUMMER; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -import no.nav.testnav.apps.hodejegeren.consumer.TpsfConsumer; - -@RunWith(MockitoJUnitRunner.class) -public class TpsfFiltreringServiceTest { - - @Mock - private TpsfConsumer tpsfConsumer; - - @InjectMocks - private TpsfFiltreringService tpsfFiltreringService; - - private Long avspillergruppeId = 1L; - private static final String FNR1 = "20044249945"; - private static final String FNR2 = "20044249946"; - private static final String FNR3 = "20044249947"; - private static final String FNR4 = "20044249948"; - private static final String FNR5 = "20041751231"; - - @Before - public void setUp() { - Set levendeIdenter = new LinkedHashSet<>(); - levendeIdenter.add(FNR1); - levendeIdenter.add(FNR2); - levendeIdenter.add(FNR3); - levendeIdenter.add(FNR4); - - Set doedeIdenter = new LinkedHashSet<>(); - doedeIdenter.add(FNR4); - - Set gifteIdenter = new LinkedHashSet<>(); - gifteIdenter.add(FNR5); - - Set foedteIdenter = new LinkedHashSet<>(); - foedteIdenter.add(FNR5); - - when(tpsfConsumer.getIdenterFiltrertPaaAarsakskode(avspillergruppeId, Arrays.asList( - FOEDSELSMELDING.getAarsakskode(), - INNVANDRING.getAarsakskode(), - FOEDSELSNUMMERKORREKSJON.getAarsakskode(), - TILDELING_DNUMMER.getAarsakskode()), TRANSAKSJONSTYPE)).thenReturn(levendeIdenter); - when(tpsfConsumer.getIdenterFiltrertPaaAarsakskode(avspillergruppeId, Arrays.asList( - Endringskoder.DOEDSMELDING.getAarsakskode(), - Endringskoder.UTVANDRING.getAarsakskode()), TRANSAKSJONSTYPE)).thenReturn(doedeIdenter); - when(tpsfConsumer.getIdenterFiltrertPaaAarsakskode(avspillergruppeId, Collections.singletonList( - Endringskoder.VIGSEL.getAarsakskode()), TRANSAKSJONSTYPE)).thenReturn(gifteIdenter); - when(tpsfConsumer.getIdenterFiltrertPaaAarsakskode(avspillergruppeId, Collections.singletonList( - FOEDSELSMELDING.getAarsakskode()), TRANSAKSJONSTYPE)).thenReturn(foedteIdenter); - } - - @Test - public void finnAlleIdenterTest() { - var alle = tpsfFiltreringService.finnAlleIdenter(avspillergruppeId); - - assertThat(alle).hasSize(4).contains(FNR1, FNR2, FNR3, FNR4); - } - - @Test - public void finnLevendeIdenterTest() { - var levende = tpsfFiltreringService.finnLevendeIdenter(avspillergruppeId); - - assertThat(levende).hasSize(3).contains(FNR1, FNR2, FNR3); - } - - @Test - public void finnDoedeOgUtvandredeIdenterTest() { - var doede = tpsfFiltreringService.finnDoedeOgUtvandredeIdenter(avspillergruppeId); - - assertThat(doede).hasSize(1).contains(FNR4); - } - - @Test - public void finnGifteIdenterTest() { - var gifte = tpsfFiltreringService.finnGifteIdenter(avspillergruppeId); - - assertThat(gifte).hasSize(1).contains(FNR5); - } - - @Test - public void finnFoedteIdenterTest() { - var foedte = tpsfFiltreringService.finnFoedteIdenter(avspillergruppeId); - - assertThat(foedte).hasSize(1).contains(FNR5); - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/application-test.yml b/apps/hodejegeren/src/test/resources/application-test.yml deleted file mode 100644 index caa75b10b25..00000000000 --- a/apps/hodejegeren/src/test/resources/application-test.yml +++ /dev/null @@ -1,25 +0,0 @@ -consumers: - tpsf-proxy: - name: tps-forvalteren-proxy - url: http://localhost:${wiremock.server.port:0}/tpsf - namespace: dummy - cluster: dummy - -spring: - data: - mongodb: - database: dummy - port: 0123 - host: dummy - cloud: - vault: - enabled: false - -cache.avspillergrupper: 100000783, 100000784 - -AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/aad -azure.app.client.id: dummy -azure.app.client.secret: dummy - -CLIENT_ID: dummy -CLIENT_SECRET: dummy diff --git a/apps/hodejegeren/src/test/resources/files/FS02-FDNUMMER-PERSRELA-O.json b/apps/hodejegeren/src/test/resources/files/FS02-FDNUMMER-PERSRELA-O.json deleted file mode 100644 index 1ca3af93dc7..00000000000 --- a/apps/hodejegeren/src/test/resources/files/FS02-FDNUMMER-PERSRELA-O.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "response": { - "data1": { - "antallRelasjoner": 1, - "endringsDato": "2018-10-15", - "adresse": "", - "fnr": 12055310651, - "spesregType": "", - "typeAdresse": "", - "sivilstand": "GIFT", - "relasjoner": { - "relasjon": { - "kortnavn": "DORULL LUGUBER", - "datoDo": "", - "mellomnavn": "", - "etternavn": "DORULL", - "adresseStatus": 0, - "spesregType": "", - "fornavn": "LUGUBER", - "fnrRelasjon": "01065500791", - "typeRelasjon": "EKTE" - } - } - }, - "status": { - "kode": "00", - "melding": " ", - "utfyllendeMelding": " " - }, - "antallTotalt": null - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/FS03-FDNUMMER-KERNINFO-O.json b/apps/hodejegeren/src/test/resources/files/FS03-FDNUMMER-KERNINFO-O.json deleted file mode 100644 index ebba18d7aec..00000000000 --- a/apps/hodejegeren/src/test/resources/files/FS03-FDNUMMER-KERNINFO-O.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "response": { - "data1": { - "statsborgerskap": "NOR", - "kjonn": "M", - "fodselsnummerDetalj": { - "fnrSystem": "", - "fnrTidspunkt": "", - "fnrSaksbehandler": "" - }, - "bruker": { - "sikkerhetsTiltak": { - "sikrFom": "", - "beskrSikkerhetsTiltak": "", - "sikrTom": "", - "opprettetSystem": "", - "opprettetSaksbehandler": "", - "opprettetTidspunkt": "", - "typeSikkerhetsTiltak": "" - }, - "NAVenhetDetalj": { - "kodeNAVenhetBeskr": "FROGNER", - "NAVenhetSaksbehandler": "AJOURHD", - "datoNAVenhet": "2018-10-23", - "NAVenhetTidspunkt": "2018-10-23", - "NAVenhetSystem": "SKD", - "kodeNAVenhet": "0312" - }, - "umyndigDetalj": { - "umyndigSaksbehandler": "", - "umyndigSystem": "", - "umyndigTidspunkt": "" - }, - "diskresjonDetalj": { - "diskresjonSaksbehandler": "", - "diskresjonTidspunkt": "", - "diskresjonSystem": "", - "kodeDiskresjonBeskr": "", - "kodeDiskresjonBeskr": "", - "datoDiskresjon": "", - "kodeDiskresjon": "" - }, - "postadresseNorgeNAV": { - "beskrTypeAdresseNavNorge": "", - "tilleggsLinje": "", - "kommunenr": "", - "husbokstav": "", - "adrTidspunktReg": "", - "datoFom": "", - "kommuneNavn": "", - "postboksnr": "", - "poststed": "", - "bolignr": "", - "adrSaksbehandler": "", - "datoTom": "", - "postnr": "", - "adrSystem": "", - "gatekode": "", - "husnr": "", - "typeAdresseNavNorge": "", - "beskrTypeTilleggsLinje": "", - "typeTilleggsLinje": "", - "gatenavn": "", - "postboksAnlegg": "", - "eiendomsnavn": "" - }, - "datoUmyndiggjort": "", - "bankkontoUtland": { - "beskrBankValuta": "", - "bankAdresse2": "", - "bankAdresse1": "", - "giroNrUtland": "", - "regSaksbehandler": "", - "bankLand": "", - "bankValuta": "", - "bankLandKode": "", - "swiftKodeUtland": "", - "regSystem": "", - "bankNavnUtland": "", - "iban": "", - "regTidspunkt": "", - "bankAdresse3": "", - "bankKodeUtland": "" - }, - "postadresseUtlandNAV": { - "adresseType": "", - "beskrAdrType": "", - "adrSaksbehandler": "", - "datoTom": "", - "landKode": "", - "adrTidspunktReg": "", - "adrSystem": "", - "datoFom": "", - "land": "", - "adresse3": "", - "adresse1": "", - "adresse2": "" - }, - "relasjoner": "", - "NAVenhet": "0312" - }, - "sivilstand": "GIFT", - "personstatusDetalj": { - "kodePersonstatus": "BOSA", - "psTidspunkt": "2018-10-23", - "psSystem": "SKD", - "datoPersonstatus": "2018-10-23", - "kodePersonstatusBeskr": "Bosatt", - "psSaksbehandler": "" - }, - "fodselsdato": "1988-04-23", - "datoDo": "", - "bankkontoNorge": { - "regSystem": "", - "regSaksbehandler": "", - "kontoNummer": "20000723267", - "regTidspunkt": "", - "banknavn": "" - }, - "postAdresse": { - "postLand": "", - "postLandKode": "", - "fullPostAdresse": { - "adresseType": "", - "landKode": "", - "adrTidspunktReg": "", - "datoFom": "", - "adresse3": "", - "adresse1": "", - "adresse2": "", - "poststed": "", - "beskrAdrType": "", - "adrSaksbehandler": "", - "datoTom": "", - "postnr": "", - "adrSystem": "", - "land": "" - }, - "postAdresse2": "", - "postAdresse1": "", - "postPostnr": "", - "postPoststed": "", - "postAdresse3": "" - }, - "fodestedDetalj": { - "fodestedTidspunkt": "", - "fodestedSystem": "", - "fodestedSaksbehandler": "" - }, - "identType": "FNR", - "bostedsAdresse": { - "boAdresse2": "", - "boPoststed": "OSLO", - "boAdresse1": "WALLDORFERSTRABE 1289", - "boPostnr": "0264", - "fullBostedsAdresse": { - "adresseType": "OFFA", - "offAdresse": { - "bokstav": "", - "husnr": 1289, - "gateNavn": "WALLDORFERSTRABE" - }, - "kommunenr": "0301", - "landKode": "NOR", - "adrTidspunktReg": "2018-10-23", - "datoFom": "1988-04-23", - "kommuneNavn": "Oslo", - "adresse1": "WALLDORFERSTRABE 1289", - "tilleggsAdresseSKD": "", - "adresse2": "", - "tknr": "0312", - "poststed": "OSLO", - "bolignr": "", - "beskrAdrType": "Offisiell adresse", - "adrSaksbehandler": "AJOURHD", - "datoTom": "", - "matrAdresse": { - "undernr": "", - "gardsnr": "", - "festenr": "", - "mellomAdresse": "", - "bruksnr": "" - }, - "postnr": "0264", - "adrSystem": "SKD", - "tkNavn": "FROGNER", - "land": "NORGE" - } - }, - "fodselsnummer": 23048801390, - "statsborgerskapDetalj": { - "kodeStatsborgerskapBeskr": "NORGE", - "sbSystem": "SKD", - "sbTidspunkt": "2018-10-23", - "kodeStatsborgerskap": "NOR", - "sbSaksbehandler": "AJOURHD", - "datoStatsborgerskap": "1988-04-23" - }, - "datoDoDetalj": { - "doSystem": "", - "doSaksbehandler": "", - "doTidspunkt": "" - }, - "fodested": "", - "personnavn": { - "gjeldendePersonnavn": "HEST SMEKKER", - "allePersonnavn": { - "kortnavn": "HEST SMEKKER", - "navnTidspunkt": "2018-10-23", - "mellomnavn": "", - "etternavn": "HEST", - "navnSaksbehandler": "AJOURHD", - "fornavn": "SMEKKER", - "navnSystem": "SKD" - } - }, - "sivilstandDetalj": { - "sivilstSaksbehandler": "AJOURHD", - "kodeSivilstandBeskr": "Gift", - "kodeSivilstand": "GIFT", - "datoSivilstand": "2018-10-23", - "sivilstTidspunkt": "2018-10-23", - "sivilstSystem": "SKD" - } - }, - "status": { - "kode": "00", - "melding": " ", - "utfyllendeMelding": " " - }, - "antallTotalt": null - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/historikk/TpsPersonDokumentType.xml b/apps/hodejegeren/src/test/resources/files/historikk/TpsPersonDokumentType.xml deleted file mode 100644 index ec85a381ddb..00000000000 --- a/apps/hodejegeren/src/test/resources/files/historikk/TpsPersonDokumentType.xml +++ /dev/null @@ -1,316 +0,0 @@ - - - - Ok - - - Ja - - 2019-08-25 - TPS - - - 0 - 130891 - - 19040979827 - FNR - - 2017-12-08 - - - - - BRUK - - 2017-12-08 - SKD - - - K - 2009-04-19 - NOR - 1805 - 2017-12-08 - - SKD - - - BOSA - - 2009-04-19 - SKD - - - MOSE MISFORNØYD - MOSE - MISFORNØYD - - - 2017-12-08 - - SKD - AJOURHD - - - - - - - - - - - - - - - - - NOR - 2017-12-08 - - SKD - AJOURHD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SOFIESPLASS - NOR - 0301 - 0169 - 030104 - - 16745 - 0002 - B - - - - - - 2016-02-25 - - SKD - - - - - - - - - - - - U - - - - - - DELT - 2017-12-08 - - SKD - AJOURHD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12108117670 - FNR - BRUK - MORA - 2009-04-19 - - SKD - AJOURHD - - - 13069010711 - FNR - BRUK - FARA - 2009-04-19 - - SKD - AJOURHD - - \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/historikk/historikk-request1.json b/apps/hodejegeren/src/test/resources/files/historikk/historikk-request1.json deleted file mode 100644 index aceefeb2187..00000000000 --- a/apps/hodejegeren/src/test/resources/files/historikk/historikk-request1.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "kilde": "aareg", - "identMedData": [ - { - "id": "01010101010", - "data": [ - { - "arbeidsforhold": { - "ansettelsesPeriode": { - "fom": "2001-01-01T00:00:00" - }, - "arbeidsavtale": { - "arbeidstidsordning": "ikkeSkift", - "avtaltArbeidstimerPerUke": 33.6, - "stillingsprosent": 100, - "endringsdatoStillingsprosent": "2001-01-01T00:00:00", - "yrke": "8142102" - }, - "arbeidsforholdID": "VA5cq4dPIfDnODQL", - "arbeidsforholdstype": "ordinaertArbeidsforhold", - "arbeidsgiver": { - "aktoertype": "ORG", - "orgnummer": "974044005" - }, - "arbeidstaker": { - "aktoertype": "PERS", - "ident": "01010101010", - "identtype": "FNR" - } - } - } - ] - } - ] -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/historikk/historikk-request2.json b/apps/hodejegeren/src/test/resources/files/historikk/historikk-request2.json deleted file mode 100644 index 96a74b80410..00000000000 --- a/apps/hodejegeren/src/test/resources/files/historikk/historikk-request2.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "kilde": "aareg", - "identMedData": [ - { - "id": "02020202020", - "data": [ - { - "arbeidsforhold": { - "ansettelsesPeriode": { - "fom": "1989-06-15T00:00:00" - }, - "arbeidsavtale": { - "arbeidstidsordning": "helkontinuerligSkiftOgAndreOrdninger336", - "avtaltArbeidstimerPerUke": 37.5, - "stillingsprosent": 100, - "endringsdatoStillingsprosent": "1989-06-15T00:00:00", - "yrke": "3419116" - }, - "arbeidsforholdID": "SoumYJsBVimUTDyu", - "arbeidsforholdstype": "ordinaertArbeidsforhold", - "arbeidsgiver": { - "aktoertype": "ORG", - "orgnummer": "974549697" - }, - "arbeidstaker": { - "aktoertype": "PERS", - "ident": "02020202020", - "identtype": "FNR" - } - } - } - ] - } - ] -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/historikk/historikk1.json b/apps/hodejegeren/src/test/resources/files/historikk/historikk1.json deleted file mode 100644 index e1e9bde1a1a..00000000000 --- a/apps/hodejegeren/src/test/resources/files/historikk/historikk1.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "id": "01010101010", - "kilder": [ - { - "navn": "aareg", - "data": [ - { - "innhold": { - "arbeidsforhold": { - "ansettelsesPeriode": { - "fom": "2016-07-01T00:00:00" - }, - "arbeidsavtale": { - "arbeidstidsordning": "ikkeSkift", - "avtaltArbeidstimerPerUke": 37.5, - "stillingsprosent": 0, - "endringsdatoStillingsprosent": "2016-07-01T00:00:00", - "yrke": "4129101" - }, - "arbeidsforholdID": "NjeFBZmNLg0GHQYh", - "arbeidsforholdstype": "ordinaertArbeidsforhold", - "arbeidsgiver": { - "aktoertype": "ORG", - "orgnummer": "973993224" - }, - "arbeidstaker": { - "aktoertype": "PERS", - "ident": "01010101010", - "identtype": "FNR" - } - } - } - }, - { - "innhold": { - "arbeidsforhold": { - "ansettelsesPeriode": { - "fom": "2015-07-01T00:00:00" - }, - "arbeidsavtale": { - "arbeidstidsordning": "ikkeSkift", - "avtaltArbeidstimerPerUke": 37.5, - "stillingsprosent": 0, - "endringsdatoStillingsprosent": "2015-07-01T00:00:00", - "yrke": "4129100" - }, - "arbeidsforholdID": "NjeFBZmNLg0GHQYn", - "arbeidsforholdstype": "ordinaertArbeidsforhold", - "arbeidsgiver": { - "aktoertype": "ORG", - "orgnummer": "973993223" - }, - "arbeidstaker": { - "aktoertype": "PERS", - "ident": "01010101010", - "identtype": "FNR" - } - } - } - } - ] - }, - { - "navn": "inst", - "data": [ - { - "innhold": { - "dato_fom": "01.11.2010", - "dato_tom": "", - "dato_tom_forventet": "", - "k_kilde_inst_t": "IT", - "k_opphold_inst_t": "AS", - "k_pas_ka_inst_t": "A", - "k_varig_inst_t": "L", - "overfort": 0, - "tss_ekstern_id_fk": 80000465001 - } - } - ] - } - ] -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/historikk/historikk2.json b/apps/hodejegeren/src/test/resources/files/historikk/historikk2.json deleted file mode 100644 index 5528c608c42..00000000000 --- a/apps/hodejegeren/src/test/resources/files/historikk/historikk2.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "id": "02020202020", - "kilder": [ - { - "navn": "aareg", - "data": [ - { - "innhold": { - "arbeidsforhold": { - "ansettelsesPeriode": { - "fom": "2014-08-01T00:00:00" - }, - "arbeidsavtale": { - "arbeidstidsordning": "ikkeSkift", - "avtaltArbeidstimerPerUke": 37.5, - "stillingsprosent": 0, - "endringsdatoStillingsprosent": "2016-07-01T00:00:00", - "yrke": "4129102" - }, - "arbeidsforholdID": "NjeFBZmNLg0GHQYn", - "arbeidsforholdstype": "ordinaertArbeidsforhold", - "arbeidsgiver": { - "aktoertype": "ORG", - "orgnummer": "973993225" - }, - "arbeidstaker": { - "aktoertype": "PERS", - "ident": "02020202020", - "identtype": "FNR" - } - } - } - } - ] - } - ] -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/persondata/persondata.json b/apps/hodejegeren/src/test/resources/files/persondata/persondata.json deleted file mode 100644 index 6ef750f774b..00000000000 --- a/apps/hodejegeren/src/test/resources/files/persondata/persondata.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "fnr": "12101816735", - "kortnavn": "PARASOLL USTABIL", - "fornavn": "USTABIL", - "mellomnavn": "", - "etternavn": "PARASOLL", - "kodeStatsborger": "NOR", - "statsborger": "NORGE", - "datoStatsborger": "2018-11-11", - "kodeSivilstand": "UGIF", - "sivilstand": "Ugift", - "datoSivilstand": "2009-06-21", - "kodeInnvandretFra": "DEU", - "innvandretFra": "TYSKLAND", - "datoInnvandret": "2016-01-11" -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/relasjoner/relasjon.json b/apps/hodejegeren/src/test/resources/files/relasjoner/relasjon.json deleted file mode 100644 index b71a7769b88..00000000000 --- a/apps/hodejegeren/src/test/resources/files/relasjoner/relasjon.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "response": { - "data1": { - "antallRelasjoner": 1, - "endringsDato": "2017-12-08", - "adresse": "HOFFSVEIEN 30", - "fnr": 12090080405, - "spesregType": "", - "typeAdresse": "OFFA", - "typeAdrBeskr": "Offisiell adresse", - "sivilstand": "GIFT", - "relasjoner": { - "relasjon": { - "kortnavn": "DATAMASKIN VERTIKAL", - "datoDo": "", - "typeRelBeskr": "Barn av", - "mellomnavn": "", - "etternavn": "DATAMASKIN", - "adresseStatus": 0, - "adrStatusBeskr": "", - "spesregType": "", - "fornavn": "VERTIKAL", - "fnrRelasjon": 12021790069, - "typeRelasjon": "BARN" - } - }, - "sivilstandBeskr": "Gift" - }, - "status": { - "kode": "00", - "melding": " ", - "utfyllendeMelding": " " - }, - "antallTotalt": 1 - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/relasjoner/relasjoner.json b/apps/hodejegeren/src/test/resources/files/relasjoner/relasjoner.json deleted file mode 100644 index b2e84fdae20..00000000000 --- a/apps/hodejegeren/src/test/resources/files/relasjoner/relasjoner.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "response": { - "data1": { - "antallRelasjoner": 2, - "endringsDato": "2017-12-08", - "adresse": "HOFFSVEIEN 30", - "fnr": 12090080405, - "spesregType": "", - "typeAdresse": "OFFA", - "typeAdrBeskr": "Offisiell adresse", - "sivilstand": "GIFT", - "relasjoner": { - "relasjon": [ - { - "kortnavn": "DATAMASKIN VERTIKAL", - "datoDo": "", - "typeRelBeskr": "Barn av", - "mellomnavn": "", - "etternavn": "DATAMASKIN", - "adresseStatus": 0, - "adrStatusBeskr": "", - "spesregType": "", - "fornavn": "VERTIKAL", - "fnrRelasjon": 12021790069, - "typeRelasjon": "BARN" - }, - { - "kortnavn": "OPPOSISJON INNESLUTTET TY", - "datoDo": "", - "typeRelBeskr": "Ektefelle til", - "mellomnavn": "TYPISK", - "etternavn": "OPPOSISJON", - "adresseStatus": 0, - "adrStatusBeskr": "", - "spesregType": "", - "fornavn": "INNESLUTTET", - "fnrRelasjon": 17120080318, - "typeRelasjon": "EKTE" - } - ] - }, - "sivilstandBeskr": "Gift" - }, - "status": { - "kode": "00", - "melding": " ", - "utfyllendeMelding": " " - }, - "antallTotalt": 1 - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/relasjoner/tom_relasjon.json b/apps/hodejegeren/src/test/resources/files/relasjoner/tom_relasjon.json deleted file mode 100644 index bc777906c8a..00000000000 --- a/apps/hodejegeren/src/test/resources/files/relasjoner/tom_relasjon.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "response": { - "data1": { - "antallRelasjoner": 0, - "endringsDato": "2015-01-05", - "adresse": "TREDALSVEGEN 12 H0102", - "fnr": "12090080405", - "spesregType": "", - "typeAdresse": "OFFA", - "typeAdrBeskr": "Offisiell adresse", - "sivilstand": "GIFT", - "relasjoner": "", - "sivilstandBeskr": "Gift" - }, - "status": { - "kode": "00", - "melding": " ", - "utfyllendeMelding": " " - }, - "antallTotalt": 1 - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/tpsStatus/tps_kollisjon.json b/apps/hodejegeren/src/test/resources/files/tpsStatus/tps_kollisjon.json deleted file mode 100644 index d9809fa03ba..00000000000 --- a/apps/hodejegeren/src/test/resources/files/tpsStatus/tps_kollisjon.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "response": { - "data1": { - "antallFM201": 2, - "AFnr": { - "EFnr": [ - { - "mn": "", - "kn": "", - "fn": "", - "en": "", - "fnr": 20092943861, - "sp": "" - }, - { - "mn": "", - "svarStatus": { - "returMelding": "S201005F", - "returStatus": "08", - "utfyllendeMelding": "" - }, - "kn": "", - "fn": "", - "en": "", - "fnr": 12345678910, - "sp": "" - } - ] - } - }, - "status": { - "kode": "08", - "melding": "S201005F", - "utfyllendeMelding": "Person ikke funnet" - }, - "antallTotalt": 1 - } -} \ No newline at end of file diff --git a/apps/hodejegeren/src/test/resources/files/tpsStatus/tps_status.json b/apps/hodejegeren/src/test/resources/files/tpsStatus/tps_status.json deleted file mode 100644 index e735fdb8251..00000000000 --- a/apps/hodejegeren/src/test/resources/files/tpsStatus/tps_status.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "response": { - "data1": { - "antallFM201": 2, - "AFnr": { - "EFnr": [ - { - "mn": "RIKTIG", - "kn": "GLEDE ULASTELIG RIKTIG", - "fn": "ULASTELIG", - "en": "GLEDE", - "fnr": 20092943861, - "sp": "" - }, - { - "mn": "", - "svarStatus": { - "returMelding": "S201005F", - "returStatus": "08", - "utfyllendeMelding": "" - }, - "kn": "", - "fn": "", - "en": "", - "fnr": 12345678910, - "sp": "" - } - ] - } - }, - "status": { - "kode": "08", - "melding": "S201005F", - "utfyllendeMelding": "Person ikke funnet" - }, - "antallTotalt": 1 - } -} \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/Dockerfile b/apps/mn-synt-arbeidsforhold-service/Dockerfile deleted file mode 100644 index f07acf30380..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ghcr.io/navikt/baseimages/temurin:21 -LABEL maintainer="Team Dolly" - -ENV JAVA_OPTS="-Dspring.profiles.active=prod" - -ADD /build/libs/app.jar /app/app.jar - -EXPOSE 8080 - - diff --git a/apps/mn-synt-arbeidsforhold-service/README.md b/apps/mn-synt-arbeidsforhold-service/README.md deleted file mode 100644 index 9bd82ebffb4..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/README.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -layout: default -title: Syntetisk Arbeidsforhold Service -parent: Mini Norge -grand_parent: Applikasjoner ---- - -# Mini-Norge Syntetisk Arbeidsforhold Service - -Oppretter syntetiske arbeidsforhold i Mini-Norge - -## Swagger -Swagger finnes under [/swagger](https://mn-synt-arbeidsforhold-service.dev.intern.nav.no/swagger) -endepunktet til applikasjonen. - -## Lokal kjøring -Ha naisdevice kjørende og kjør MNSyntArbeidsforholdServiceApplicationStarter med følgende argumenter: -``` --Dspring.cloud.vault.token=[Copy token fra Vault] --Dspring.profiles.active=dev -``` - -### Utviklerimage -I utviklerimage brukes ikke naisdevice og du må legge til følgende ekstra argumenter: -``` --Djavax.net.ssl.trustStore=[path til lokal truststore] --Djavax.net.ssl.trustStorePassword=[passord til lokal truststore] -``` \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle deleted file mode 100644 index 434e11c8934..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ /dev/null @@ -1,95 +0,0 @@ -plugins { - id 'java' - id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.3" - id "jacoco" -} - -test { - useJUnitPlatform() -} - -jacocoTestReport { - reports { - xml.required = true - } -} - -sonarqube { - properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true - property "sonar.projectKey", "mn-synt-arbeidsforhold-service" - property "sonar.projectName", "mn-synt-arbeidsforhold-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:servlet-security' - implementation 'no.nav.testnav.libs:database' - implementation 'no.nav.testnav.libs:commands' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'com.h2database:h2' - implementation 'com.zaxxer:HikariCP' - implementation 'org.flywaydb:flyway-core' - implementation 'org.postgresql:postgresql' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -description = 'mn-synt-arbeidsforhold-service' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/config.yml b/apps/mn-synt-arbeidsforhold-service/config.yml deleted file mode 100644 index 35059bbd84d..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/config.yml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: "nais.io/v1alpha1" -kind: "Application" -metadata: - name: mn-synt-arbeidsforhold-service - namespace: dolly - labels: - team: dolly -spec: - image: "{{image}}" - port: 8080 - webproxy: true - accessPolicy: - inbound: - rules: - - application: team-dolly-lokal-app - cluster: dev-gcp - - application: testnav-oversikt-frontend - cluster: dev-gcp - outbound: - rules: - - application: testnorge-hodejegeren - cluster: dev-fss - tokenx: - enabled: true - azure: - application: - allowAllUsers: true - enabled: true - tenant: nav.no - liveness: - path: /internal/isAlive - initialDelay: 4 - periodSeconds: 5 - failureThreshold: 500 - readiness: - path: /internal/isReady - initialDelay: 4 - periodSeconds: 5 - failureThreshold: 500 - prometheus: - enabled: true - path: /internal/metrics - replicas: - min: 1 - max: 1 - vault: - enabled: true - resources: - requests: - cpu: 500m - memory: 1024Mi - limits: - memory: 2048Mi - ingresses: - - "https://mn-synt-arbeidsforhold-service.dev.intern.nav.no" # dev-fss diff --git a/apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.jar b/apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties b/apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a54a..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/apps/mn-synt-arbeidsforhold-service/gradlew b/apps/mn-synt-arbeidsforhold-service/gradlew deleted file mode 100755 index 3da45c161b0..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright ? 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?, -# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?; -# * compound commands having a testable exit status, especially ?case?; -# * various built-in commands including ?command?, ?set?, and ?ulimit?. -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/apps/mn-synt-arbeidsforhold-service/gradlew.bat b/apps/mn-synt-arbeidsforhold-service/gradlew.bat deleted file mode 100644 index ac1b06f9382..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/apps/mn-synt-arbeidsforhold-service/gradlewUpdate.sh b/apps/mn-synt-arbeidsforhold-service/gradlewUpdate.sh deleted file mode 100755 index e5ee6361152..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/gradlewUpdate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gradle wrapper \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/settings.gradle b/apps/mn-synt-arbeidsforhold-service/settings.gradle deleted file mode 100644 index ef0ec9411c3..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/settings.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id "com.gradle.enterprise" version "3.12.3" -} - -rootProject.name = 'mn-synt-arbeidsforhold-service' - -includeBuild '../../libs/security-core' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/servlet-security' -includeBuild '../../libs/commands' -includeBuild '../../libs/database' -includeBuild '../../libs/data-transfer-objects' - -gradleEnterprise { - buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/MNSyntArbeidsforholdServiceApplicationStarter.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/MNSyntArbeidsforholdServiceApplicationStarter.java deleted file mode 100644 index 14b64b982a2..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/MNSyntArbeidsforholdServiceApplicationStarter.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cache.annotation.EnableCaching; - -import no.nav.testnav.libs.servletcore.util.VaultUtil; - - -@SpringBootApplication -@EnableCaching -public class MNSyntArbeidsforholdServiceApplicationStarter { - - public static void main(String[] args) { - if ("prod".equals(System.getProperty("spring.profiles.active"))) { - VaultUtil.initCloudVaultToken(); - } - SpringApplication.run(MNSyntArbeidsforholdServiceApplicationStarter.class, args); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/IdentAdapter.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/IdentAdapter.java deleted file mode 100644 index 0d113b7fdeb..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/IdentAdapter.java +++ /dev/null @@ -1,7 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.adapter; - -import reactor.core.publisher.Flux; - -public interface IdentAdapter { - Flux getIdenter(String miljo, int antall); -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/TpsIdentAdapter.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/TpsIdentAdapter.java deleted file mode 100644 index f1fae6c471e..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/adapter/TpsIdentAdapter.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.adapter; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import reactor.core.publisher.Flux; - -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.HodejegerenConsumer; - -@Slf4j -@Component -@RequiredArgsConstructor -public class TpsIdentAdapter implements IdentAdapter { - private final HodejegerenConsumer hodejegerenConsumer; - - @Override - public Flux getIdenter(String miljo, int antall) { - return hodejegerenConsumer.getIdenter(miljo, antall); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/ApplicationConfig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/ApplicationConfig.java deleted file mode 100644 index 8fb359fad7e..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/ApplicationConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config; - -import no.nav.testnav.libs.database.config.FlywayConfiguration; -import no.nav.testnav.libs.database.config.VaultHikariConfiguration; -import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.core.task.TaskExecutor; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor; - -@Configuration -@Import({ - ApplicationCoreConfig.class, - FlywayConfiguration.class, - VaultHikariConfiguration.class, - SecureOAuth2ServerToServerConfiguration.class -}) -@EnableJpaAuditing -public class ApplicationConfig { - - @Bean - public TaskExecutor executor() { - final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setMaxPoolSize(50); - executor.setCorePoolSize(40); - executor.setThreadNamePrefix("thread-pool-with-security-context-"); - executor.initialize(); - return new DelegatingSecurityContextAsyncTaskExecutor(executor); - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/Consumers.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/Consumers.java deleted file mode 100644 index 00bb01cfcb3..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/Consumers.java +++ /dev/null @@ -1,33 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -import static lombok.AccessLevel.PACKAGE; - -/** - * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}. - *

- * Husk at Spring Boot bruker relaxed binding - * mellom configuration properties og field names. - * - * @see ServerProperties - */ -@Configuration -@ConfigurationProperties(prefix = "consumers") -@NoArgsConstructor(access = PACKAGE) -@Getter -@Setter(PACKAGE) -public class Consumers { - - private ServerProperties testnavGenererOrganisasjonPopulasjonService; - private ServerProperties hodejegeren; - private ServerProperties oppsummeringsdokumentService; - private ServerProperties testnavOrganisasjonService; - private ServerProperties syntAmelding; - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/OpenApiConfig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/OpenApiConfig.java deleted file mode 100644 index ee453129ed4..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/OpenApiConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config; - -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.security.SecurityRequirement; -import io.swagger.v3.oas.models.security.SecurityScheme; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.Arrays; - -import no.nav.testnav.libs.servletcore.config.ApplicationProperties; - -@Configuration -@Import(ApplicationProperties.class) -public class OpenApiConfig implements WebMvcConfigurer { - - @Bean - public OpenAPI openApi(ApplicationProperties applicationProperties) { - return new OpenAPI() - .components(new Components().addSecuritySchemes("bearer-jwt", new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT") - .in(SecurityScheme.In.HEADER) - .name("Authorization") - )) - .addSecurityItem( - new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write"))) - .info(new Info() - .title(applicationProperties.getName()) - .version(applicationProperties.getVersion()) - .description(applicationProperties.getDescription()) - .termsOfService("https://nav.no") - .contact(new Contact() - .url("https://nav-it.slack.com/archives/CA3P9NGA2") - .email("dolly@nav.no") - .name("Team Dolly") - ) - .license(new License() - .name("MIT License") - .url("https://opensource.org/licenses/MIT") - )); - } - - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/swagger").setViewName("redirect:/swagger-ui.html"); - } -} \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java deleted file mode 100644 index cdd85300ff8..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.core.annotation.Order; -import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.web.SecurityFilterChain; - - -@Order(1) -@EnableWebSecurity -@Configuration -@Profile({ "prod", "dev" }) -public class SecurityConfig { - - @Bean - public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - - httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers( - "/internal/**", - "/webjars/**", - "/swagger-resources/**", - "/v3/api-docs/**", - "/swagger-ui/**", - "/swagger", - "/error", - "/swagger-ui.html" - ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); - - return httpSecurity.build(); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SyntetiseringProperties.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SyntetiseringProperties.java deleted file mode 100644 index 6d95d65b71c..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SyntetiseringProperties.java +++ /dev/null @@ -1,15 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "syntetisering") -@Getter -@Setter -public class SyntetiseringProperties { - private Float endringssannsynlighet; - private boolean saveHistory; -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java deleted file mode 100644 index 81a27dc494b..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.vault.annotation.VaultPropertySource; -import org.springframework.vault.authentication.ClientAuthentication; -import org.springframework.vault.authentication.TokenAuthentication; -import org.springframework.vault.client.VaultEndpoint; -import org.springframework.vault.config.AbstractVaultConfiguration; - -import static io.micrometer.common.util.StringUtils.isBlank; - -@Configuration -@Profile("dev") -@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false) -@VaultPropertySource(value = "kv/preprod/fss/mn-synt-arbeidsforhold-service/dev", ignoreSecretNotFound = false) -public class VaultConfig extends AbstractVaultConfiguration { - - private static final String VAULT_TOKEN = "spring.cloud.vault.token"; - - @Override - public VaultEndpoint vaultEndpoint() { - return VaultEndpoint.create("vault.adeo.no", 443); - } - - @Override - public ClientAuthentication clientAuthentication() { - if (System.getenv().containsKey("VAULT_TOKEN")) { - System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN")); - } - var token = System.getProperty(VAULT_TOKEN); - if (isBlank(token)) { - throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); - } - return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); - } -} \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/GenererOrganisasjonPopulasjonConsumer.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/GenererOrganisasjonPopulasjonConsumer.java deleted file mode 100644 index 0c5033f8881..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/GenererOrganisasjonPopulasjonConsumer.java +++ /dev/null @@ -1,33 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer; - -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config.Consumers; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command.GetOpplysningspliktigOrgnummerCommand; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.WebClient; - -import java.util.Set; - -@Component -public class GenererOrganisasjonPopulasjonConsumer { - private final WebClient webClient; - private final ServerProperties serverProperties; - private final TokenExchange tokenExchange; - - public GenererOrganisasjonPopulasjonConsumer( - Consumers consumers, - TokenExchange tokenExchange) { - serverProperties = consumers.getTestnavGenererOrganisasjonPopulasjonService(); - this.tokenExchange = tokenExchange; - this.webClient = WebClient - .builder() - .baseUrl(serverProperties.getUrl()) - .build(); - } - - public Set getOpplysningspliktig(String miljo) { - var accessToken = tokenExchange.exchange(serverProperties).block(); - return new GetOpplysningspliktigOrgnummerCommand(webClient, accessToken.getTokenValue(), miljo).call(); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/HodejegerenConsumer.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/HodejegerenConsumer.java deleted file mode 100644 index 5120bd92b9a..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/HodejegerenConsumer.java +++ /dev/null @@ -1,35 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer; - -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config.Consumers; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command.GetLevendeIdenterCommand; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; - -@Component -public class HodejegerenConsumer { - - private final WebClient webClient; - private final TokenExchange tokenExchange; - private final ServerProperties serverProperties; - - public HodejegerenConsumer( - @Value("${consumers.hodejegeren.url}") String url, - Consumers consumers, - TokenExchange tokenExchange) { - serverProperties = consumers.getHodejegeren(); - this.tokenExchange = tokenExchange; - this.webClient = WebClient - .builder() - .baseUrl(url) - .build(); - } - - public Flux getIdenter(String miljo, int antall) { - return tokenExchange.exchange(serverProperties) - .flatMapMany(accessToken -> new GetLevendeIdenterCommand(webClient, miljo, antall, accessToken.getTokenValue()).call()); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OppsummeringsdokumentConsumer.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OppsummeringsdokumentConsumer.java deleted file mode 100644 index b138593fa54..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OppsummeringsdokumentConsumer.java +++ /dev/null @@ -1,115 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer; - -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config.Consumers; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Opplysningspliktig; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Organisajon; -import no.nav.testnav.libs.commands.GetOppsummeringsdokumentCommand; -import no.nav.testnav.libs.commands.GetOppsummeringsdokumenterCommand; -import no.nav.testnav.libs.commands.SaveOppsummeringsdokumenterCommand; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.Populasjon; -import no.nav.testnav.libs.securitycore.domain.AccessToken; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.servletcore.config.ApplicationProperties; -import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; -import org.springframework.http.MediaType; -import org.springframework.http.codec.json.Jackson2JsonDecoder; -import org.springframework.http.codec.json.Jackson2JsonEncoder; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.WebClient; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.stream.Collectors; - -@Slf4j -@Component -public class OppsummeringsdokumentConsumer { - private static final int BYTE_COUNT = 16 * 1024 * 1024; - private final WebClient webClient; - private final TokenExchange tokenExchange; - private final ServerProperties serverProperties; - private final Executor executor; - private final ApplicationProperties applicationProperties; - - public OppsummeringsdokumentConsumer( - TokenExchange tokenExchange, - Consumers consumers, - ObjectMapper objectMapper, - ApplicationProperties applicationProperties) { - this.applicationProperties = applicationProperties; - this.executor = Executors.newFixedThreadPool(10); - this.tokenExchange = tokenExchange; - serverProperties = consumers.getOppsummeringsdokumentService(); - this.webClient = WebClient - .builder() - .baseUrl(serverProperties.getUrl()) - .codecs(clientDefaultCodecsConfigurer -> { - clientDefaultCodecsConfigurer - .defaultCodecs() - .maxInMemorySize(BYTE_COUNT); - clientDefaultCodecsConfigurer - .defaultCodecs() - .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON)); - clientDefaultCodecsConfigurer - .defaultCodecs() - .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON)); - }) - .build(); - } - - public Optional getOpplysningspliktig(Organisajon organisajon, LocalDate kalendermaaned, String miljo) { - AccessToken accessToken = tokenExchange.exchange(serverProperties).block(); - var dto = new GetOppsummeringsdokumentCommand(webClient, accessToken.getTokenValue(), organisajon.getOrgnummer(), kalendermaaned, miljo).call().block(); - if (dto == null) { - return Optional.empty(); - } - - return Optional.of(new Opplysningspliktig(dto, organisajon.getDriverVirksomheter())); - } - - public List getAlleOpplysningspliktig(String miljo) { - log.info("Henter alle opplysningspliktige fra {}...", miljo); - AccessToken accessToken = tokenExchange.exchange(serverProperties).block(); - var list = new GetOppsummeringsdokumenterCommand(webClient, accessToken.getTokenValue(), miljo).call(); - log.info("Fant {} opplysningspliktig fra {}.", list.size(), miljo); - return list.stream().map(value -> new Opplysningspliktig(value, new ArrayList<>())).collect(Collectors.toList()); - } - - @SneakyThrows - public void sendOpplysningspliktig(Opplysningspliktig opplysningspliktig, String miljo) { - saveOpplysningspliktig(opplysningspliktig, miljo).get(); - } - - @SneakyThrows - public void sendOpplysningspliktig(List opplysningspliktig, String miljo) { - var futures = opplysningspliktig.stream().map(value -> saveOpplysningspliktig(value, miljo)) - .toList(); - for (var future : futures) { - future.get(); - } - } - - private CompletableFuture saveOpplysningspliktig(Opplysningspliktig opplysningspliktig, String miljo) { - AccessToken accessToken = tokenExchange.exchange(serverProperties).block(); - return CompletableFuture.supplyAsync( - () -> new SaveOppsummeringsdokumenterCommand( - webClient, - accessToken.getTokenValue(), - opplysningspliktig.toDTO(), - miljo, - applicationProperties.getName(), - Populasjon.MINI_NORGE - ).call().block(), - executor - ); - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OrganisasjonConsumer.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OrganisasjonConsumer.java deleted file mode 100644 index 97e2e66b0ee..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/OrganisasjonConsumer.java +++ /dev/null @@ -1,67 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer; - -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config.Consumers; -import no.nav.testnav.libs.commands.organisasjonservice.v1.GetOrganisasjonCommand; -import no.nav.testnav.libs.dto.organisasjon.v1.OrganisasjonDTO; -import no.nav.testnav.libs.securitycore.domain.AccessToken; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.WebClient; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.stream.Collectors; - -@Slf4j -@Component -@CacheConfig -public class OrganisasjonConsumer { - private final ServerProperties serviceProperties; - private final TokenExchange tokenExchange; - private final WebClient webClient; - private final ExecutorService executorService; - - public OrganisasjonConsumer( - Consumers consumers, - TokenExchange tokenExchange) { - serviceProperties = consumers.getTestnavOrganisasjonService(); - this.tokenExchange = tokenExchange; - this.executorService = Executors.newFixedThreadPool(serviceProperties.getThreads()); - this.webClient = WebClient - .builder() - .baseUrl(serviceProperties.getUrl()) - .build(); - } - - @Cacheable("Mini-Norge-EREG") - public List getOrganisasjoner(Set orgnummerListe, String miljo) { - var accessToken = tokenExchange.exchange(serviceProperties).block(); - var futures = orgnummerListe.stream().map(value -> getFutureOrganisasjon(value, accessToken, miljo)).collect(Collectors.toList()); - List list = new ArrayList<>(); - - for (CompletableFuture future : futures) { - try { - list.add(future.get()); - } catch (Exception e) { - log.warn("Klarer ikke å hente ut alle oragnisasjoner", e); - } - } - return list.stream().filter(Objects::nonNull).collect(Collectors.toList()); - } - - private CompletableFuture getFutureOrganisasjon(String orgnummer, AccessToken accessToken, String miljo) { - return CompletableFuture.supplyAsync( - () -> new GetOrganisasjonCommand(webClient, accessToken.getTokenValue(), orgnummer, miljo).call(), - executorService - ); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/SyntAmeldingConsumer.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/SyntAmeldingConsumer.java deleted file mode 100644 index 88d446b25af..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/SyntAmeldingConsumer.java +++ /dev/null @@ -1,121 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer; - -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.config.Consumers; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command.GenerateArbeidsforholdHistorikkCommand; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command.GenerateStartArbeidsforholdCommand; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Arbeidsforhold; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.exception.SyntetiseringException; -import no.nav.testnav.libs.dto.syntrest.v1.ArbeidsforholdResponse; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; -import org.springframework.http.MediaType; -import org.springframework.http.codec.json.Jackson2JsonDecoder; -import org.springframework.http.codec.json.Jackson2JsonEncoder; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.ExchangeStrategies; -import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.reactive.function.client.WebClientResponseException; - -import java.time.LocalDate; -import java.util.List; - -@Slf4j -@Component -public class SyntAmeldingConsumer { - - private static final String OPPRETTELSE_FEILMELDING = "Feil med opprettelse av arbeidsforhold: "; - private final WebClient webClient; - private final ServerProperties serverProperties; - private final TokenExchange tokenExchange; - private final ObjectMapper objectMapper; - - public SyntAmeldingConsumer( - TokenExchange tokenExchange, - Consumers consumers, - ObjectMapper objectMapper) { - this.objectMapper = objectMapper; - this.tokenExchange = tokenExchange; - serverProperties = consumers.getSyntAmelding(); - this.webClient = WebClient - .builder() - .exchangeStrategies(ExchangeStrategies - .builder() - .codecs(configurer -> configurer - .defaultCodecs() - .maxInMemorySize(16 * 1024 * 1024)) - .build()) - .codecs( - clientDefaultCodecsConfigurer -> { - clientDefaultCodecsConfigurer - .defaultCodecs() - .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON)); - clientDefaultCodecsConfigurer - .defaultCodecs() - .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON)); - }) - .baseUrl(serverProperties.getUrl()) - .build(); - } - - @SneakyThrows - private List getArbeidsforholdHistorikkResponse(Arbeidsforhold arbeidsforhold, LocalDate kalendermaaned, Integer count) { - var dto = arbeidsforhold.toSyntrestDTO(kalendermaaned, count); - try { - var accessToken = tokenExchange.exchange(serverProperties).block(); - return new GenerateArbeidsforholdHistorikkCommand(webClient, dto, accessToken.getTokenValue()).call(); - } catch (WebClientResponseException.InternalServerError e) { - throw new SyntetiseringException(OPPRETTELSE_FEILMELDING + objectMapper.writeValueAsString(dto), e); - } - } - - @SneakyThrows - public List getArbeidsforholdHistorikk( - Arbeidsforhold arbeidsforhold, - LocalDate kalendermaaned, - Integer count, - boolean retry - ) { - log.info("Finner arbeidsforhold historikk fra og med {}.", kalendermaaned.plusMonths(1)); - List response = getArbeidsforholdHistorikkResponse(arbeidsforhold, kalendermaaned, count); - - if (response.isEmpty()) { - if (retry) { - log.info("Fant ikke historikk. Prøver på nytt."); - return getArbeidsforholdHistorikk(arbeidsforhold, kalendermaaned, count, false); - } else { - throw new SyntetiseringException(OPPRETTELSE_FEILMELDING + "empty response."); - } - } - - log.info("Fant historikk for {} måneder.", response.size()); - - var list = response.stream().map(res -> new Arbeidsforhold( - res, - arbeidsforhold.getIdent(), - arbeidsforhold.getArbeidsforholdId(), - arbeidsforhold.getVirksomhetsnummer()) - ).toList(); - - list.stream() - .filter(value -> value.getSluttdato() != null) - .filter(value -> value.getStartdato().isAfter(value.getSluttdato())) - .forEach(value -> log.warn("Sluttdato er før start dato (ident={}).", value.getIdent())); - return list; - } - - public Arbeidsforhold getFirstArbeidsforhold(LocalDate startdato, String ident, String virksomhetsnummer) { - try { - log.info("Oppretter nytt arbeidsforhold den {}.", startdato); - var accessToken = tokenExchange.exchange(serverProperties).block(); - ArbeidsforholdResponse response = new GenerateStartArbeidsforholdCommand(webClient, startdato, accessToken.getTokenValue()).call(); - log.trace("Nytt arbeidsforhold av type: {}.", response.getArbeidsforholdType()); - return new Arbeidsforhold(response, ident, virksomhetsnummer); - } catch (WebClientResponseException.InternalServerError e) { - throw new SyntetiseringException("Feil med start av arbeidsforhold for dato: " + startdato, e); - } - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateArbeidsforholdHistorikkCommand.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateArbeidsforholdHistorikkCommand.java deleted file mode 100644 index b4f1da8907b..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateArbeidsforholdHistorikkCommand.java +++ /dev/null @@ -1,45 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.commands.utils.WebClientFilter; -import no.nav.testnav.libs.dto.syntrest.v1.ArbeidsforholdRequest; -import no.nav.testnav.libs.dto.syntrest.v1.ArbeidsforholdResponse; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; -import reactor.util.retry.Retry; - -import java.time.Duration; -import java.util.List; -import java.util.concurrent.Callable; - -@Slf4j -@RequiredArgsConstructor -public class GenerateArbeidsforholdHistorikkCommand implements Callable> { - - private final WebClient webClient; - private final ArbeidsforholdRequest arbeidsforholdDTO; - private final String token; - - @Override - public List call() { - log.info("Genererer arbeidsforhold historikk."); - - return webClient - .post() - .uri("/api/v1/arbeidsforhold") - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .body(BodyInserters.fromPublisher(Mono.just(arbeidsforholdDTO), ArbeidsforholdRequest.class)) - .retrieve() - .bodyToMono(new ParameterizedTypeReference>() { - }) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)) - .block(); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateStartArbeidsforholdCommand.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateStartArbeidsforholdCommand.java deleted file mode 100644 index 328c8e4f864..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GenerateStartArbeidsforholdCommand.java +++ /dev/null @@ -1,57 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.commands.utils.WebClientFilter; -import no.nav.testnav.libs.dto.syntrest.v1.ArbeidsforholdResponse; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.reactive.function.client.WebClientResponseException; -import reactor.core.publisher.Mono; -import reactor.util.retry.Retry; - -import java.time.Duration; -import java.time.LocalDate; -import java.util.concurrent.Callable; - -@Slf4j -@RequiredArgsConstructor -public class GenerateStartArbeidsforholdCommand implements Callable { - private final WebClient webClient; - private final LocalDate startdate; - private final String token; - - @Override - public ArbeidsforholdResponse call() { - log.info("Generer nytt arbeidsforhold."); - - try { - ArbeidsforholdResponse[] array = webClient - .post() - .uri("/api/v1/arbeidsforhold/start") - .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .body(BodyInserters.fromPublisher(Mono.just(new LocalDate[]{startdate}), LocalDate[].class)) - .retrieve() - .bodyToMono(ArbeidsforholdResponse[].class) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)) - .block(); - - if (array == null || array.length < 1) { - throw new RuntimeException("Fikk ikke generert start arbeidsforhold for dato " + startdate.toString()); - } - - return array[0]; - } catch (WebClientResponseException e) { - log.error( - "Feil ved henting av start arbeidsforhold på dato {}. Feilmelding: {}", - startdate, - e.getResponseBodyAsString() - ); - throw e; - } - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetLevendeIdenterCommand.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetLevendeIdenterCommand.java deleted file mode 100644 index bab0b476ada..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetLevendeIdenterCommand.java +++ /dev/null @@ -1,42 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.commands.utils.WebClientFilter; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; -import reactor.util.retry.Retry; - -import java.time.Duration; -import java.util.concurrent.Callable; - -@Slf4j -@RequiredArgsConstructor -public class GetLevendeIdenterCommand implements Callable> { - private final WebClient webClient; - private final String miljo; - private final int max; - private final String token; - - @Override - public Flux call() { - log.info("Henter {} identer i {}...", max, miljo); - return webClient - .get() - .uri(builder -> builder - .path("/api/v2/levende-identer/100000883") - .queryParam("miljoe", miljo) - .queryParam("max", max) - .queryParam("minimumAlder", 18) - .build() - ) - .header("Authorization", "Bearer " + token) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .retrieve() - .bodyToFlux(String.class) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetOpplysningspliktigOrgnummerCommand.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetOpplysningspliktigOrgnummerCommand.java deleted file mode 100644 index 4df0ce5327d..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/command/GetOpplysningspliktigOrgnummerCommand.java +++ /dev/null @@ -1,40 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.command; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.commands.utils.WebClientFilter; -import org.springframework.http.HttpHeaders; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.util.retry.Retry; - -import java.time.Duration; -import java.util.Arrays; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.stream.Collectors; - -@Slf4j -@RequiredArgsConstructor -public class GetOpplysningspliktigOrgnummerCommand implements Callable> { - private final WebClient webClient; - private final String accessToken; - private final String miljo; - - @Override - public Set call() { - log.info("Henter alle opplysningspliktige orgnummer i {}...", miljo); - var response = webClient - .get() - .uri("/api/v1/opplysningspliktig") - .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken) - .header("miljo", miljo) - .retrieve() - .bodyToMono(String[].class) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)) - .block(); - log.info("Fant {} opplysningspliktige orgnummer i {}.", response.length, miljo); - return Arrays.stream(response).collect(Collectors.toSet()); - - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/dto/KodeverkDTO.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/dto/KodeverkDTO.java deleted file mode 100644 index 5a5bdbc36ca..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/consumer/dto/KodeverkDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -import java.util.Map; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class KodeverkDTO { - Map betydninger; -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Arbeidsforhold.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Arbeidsforhold.java deleted file mode 100644 index 818f9eb547f..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Arbeidsforhold.java +++ /dev/null @@ -1,251 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; - -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.ArbeidsforholdDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.AvvikDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.FartoeyDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.InntektDTO; -import no.nav.testnav.libs.dto.syntrest.v1.ArbeidsforholdRequest; -import no.nav.testnav.libs.dto.syntrest.v1.ArbeidsforholdResponse; -import no.nav.testnav.libs.dto.syntrest.v1.PermisjonDTO; - -@Slf4j -@AllArgsConstructor -public class Arbeidsforhold { - - private final ArbeidsforholdDTO dto; - private final String ident; - private String virksomhetsnummer; - - public Arbeidsforhold( - ArbeidsforholdResponse response, - String ident, - String arbeidsforholdId, - String virksomhetsnummer - ) { - this.virksomhetsnummer = virksomhetsnummer; - this.ident = ident; - - var permisjoner = Optional.ofNullable(response.getPermisjoner()).orElse(Collections.emptyList()) - .stream() - .map(dto -> no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.PermisjonDTO - .builder() - .permisjonId(UUID.randomUUID().toString()) - .beskrivelse(dto.getBeskrivelse()) - .permisjonsprosent(Float.parseFloat(dto.getPermisjonsprosent())) - .sluttdato(dto.getSluttdato()) - .startdato(dto.getStartdato()) - .avvik(getAvvik(dto.getAvvik())) - .build() - ).collect(Collectors.toList()); - - var inntekter = Optional.ofNullable(response.getInntekter()) - .orElse(Collections.emptyList()) - .stream() - .map(inntekt -> InntektDTO - .builder() - .startdatoOpptjeningsperiode(inntekt.getStartdatoOpptjeningsperiode()) - .sluttdatoOpptjeningsperiode(inntekt.getSluttdatoOpptjeningsperiode()) - .opptjeningsland(inntekt.getOpptjeningsland()) - .antall(inntekt.getAntall()) - .avvik(getAvvik(inntekt.getAvvik())) - .build() - ).collect(Collectors.toList()); - - if (!permisjoner.isEmpty()) { - log.trace("Permisjoner registert på arbeidsforhold id {}.", arbeidsforholdId); - } - - this.dto = ArbeidsforholdDTO - .builder() - .typeArbeidsforhold(emptyToNull(response.getArbeidsforholdType())) - .antallTimerPerUke(emptyToNull(response.getAntallTimerPerUkeSomEnFullStillingTilsvarer())) - .arbeidstidsordning(emptyToNull(response.getArbeidstidsordning())) - .sisteLoennsendringsdato(response.getSisteDatoForStillingsprosentendring()) - .stillingsprosent(emptyToNull(response.getStillingsprosent())) - .yrke(emptyToNull(response.getYrke())) - .startdato(response.getStartdato()) - .sluttdato(response.getSluttdato().equals("") ? null : LocalDate.parse(response.getSluttdato())) - .arbeidsforholdId(arbeidsforholdId) - .permisjoner(permisjoner) - .historikk(response.getHistorikk()) - .fartoey(response.getFartoey() != null ? FartoeyDTO.builder() - .fartsomraade(response.getFartoey().getFartsomraade()) - .skipsregister(response.getFartoey().getSkipsregister()) - .skipstype(response.getFartoey().getSkipstype()) - .build() : null - ) - .inntekter(inntekter) - .avvik(getAvvik(response.getAvvik())) - .build(); - } - - private List getAvvik(no.nav.testnav.libs.dto.syntrest.v1.AvvikDTO avvik) { - return avvik != null ? Collections.singletonList(AvvikDTO.builder() - .id(avvik.getId()) - .alvorlighetsgrad(avvik.getAlvorlighetsgrad()) - .navn(avvik.getNavn()) - .build() - ) : Collections.emptyList(); - } - - public boolean isForenklet() { - return dto.getTypeArbeidsforhold().equals("forenkletOppgjoersordning"); - } - - public Arbeidsforhold(ArbeidsforholdResponse response, String ident, String virksomhetsnummer) { - this(response, ident, UUID.randomUUID().toString(), virksomhetsnummer); - } - - public String getVirksomhetsnummer() { - return virksomhetsnummer; - } - - public void setVirksomhetsnummer(String virksomhetsnummer) { - this.virksomhetsnummer = virksomhetsnummer; - } - - public String getIdent() { - return ident; - } - - public ArbeidsforholdDTO toDTO() { - return dto; - } - - public String getArbeidsforholdId() { - return dto.getArbeidsforholdId(); - } - - public LocalDate getSluttdato() { - return dto.getSluttdato(); - } - - public LocalDate getStartdato() { - return dto.getStartdato(); - } - - public ArbeidsforholdRequest toSyntrestDTO(LocalDate kaldermaaned, Integer count) { - float velferdspermisjon = 0; - float utdanningspermisjon = 0; - float permisjonMedForeldrepenger = 0; - float permisjonVedMilitaertjeneste = 0; - float permisjon = 0; - float permittering = 0; - - for (var permisjonDTO : dto.getPermisjoner()) { - switch (permisjonDTO.getBeskrivelse()) { - case "velferdspermisjon": - velferdspermisjon++; - break; - case "utdanningspermisjon": - utdanningspermisjon++; - break; - case "permisjonMedForeldrepenger": - permisjonMedForeldrepenger++; - break; - case "permisjonVedMilitaertjeneste": - permisjonVedMilitaertjeneste++; - break; - case "permisjon": - permisjon++; - break; - case "permittering": - permittering++; - break; - default: - log.warn("Ukjent permisjons beskrivelse {}", permisjonDTO.getBeskrivelse()); - break; - } - } - - return ArbeidsforholdRequest - .builder() - .antallTimerPerUkeSomEnFullStillingTilsvarer(nullToEmpty(dto.getAntallTimerPerUke())) - .arbeidsforholdType(nullToEmpty(dto.getTypeArbeidsforhold())) - .arbeidstidsordning(nullToEmpty(dto.getArbeidstidsordning())) - .permisjon(permisjon) - .permisjonMedForeldrepenger(permisjonMedForeldrepenger) - .permisjonVedMilitaertjeneste(permisjonVedMilitaertjeneste) - .permittering(permittering) - .rapporteringsmaaned(formatKaldenermaand(kaldermaaned)) - .sisteDatoForStillingsprosentendring(kaldermaaned) - .sisteLoennsendringsdato(dto.getSisteLoennsendringsdato()) - .sluttdato(format(dto.getSluttdato())) - .startdato(dto.getStartdato()) - .stillingsprosent(nullToEmpty(dto.getStillingsprosent())) - .utdanningspermisjon(utdanningspermisjon) - .yrke(nullToEmpty(dto.getYrke())) - .velferdspermisjon(velferdspermisjon) - .historikk(dto.getHistorikk()) - .numEndringer(count) - .fartoey(dto.getFartoey() != null ? no.nav.testnav.libs.dto.syntrest.v1.FartoeyDTO - .builder() - .fartsomraade(dto.getFartoey().getFartsomraade()) - .skipsregister(dto.getFartoey().getSkipsregister()) - .skipstype(dto.getFartoey().getSkipstype()) - .build() - : null - ) - .permisjoner(dto.getPermisjoner().stream().map(value -> new PermisjonDTO( - value.getBeskrivelse(), - value.getPermisjonsprosent() != null ? value.getPermisjonsprosent().toString() : null, - value.getStartdato(), - value.getSluttdato(), - getAvvik(value.getAvvik()) - )).collect(Collectors.toList())) - .inntekter(dto.getInntekter().stream().map(value -> no.nav.testnav.libs.dto.syntrest.v1.InntektDTO - .builder() - .antall(value.getAntall()) - .opptjeningsland(value.getOpptjeningsland()) - .startdatoOpptjeningsperiode(value.getStartdatoOpptjeningsperiode()) - .sluttdatoOpptjeningsperiode(value.getSluttdatoOpptjeningsperiode()) - .avvik(getAvvik(value.getAvvik())) - .build() - ).collect(Collectors.toList())) - .antallInntekter(dto.getInntekter().size()) - .avvik(getAvvik(dto.getAvvik())) - .build(); - } - - private no.nav.testnav.libs.dto.syntrest.v1.AvvikDTO getAvvik(List list) { - return list.stream().findFirst().map(avvik -> no.nav.testnav.libs.dto.syntrest.v1.AvvikDTO.builder().alvorlighetsgrad(avvik.getAlvorlighetsgrad()).navn(avvik.getNavn()).id(avvik.getId()).build()).orElse(null); - } - - private Float nullToEmpty(Float value) { - return value == null ? 0f : value; - } - - private String nullToEmpty(String value) { - return value == null ? "" : value; - } - - private String emptyToNull(String value) { - return value == null ? null : value.equals("") ? null : value; - } - - private Float emptyToNull(Float value) { - return value == 0f ? null : value; - } - - private String formatKaldenermaand(LocalDate value) { - return value.format(DateTimeFormatter.ofPattern("yyyy-MM")); - } - - private String format(LocalDate value) { - if (value == null) { - return ""; - } - return value.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/ArbeidsforholdMap.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/ArbeidsforholdMap.java deleted file mode 100644 index 2f3195375ae..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/ArbeidsforholdMap.java +++ /dev/null @@ -1,36 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain; - -import java.time.LocalDate; -import java.util.Map; -import java.util.Optional; - - -public class ArbeidsforholdMap { - private final String ident; - private final Map map; - - public ArbeidsforholdMap(String ident, Map map) { - this.ident = ident; - this.map = map; - } - - public boolean isNewArbeidsforhold(LocalDate date) { - var arbeidsforhold = getArbeidsforhold(date); - return arbeidsforhold.getStartdato().getMonthValue() == date.getMonthValue() - && arbeidsforhold.getStartdato().getYear() == date.getYear(); - } - - public Arbeidsforhold getArbeidsforhold(LocalDate date) { - return Optional.ofNullable(map.get(date)) - .orElseThrow(() -> new RuntimeException("Finner ikke arbeidsforhold for dato=" + date)); - } - - public boolean contains(LocalDate date) { - return Optional.ofNullable(map.get(date)).isPresent(); - } - - - public String getIdent() { - return ident; - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Opplysningspliktig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Opplysningspliktig.java deleted file mode 100644 index 2e523e0445d..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Opplysningspliktig.java +++ /dev/null @@ -1,135 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.stream.Collectors; - -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.ArbeidsforholdDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.OppsummeringsdokumentDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.PersonDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.VirksomhetDTO; - -@Slf4j -@RequiredArgsConstructor -public class Opplysningspliktig { - private static final Random RANDOM = new Random(); - private final OppsummeringsdokumentDTO dto; - private final List driverVirksomheter; - private boolean changed = false; - - public Opplysningspliktig(Organisajon organisajon, LocalDate kalendermaand) { - driverVirksomheter = organisajon.getDriverVirksomheter(); - dto = OppsummeringsdokumentDTO - .builder() - .version(1L) - .kalendermaaned(kalendermaand) - .opplysningspliktigOrganisajonsnummer(organisajon.getOrgnummer()) - .virksomheter(new ArrayList<>()) - .build(); - } - - public String getRandomVirksomhetsnummer() { - return driverVirksomheter.get(RANDOM.nextInt(driverVirksomheter.size())); - } - - public boolean driverVirksomhet(String virksomhetesnummer) { - return driverVirksomheter.stream().anyMatch(value -> value.equals(virksomhetesnummer)); - } - - - public List getDriverVirksomheter() { - return dto.getVirksomheter(); - } - - public void addArbeidsforhold(Arbeidsforhold arbeidsforhold) { - - if (arbeidsforhold.getVirksomhetsnummer() == null) { - arbeidsforhold.setVirksomhetsnummer(getRandomVirksomhetsnummer()); - } - - - changed = true; - String virksomhetsnummer = arbeidsforhold.getVirksomhetsnummer(); - VirksomhetDTO virksomhet = dto.getVirksomheter() - .stream() - .filter(value -> value.getOrganisajonsnummer().equals(virksomhetsnummer)) - .findFirst().orElseGet(() -> { - VirksomhetDTO virksomhetDTO = new VirksomhetDTO(virksomhetsnummer, new ArrayList<>()); - dto.getVirksomheter().add(virksomhetDTO); - return virksomhetDTO; - }); - - Optional optional = virksomhet.getPersoner() - .stream() - .filter(value -> value.getIdent().equals(arbeidsforhold.getIdent())) - .findFirst(); - - if (optional.isEmpty()) { - virksomhet.getPersoner().add(new PersonDTO(arbeidsforhold.getIdent(), Collections.singletonList( - arbeidsforhold.toDTO() - ))); - } else { - PersonDTO personDTO = optional.get(); - Optional tidligereArbeidsforhold = personDTO.getArbeidsforhold() - .stream() - .filter(arbeidsforholdDTO -> arbeidsforholdDTO.getArbeidsforholdId().equals(arbeidsforhold.getArbeidsforholdId())) - .findFirst(); - - List list = new ArrayList<>(personDTO.getArbeidsforhold()); - if (tidligereArbeidsforhold.isPresent()) { - ArbeidsforholdDTO dto = tidligereArbeidsforhold.get(); - log.info("Fjerner tidligere arbeidsforhold {}", dto.getArbeidsforholdId()); - list.remove(dto); - } - - list.add(arbeidsforhold.toDTO()); - personDTO.setArbeidsforhold(list); - } - } - - public List getArbeidsforhold() { - return dto.getVirksomheter().stream().flatMap( - virksomhet -> virksomhet.getPersoner().stream().flatMap( - person -> person.getArbeidsforhold().stream().map( - arbeidsforhold -> new Arbeidsforhold(arbeidsforhold, person.getIdent(), virksomhet.getOrganisajonsnummer()) - ) - ) - ).collect(Collectors.toList()); - } - - public String getOrgnummer() { - return dto.getOpplysningspliktigOrganisajonsnummer(); - } - - public LocalDate getKalendermaaned() { - return dto.getKalendermaaned(); - } - - public void setKalendermaaned(LocalDate kalendermaaned) { - dto.setKalendermaaned(kalendermaaned); - } - - public void setVersion(Long version) { - dto.setVersion(version); - } - - public Long getVersion() { - return dto.getVersion() == null ? 0 : dto.getVersion(); - } - - public OppsummeringsdokumentDTO toDTO() { - return dto; - } - - public boolean isChanged() { - return changed; - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Organisajon.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Organisajon.java deleted file mode 100644 index a04876d06e7..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/domain/Organisajon.java +++ /dev/null @@ -1,38 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain; - -import no.nav.testnav.libs.dto.organisasjon.v1.OrganisasjonDTO; - -import java.util.List; -import java.util.Random; - -public class Organisajon { - private static final Random RANDOM = new Random(); - private OrganisasjonDTO dto; - - public Organisajon(OrganisasjonDTO dto) { - this.dto = dto; - } - - public String getOrgnummer() { - return dto.getOrgnummer(); - } - - public boolean isDriverVirksomheter() { - return !dto.getDriverVirksomheter().isEmpty(); - } - - public String getRandomVirksomhetsnummer() { - return dto.getDriverVirksomheter().get(RANDOM.nextInt(dto.getDriverVirksomheter().size())); - } - - public List getDriverVirksomheter() { - return dto.getDriverVirksomheter(); - } - - public boolean isOpplysningspliktig() { - return switch (dto.getEnhetType()) { - case "AS", "NUF", "BRL", "KBO", "SA", "ENK" -> true; - default -> false; - }; - } -} \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/exception/SyntetiseringException.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/exception/SyntetiseringException.java deleted file mode 100644 index 555459683c0..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/exception/SyntetiseringException.java +++ /dev/null @@ -1,12 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.exception; - -public class SyntetiseringException extends RuntimeException { - - public SyntetiseringException(String message, Throwable cause) { - super(message, cause); - } - - public SyntetiseringException(String message) { - super(message); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/IdentController.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/IdentController.java deleted file mode 100644 index ef478efe43b..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/IdentController.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.provider; - -import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Set; - -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.service.IdentService; - -@RestController -@RequiredArgsConstructor -@RequestMapping("api/v1/identer") -public class IdentController { - private final IdentService identService; - - @GetMapping - public ResponseEntity> get(@RequestHeader("miljo") String miljo) { - var identerMedArbeidsforhold = identService.getIdenterMedArbeidsforhold(miljo); - return ResponseEntity - .ok() - .header("COUNT", String.valueOf(identerMedArbeidsforhold.size())) - .body(identerMedArbeidsforhold); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/OpplysningspliktigController.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/OpplysningspliktigController.java deleted file mode 100644 index 5d1b4cdf973..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/provider/OpplysningspliktigController.java +++ /dev/null @@ -1,51 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.provider; - -import lombok.RequiredArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDate; -import java.util.List; - -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.service.ArbeidsforholdHistorikkService; - -@RestController -@RequiredArgsConstructor -@RequestMapping("api/v1/opplysningspliktig") -public class OpplysningspliktigController { - - private final ArbeidsforholdHistorikkService arbeidsforholdHistorikkService; - - @PostMapping("/populate") - public ResponseEntity> populate( - @RequestHeader("miljo") String miljo, - @RequestParam("maxIdenter") Integer maxIdenter, - @RequestParam("fom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fom, - @RequestParam("tom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate tom - ) { - var identer = arbeidsforholdHistorikkService.populate(fom, tom, maxIdenter, miljo); - - if (identer.isEmpty()) { - return ResponseEntity.noContent().build(); - } - - return ResponseEntity.ok(identer); - } - - @PostMapping("/develop") - public ResponseEntity develop( - @RequestHeader("miljo") String miljo, - @RequestParam("fom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fom, - @RequestParam("tom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate tom - ) { - arbeidsforholdHistorikkService.develop(fom, tom, miljo); - return ResponseEntity.noContent().build(); - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdHistorikkService.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdHistorikkService.java deleted file mode 100644 index 029e40d28fe..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdHistorikkService.java +++ /dev/null @@ -1,296 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Arbeidsforhold; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.ArbeidsforholdMap; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Opplysningspliktig; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Organisajon; -import org.springframework.stereotype.Service; -import reactor.core.publisher.Flux; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.Period; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import java.util.concurrent.TimeUnit; - -@Slf4j -@Service -@RequiredArgsConstructor -public class ArbeidsforholdHistorikkService { - private final Executor executor; - private final IdentService identService; - private final OpplysningspliktigService opplysningspliktigService; - private final ArbeidsforholdSyntService arbeidsforholdSyntService; - - public List populate(LocalDate fom, LocalDate tom, int maxIdenter, String miljo) { - var startTimeStamp = LocalDateTime.now(); - log.info("Starter syntetisering ({}).", startTimeStamp); - - var dates = findAllDatesBetween(fom, tom); - var identer = identService.getIdenterUtenArbeidsforhold(miljo, maxIdenter); - - log.info("Syntentiser for person(er) mellom {} - {}...", fom, tom); - var arbeidsforholdMapList = getArbeidsforholdMapList(identer, dates, miljo); - - if (arbeidsforholdMapList.isEmpty()) { - log.warn("Fikk ikke opprettet syntetisk arbeidsforhold. Avslutter syntetisering..."); - return Collections.emptyList(); - } - - for (var kalenermnd : dates) { - report(arbeidsforholdMapList, kalenermnd, miljo); - } - log.info("Syntetisering ferdig for {} person(er) ({} - {}).", - arbeidsforholdMapList.size(), - startTimeStamp, - LocalDateTime.now() - ); - return arbeidsforholdMapList.stream().map(ArbeidsforholdMap::getIdent) - .toList(); - } - - public void develop(LocalDate fom, LocalDate tom, String miljo) { - var startTimeStamp = LocalDateTime.now(); - log.info("Starter utvikling av populasjon ({}).", startTimeStamp); - - developArbeidsforhold(findAllDatesBetween(fom, tom), miljo).forEach((kalenermnd, list) -> { - var opplysningspliktigList = opplysningspliktigService.getAllOpplysningspliktig(kalenermnd, miljo); - list.forEach(arbeidsforhold -> { - var opplysningspliktig = findOpplysningspliktigForVirksomhet(arbeidsforhold.getVirksomhetsnummer(), opplysningspliktigList); - opplysningspliktig.addArbeidsforhold(arbeidsforhold); - }); - opplysningspliktigService.send(opplysningspliktigList, miljo); - }); - - log.info("Utvikling av populasjon ferdig ({} - {}).", - startTimeStamp, - LocalDateTime.now() - ); - } - - private Map> developArbeidsforhold(Set dates, String miljo) { - var map = new HashMap>(); - var kalenermnd = dates.stream().findFirst(); - - if (kalenermnd.isEmpty()) { - log.warn("Kalenermnd finnes ikke. Stopper generering."); - return map; - } - var organisasjoner = opplysningspliktigService.getOpplysningspliktigeOrganisasjoner(miljo); - var opplysningspliktigList = opplysningspliktigService.getAllOpplysningspliktig(kalenermnd.get().minusMonths(1), miljo); - - opplysningspliktigList.forEach(opplysningspliktig -> { - var futures = opplysningspliktig.getArbeidsforhold() - .stream() - .map(arbeidsforhold -> futureMap(dates.iterator(), arbeidsforhold, organisasjoner)) - .toList(); - - for (var future : futures) { - try { - future.get().forEach((key, value) -> { - if (map.containsKey(key)) { - map.get(key).add(value); - } else { - var list = new ArrayList(); - list.add(value); - map.put(key, list); - } - }); - } catch (Exception e) { - log.error("Feil med utvikling av populasjon.", e); - } - } - }); - return map; - } - - private Map develop(Iterator dates, Arbeidsforhold previous, List organisajoner) { - var map = new HashMap(); - Iterator historikk = Collections.emptyIterator(); - - if (!dates.hasNext()) { - return map; - } - - while (dates.hasNext()) { - LocalDate kalendermaaned = dates.next(); - log.info("Generer for {} den {}.", previous.getIdent(), kalendermaaned); - - boolean isNewArbeidsforhold = previous.getSluttdato() != null - && previous.getSluttdato().getMonth() == kalendermaaned.minusMonths(1).getMonth() - && previous.getSluttdato().getYear() == kalendermaaned.minusMonths(1).getYear(); - - if (previous.getSluttdato() != null) { - log.info("Sluttdato er satt til {} og neste mnd er {}.", - previous.getSluttdato(), - kalendermaaned - ); - } - - if (isNewArbeidsforhold || previous.getSluttdato() != null && previous.getSluttdato().isBefore(kalendermaaned) || previous.isForenklet()) { - log.info("Genererer nytt arbeidsforhold for {} den {}.", previous.getIdent(), kalendermaaned); - Arbeidsforhold next = arbeidsforholdSyntService.getFirstArbeidsforhold(organisajoner, kalendermaaned, previous.getIdent()); - historikk = Collections.emptyIterator(); - map.put(kalendermaaned, next); - previous = next; - } else { - if (!historikk.hasNext()) { - historikk = arbeidsforholdSyntService.getArbeidsforholdHistorikk(previous, kalendermaaned.minusMonths(1), null).iterator(); - if (!historikk.hasNext()) { - log.warn("Forsetter ikke pa arbeidsforhold da historikk ikke finnes for {}.", previous.getIdent()); - return map; - } - } - var next = historikk.next(); - map.put(kalendermaaned, next); - previous = next; - } - } - log.info("Syntetisk historikk generert for {}.", previous.getIdent()); - return map; - } - - private Map createArbeidsforholdHistorikk(final String ident, Iterator dates, List organisajoner) { - var map = new HashMap(); - var startdato = dates.next(); - log.info("Generer for {} den {}.", ident, startdato); - var first = arbeidsforholdSyntService.getFirstArbeidsforhold(organisajoner, startdato, ident); - map.put(startdato, first); - - if (!dates.hasNext()) { - return map; - } - - if (first.isForenklet()) { - map.putAll(createArbeidsforholdHistorikk(ident, dates, organisajoner)); - return map; - } - - - var previous = first; - var historikk = arbeidsforholdSyntService.getArbeidsforholdHistorikk(previous, startdato, null).iterator(); - - while (dates.hasNext()) { - LocalDate kalendermaaned = dates.next(); - log.info("Generer for {} den {}.", ident, kalendermaaned); - - boolean isNewArbeidsforhold = previous.getSluttdato() != null - && previous.getSluttdato().getMonth() == kalendermaaned.minusMonths(1).getMonth() - && previous.getSluttdato().getYear() == kalendermaaned.minusMonths(1).getYear(); - - if (previous.getSluttdato() != null) { - log.info("Sluttdato er satt til {} og neste mnd er {}.", - previous.getSluttdato(), - kalendermaaned - ); - } - - if (isNewArbeidsforhold || previous.getSluttdato() != null && previous.getSluttdato().isBefore(kalendermaaned)) { - log.info("Genererer nytt arbeidsforhold for {} den {}.", ident, kalendermaaned); - Arbeidsforhold next = arbeidsforholdSyntService.getFirstArbeidsforhold(organisajoner, kalendermaaned, ident); - historikk = Collections.emptyIterator(); - map.put(kalendermaaned, next); - previous = next; - } else { - if (!historikk.hasNext()) { - historikk = arbeidsforholdSyntService.getArbeidsforholdHistorikk(previous, kalendermaaned.minusMonths(1), null).iterator(); - if (!historikk.hasNext()) { - log.warn("Forsetter ikke pa arbeidsforhold da historikk ikke finnes for {}.", ident); - return map; - } - } - var next = historikk.next(); - map.put(kalendermaaned, next); - previous = next; - } - } - log.info("Syntetisk historikk generert for {}.", ident); - return map; - } - - private CompletableFuture> futureMap(Iterator dates, Arbeidsforhold previous, List organisajoner) { - return CompletableFuture.supplyAsync(() -> develop(dates, previous, organisajoner), executor); - } - - private CompletableFuture futureMap(final String ident, Set dates, List organisajoner) { - return CompletableFuture.supplyAsync( - () -> createArbeidsforholdHistorikk(ident, dates.iterator(), organisajoner), executor - ).thenApply(map -> new ArbeidsforholdMap(ident, map)); - } - - private List getArbeidsforholdMapList(Flux identer, Set dates, String miljo) { - var organisasjoner = opplysningspliktigService.getOpplysningspliktigeOrganisasjoner(miljo); - - var futures = identer.map(ident -> futureMap(ident, dates, organisasjoner)).collectList().block(); - - var list = new ArrayList(); - - for (int index = 0; index < futures.size(); index++) { - try { - var map = futures.get(index).get(12, TimeUnit.MINUTES); - log.info("{}/{} arbeidsforhold historikk generert.", index + 1, futures.size()); - list.add(map); - } catch (Exception e) { - log.error("Feil ved generering av syntetisk historikk. Fortsetter uten.", e); - } - } - - if (list.isEmpty()) { - log.warn("Fikk ikke syntentisert {} identer pga tidligere feil.", futures.size()); - } else if (futures.size() > list.size()) { - log.warn("Syntetiserer bare {}/{} personer pga tidligere feil.", list.size(), futures.size()); - } - return list; - } - - private void report(List arbeidsforholdMapList, LocalDate kalenermnd, String miljo) { - var opplysningspliktige = opplysningspliktigService.getAllOpplysningspliktig(kalenermnd, miljo); - for (var arbeidsforholdMap : arbeidsforholdMapList) { - var arbeidsforhold = arbeidsforholdMap.getArbeidsforhold(kalenermnd); - log.trace("Legger til arbeidsforhold for {} den {}.", arbeidsforhold.getIdent(), kalenermnd); - - var opplysningspliktig = findOpplysningspliktigForVirksomhet(arbeidsforhold.getVirksomhetsnummer(), opplysningspliktige); - opplysningspliktig.addArbeidsforhold(arbeidsforhold); - } - opplysningspliktigService.send(opplysningspliktige, miljo); - } - - - private Opplysningspliktig findOpplysningspliktigForVirksomhet(String virksomhetsnummer, List list) { - return list.stream() - .filter(value -> value.driverVirksomhet(virksomhetsnummer)) - .findFirst() - .orElseThrow(() -> new RuntimeException("Finner ikke opplysningspliktig for virksomhetsnummer: " + virksomhetsnummer)); - } - - - private Set findAllDatesBetween(LocalDate fom, LocalDate tom) { - Set dates = new TreeSet<>(); - if (tom == null) { - return dates; - } - Period between = Period.between( - fom.withDayOfMonth(1), - tom.withDayOfMonth(1) - ); - int months = between.getYears() * 12 + between.getMonths(); - for (int index = 0; index <= months; index++) { - dates.add(fom.withDayOfMonth(1).plusMonths(index)); - } - return dates; - } - -} - - diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdSyntService.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdSyntService.java deleted file mode 100644 index 73a73861ac3..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/ArbeidsforholdSyntService.java +++ /dev/null @@ -1,32 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.service; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.SyntAmeldingConsumer; -import org.springframework.stereotype.Service; - -import java.time.LocalDate; -import java.util.List; -import java.util.Random; - -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Arbeidsforhold; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Organisajon; - -@Slf4j -@Service -@RequiredArgsConstructor -public class ArbeidsforholdSyntService { - private final SyntAmeldingConsumer syntAmeldingConsumer; - private final Random random = new Random(); - - public Arbeidsforhold getFirstArbeidsforhold(List organisajoner, LocalDate startdato, String ident) { - var organisajon = organisajoner.get(random.nextInt(organisajoner.size())); - return syntAmeldingConsumer.getFirstArbeidsforhold(startdato, ident, organisajon.getRandomVirksomhetsnummer()); - } - - public List getArbeidsforholdHistorikk(Arbeidsforhold arbeidsforhold, LocalDate kalendermaaned, Integer count) { - return syntAmeldingConsumer.getArbeidsforholdHistorikk(arbeidsforhold, kalendermaaned, count, true); - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/IdentService.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/IdentService.java deleted file mode 100644 index 8e26db9425b..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/IdentService.java +++ /dev/null @@ -1,48 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import reactor.core.publisher.Flux; - -import java.util.Collection; -import java.util.Set; -import java.util.stream.Collectors; - -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.PersonDTO; -import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.VirksomhetDTO; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.adapter.TpsIdentAdapter; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.OppsummeringsdokumentConsumer; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Opplysningspliktig; - -@Slf4j -@Service -@RequiredArgsConstructor -public class IdentService { - private final OppsummeringsdokumentConsumer arbeidsforholdConsumer; - private final TpsIdentAdapter tpsIdentAdapter; - - public Set getIdenterMedArbeidsforhold(String miljo) { - var identer = arbeidsforholdConsumer - .getAlleOpplysningspliktig(miljo) - .stream() - .map(Opplysningspliktig::getDriverVirksomheter) - .flatMap(Collection::stream) - .map(VirksomhetDTO::getPersoner) - .flatMap(Collection::stream) - .map(PersonDTO::getIdent) - .collect(Collectors.toSet()); - log.info("Fant {} identer i {}.", identer.size(), miljo); - return identer; - } - - public Flux getIdenterUtenArbeidsforhold(String miljo, int max) { - var identer = tpsIdentAdapter.getIdenter(miljo, max); - - var identerMedArbeidsforhold = getIdenterMedArbeidsforhold(miljo); - - - return identer.filter(ident -> !identerMedArbeidsforhold.contains(ident)); - } - -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/OpplysningspliktigService.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/OpplysningspliktigService.java deleted file mode 100644 index 1d161567bb0..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/service/OpplysningspliktigService.java +++ /dev/null @@ -1,65 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.GenererOrganisasjonPopulasjonConsumer; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.OppsummeringsdokumentConsumer; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.consumer.OrganisasjonConsumer; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Opplysningspliktig; -import no.nav.registre.testnorge.mn.syntarbeidsforholdservice.domain.Organisajon; -import org.springframework.stereotype.Service; - -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -@Slf4j -@Service -@RequiredArgsConstructor -public class OpplysningspliktigService { - private final OppsummeringsdokumentConsumer oppsummeringsdokumentConsumer; - private final OrganisasjonConsumer organisasjonConssumer; - private final GenererOrganisasjonPopulasjonConsumer genererOrganisasjonPopulasjonConsumer; - - public List getOpplysningspliktigeOrganisasjoner(String miljo) { - var opplysningspliktigOrgnummer = genererOrganisasjonPopulasjonConsumer.getOpplysningspliktig(miljo); - return organisasjonConssumer - .getOrganisasjoner(opplysningspliktigOrgnummer, miljo) - .stream() - .filter(value -> !value.getDriverVirksomheter().isEmpty()) - .map(Organisajon::new) - .toList(); - } - - public List getAllOpplysningspliktig(LocalDate kalendermaaned, String miljo) { - var list = getOpplysningspliktigeOrganisasjoner(miljo); - log.info("Fant {} opplysningspliktig i Mini-Norge Ereg.", list.stream().map(Organisajon::getOrgnummer).collect(Collectors.joining(", "))); - return list.stream().map(organisajon -> getOpplysningspliktig(organisajon, kalendermaaned, miljo)).toList(); - } - - public void send(List list, String miljo) { - var opplysningspliktige = list.stream().filter(value -> { - if (!value.isChanged()) { - log.trace( - "Raporter ikke for opplysningspliktig {} siden det ikke er en endring den {}.", - value.getOrgnummer(), - value.getKalendermaaned() - ); - } - return value.isChanged(); - }).toList(); - oppsummeringsdokumentConsumer.sendOpplysningspliktig(opplysningspliktige, miljo); - } - - private Opplysningspliktig getOpplysningspliktig(Organisajon organisajon, LocalDate kalendermaaned, String miljo) { - Optional opplysningspliktig = oppsummeringsdokumentConsumer.getOpplysningspliktig(organisajon, kalendermaaned, miljo); - if (opplysningspliktig.isPresent()) { - Opplysningspliktig temp = opplysningspliktig.get(); - temp.setVersion(temp.getVersion() + 1); - temp.setKalendermaaned(kalendermaaned); - return temp; - } - return new Opplysningspliktig(organisajon, kalendermaaned); - } -} diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/mn-synt-arbeidsforhold-service/src/main/resources/application-dev.yml deleted file mode 100644 index bb9e89e1c87..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,19 +0,0 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} - -spring: - h2: - console: - enabled: true - path: /h2 - flyway: - enabled: true - datasource: - url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8 - username: sa - password: - driverClassName: org.h2.Driver - jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/application-prod.yml b/apps/mn-synt-arbeidsforhold-service/src/main/resources/application-prod.yml deleted file mode 100644 index 07df4f65ed1..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/application-prod.yml +++ /dev/null @@ -1,18 +0,0 @@ -spring: - datasource: - url: jdbc:postgresql://b27dbvl022.preprod.local:5432/mn-synt-arbeidsforhold?useUnicode=yes&characterEncoding=UTF-8 - hikari: - maximum-pool-size: 3 - minimum-idle: 0 - flyway: - locations: classpath:db/migration - enabled: true - jpa: - database: POSTGRESQL - properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQLDialect - -testnorge: - analyse: - enabled: true \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/application.yml b/apps/mn-synt-arbeidsforhold-service/src/main/resources/application.yml deleted file mode 100644 index 4a7ed36822d..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/application.yml +++ /dev/null @@ -1,77 +0,0 @@ -AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b - -consumers: - hodejegeren: - url: https://testnorge-hodejegeren.dev.intern.nav.no - cluster: dev-fss - namespace: dolly - name: testnorge-hodejegeren - synt-amelding: - cluster: dev-gcp - namespace: dolly - name: synthdata-amelding - url: https://synthdata-amelding.dev.intern.nav.no - oppsummeringsdokument-service: - cluster: dev-gcp - namespace: dolly - name: oppsummeringsdokument-service - url: https://oppsummeringsdokument-service.dev.intern.nav.no - testnav-generer-organisasjon-populasjon-service: - cluster: dev-gcp - namespace: dolly - name: testnav-generer-organisasjon-populasjon-service - url: https://testnav-generer-organisasjon-populasjon-service.dev.intern.nav.no - testnav-organisasjon-service: - url: https://testnav-organisasjon-service.dev.intern.nav.no - name: testnav-organisasjon-service - cluster: dev-gcp - namespace: dolly - threads: 7 - -springdoc: - swagger-ui: - disable-swagger-default-url: true - url: /v3/api-docs - -spring: - main: - banner-mode: off - application: - version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle - name: mn-synt-arbeidsforhold-service - desciption: API for å opprette syntetiske arbeidsforhold i mini-norge - security: - oauth2: - resourceserver: - aad: - issuer-uri: ${AAD_ISSUER_URI}/v2.0 - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} - tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-fss:dolly:mn-synt-arbeidsforhold-service - -syntetisering: - endringssannsynlighet: 0.27 - saveHistory: false - -management: - endpoints: - enabled-by-default: true - web: - base-path: /internal - exposure.include: prometheus,heapdump,health - path-mapping: - prometheus: metrics - endpoint: - prometheus.enabled: true - heapdump.enabled: true - prometheus: - metrics: - export: - enabled: true -server: - servlet: - encoding: - charset: UTF-8 diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/bootstrap.yml b/apps/mn-synt-arbeidsforhold-service/src/main/resources/bootstrap.yml deleted file mode 100644 index 632b4a09b40..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,21 +0,0 @@ -spring.cloud.vault: - enabled: true - host: vault.adeo.no - port: 443 - connection-timeout: 15000 - read-timeout: 30000 - application-name: preprod/fss/mn-synt-arbeidsforhold-service - - authentication: TOKEN - - generic: - enabled: true - backend: kv - application-name: preprod/fss/mn-synt-arbeidsforhold-service/dolly - default-context: preprod/fss/mn-synt-arbeidsforhold-service/dolly - database: - enabled: true - role: mn-synt-arbeidsforhold-admin - backend: postgresql/preprod-fss - username-property: spring.datasource.username - password-property: spring.datasource.password diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V1__initial_database.sql b/apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V1__initial_database.sql deleted file mode 100644 index 05b79adc950..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V1__initial_database.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE ARBEIDSFORHOLD_HISTORIKK -( - ARBEIDSFORHOLD_ID VARCHAR(256) PRIMARY KEY, - HISTORIKK TEXT NOT NULL, - CREATED_AT TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, - UPDATED_AT TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -); \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V2__recreate_database.sql b/apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V2__recreate_database.sql deleted file mode 100644 index 1a4267b8be6..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/db/migration/V2__recreate_database.sql +++ /dev/null @@ -1,11 +0,0 @@ -DROP TABLE ARBEIDSFORHOLD_HISTORIKK; - -CREATE TABLE ARBEIDSFORHOLD_HISTORIKK -( - ID SERIAL PRIMARY KEY, - ARBEIDSFORHOLD_ID VARCHAR(256) NOT NULL, - HISTORIKK TEXT, - ENVIRONMENT VARCHAR(16) NOT NULL, - CREATED_AT TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, - UPDATED_AT TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -); \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/mn-synt-arbeidsforhold-service/src/main/resources/logback-spring.xml deleted file mode 100644 index 4b2e23d8032..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - true - 256 - 10280 - 20 - ^sun\.reflect\..*\.invoke - ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke - java\.util\.concurrent\..* - org\.apache\.catalina\..* - org\.apache\.coyote\..* - org\.apache\.tomcat\..* - - - - - - - - - - - - - %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n - - utf8 - - - - - - - - - - \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/ApplicationContextTest.java b/apps/mn-synt-arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/ApplicationContextTest.java deleted file mode 100644 index 51fc00e58b7..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/ApplicationContextTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package no.nav.registre.testnorge.mn.syntarbeidsforholdservice; - - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -class ApplicationContextTest { - - @MockBean - public JwtDecoder jwtDecoder; - - @Test - @SuppressWarnings("java:S2699") - void load_app_context() { - } -} \ No newline at end of file diff --git a/apps/mn-synt-arbeidsforhold-service/src/test/resources/bootstrap.yml b/apps/mn-synt-arbeidsforhold-service/src/test/resources/bootstrap.yml deleted file mode 100644 index 5ae83203461..00000000000 --- a/apps/mn-synt-arbeidsforhold-service/src/test/resources/bootstrap.yml +++ /dev/null @@ -1 +0,0 @@ -spring.cloud.vault.enabled: false diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml index 42c2a6c82e7..6718a4d669a 100644 --- a/apps/oppsummeringsdokument-service/config.yml +++ b/apps/oppsummeringsdokument-service/config.yml @@ -17,8 +17,6 @@ spec: cluster: dev-gcp - application: testnav-oversikt-frontend cluster: dev-gcp - - application: mn-synt-arbeidsforhold-service - cluster: dev-fss - application: testnav-generer-arbeidsforhold-populasjon-service cluster: dev-gcp - application: testnav-amelding-service diff --git a/apps/organisasjon-service/config.yml b/apps/organisasjon-service/config.yml index 768b6451974..ca9c17840a9 100644 --- a/apps/organisasjon-service/config.yml +++ b/apps/organisasjon-service/config.yml @@ -44,8 +44,6 @@ spec: cluster: dev-gcp - application: testnav-generer-arbeidsforhold-populasjon-service cluster: dev-gcp - - application: mn-synt-arbeidsforhold-service - cluster: dev-fss - application: app-1 namespace: plattformsikkerhet cluster: dev-gcp diff --git a/apps/testnorge-statisk-data-forvalter/README.md b/apps/testnorge-statisk-data-forvalter/README.md index 095836cca16..ec6f24d12e6 100644 --- a/apps/testnorge-statisk-data-forvalter/README.md +++ b/apps/testnorge-statisk-data-forvalter/README.md @@ -44,7 +44,7 @@ konverteres til ANSI for å vise korrekte tegn i Excel. For å opprette et nytt domene må en POJO og repository opprettes. Det er sterkt anbefalt å eksponere dette nye domenet i APIet. Nåværende domener belager seg på eksisterende applikasjoner som ikke er direkte tilknyttet fast data. Denne modellen er også -sterkt anbefalt å følge. Disse applikasjonen er ansvarlige for å opprette manglende data og gjøre disse tilgjengelige for søk i hodejegeren. +sterkt anbefalt å følge. Disse applikasjonen er ansvarlige for å opprette manglende data. ## Lokal kjøring diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/hodejegeren/v1/PersondataDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/hodejegeren/v1/PersondataDTO.java deleted file mode 100644 index 8128053b0fa..00000000000 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/hodejegeren/v1/PersondataDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package no.nav.testnav.libs.dto.hodejegeren.v1; - - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class PersondataDTO { - private final String fnr; - private final String fornavn; - private final String mellomnavn; - private final String etternavn; -} diff --git a/proxies/hodejegeren-proxy/Dockerfile b/proxies/hodejegeren-proxy/Dockerfile deleted file mode 100644 index 4a36f93546f..00000000000 --- a/proxies/hodejegeren-proxy/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ghcr.io/navikt/baseimages/temurin:21 -LABEL maintainer="Team Dolly" - -ENV JAVA_OPTS="-Dspring.profiles.active=prod" - -ADD /build/libs/app.jar /app/app.jar - -EXPOSE 8080 diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle deleted file mode 100644 index 4d77d0aee12..00000000000 --- a/proxies/hodejegeren-proxy/build.gradle +++ /dev/null @@ -1,78 +0,0 @@ -plugins { - id 'java' - id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.3" - id "jacoco" -} - -test { - useJUnitPlatform() -} - -jacocoTestReport { - reports { - xml.required = true - } -} - -sonarqube { - properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true - property "sonar.projectKey", "testnav-hodejegeren-proxy" - property "sonar.projectName", "testnav-hodejegeren-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/proxies/hodejegeren-proxy/config.yml b/proxies/hodejegeren-proxy/config.yml deleted file mode 100644 index b5c2463c3ae..00000000000 --- a/proxies/hodejegeren-proxy/config.yml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: "nais.io/v1alpha1" -kind: "Application" -metadata: - name: testnav-hodejegeren-proxy - namespace: dolly - labels: - team: dolly -spec: - image: "{{image}}" - port: 8080 - webproxy: true - tokenx: - enabled: true - azure: - application: - allowAllUsers: true - enabled: true - tenant: nav.no - accessPolicy: - inbound: - rules: - - application: team-dolly-lokal-app - cluster: dev-gcp - - application: dolly-frontend - cluster: dev-gcp - - application: dolly-idporten - cluster: dev-gcp - - application: dolly-frontend-dev - cluster: dev-gcp - - application: testnav-oversikt-frontend - cluster: dev-gcp - - application: testnav-generer-arbeidsforhold-populasjon-service - cluster: dev-gcp - - application: app-1 - namespace: plattformsikkerhet - cluster: dev-gcp - liveness: - path: /internal/isAlive - initialDelay: 4 - periodSeconds: 5 - failureThreshold: 500 - readiness: - path: /internal/isReady - initialDelay: 4 - periodSeconds: 5 - failureThreshold: 500 - replicas: - min: 1 - max: 1 - resources: - requests: - cpu: 200m - memory: 1024Mi - limits: - memory: 2048Mi - ingresses: - - "https://testnav-hodejegeren-proxy.dev-fss-pub.nais.io" \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.jar b/proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a54a..00000000000 --- a/proxies/hodejegeren-proxy/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/proxies/hodejegeren-proxy/gradlew b/proxies/hodejegeren-proxy/gradlew deleted file mode 100755 index 3da45c161b0..00000000000 --- a/proxies/hodejegeren-proxy/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright ? 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?, -# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?; -# * compound commands having a testable exit status, especially ?case?; -# * various built-in commands including ?command?, ?set?, and ?ulimit?. -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/proxies/hodejegeren-proxy/gradlew.bat b/proxies/hodejegeren-proxy/gradlew.bat deleted file mode 100644 index ac1b06f9382..00000000000 --- a/proxies/hodejegeren-proxy/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/proxies/hodejegeren-proxy/gradlewUpdate.sh b/proxies/hodejegeren-proxy/gradlewUpdate.sh deleted file mode 100755 index e5ee6361152..00000000000 --- a/proxies/hodejegeren-proxy/gradlewUpdate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gradle wrapper \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/settings.gradle b/proxies/hodejegeren-proxy/settings.gradle deleted file mode 100644 index 1f08f4cc82f..00000000000 --- a/proxies/hodejegeren-proxy/settings.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id "com.gradle.enterprise" version "3.12.3" -} - -rootProject.name = 'hodejegeren-proxy' - -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-core' -includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/reactive-security' - -gradleEnterprise { - buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" - } -} diff --git a/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/Consumers.java b/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/Consumers.java deleted file mode 100644 index c40eb42303a..00000000000 --- a/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/Consumers.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.testnav.proxies.hodejegerenproxy; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -import static lombok.AccessLevel.PACKAGE; - -/** - * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}. - *

- * Husk at Spring Boot bruker relaxed binding - * mellom configuration properties og field names. - * - * @see ServerProperties - */ -@Configuration -@ConfigurationProperties(prefix = "consumers") -@NoArgsConstructor(access = PACKAGE) -@Getter -@Setter(PACKAGE) -public class Consumers { - - private ServerProperties hodejegeren; - -} diff --git a/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java b/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java deleted file mode 100644 index f31c5937b44..00000000000 --- a/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java +++ /dev/null @@ -1,51 +0,0 @@ -package no.nav.testnav.proxies.hodejegerenproxy; - -import no.nav.testnav.libs.reactivecore.config.CoreConfig; -import no.nav.testnav.libs.reactiveproxy.config.DevConfig; -import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig; -import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory; -import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.reactivesecurity.exchange.azuread.NavAzureAdTokenService; -import no.nav.testnav.libs.securitycore.domain.AccessToken; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.gateway.route.RouteLocator; -import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; - - -@Import({ - CoreConfig.class, - DevConfig.class, - SecurityConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) -@SpringBootApplication -public class HodejegerenProxyApplicationStarter { - - public static void main(String[] args) { - SpringApplication.run(HodejegerenProxyApplicationStarter.class, args); - } - - @Bean - public RouteLocator customRouteLocator( - RouteLocatorBuilder builder, - NavAzureAdTokenService tokenService, - Consumers consumers - ) { - var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory - .bearerAuthenticationHeaderFilter( - () -> tokenService - .exchange(consumers.getHodejegeren()) - .map(AccessToken::getTokenValue)); - return builder - .routes() - .route( - spec -> spec - .path("/api/**") - .filters(filterSpec -> filterSpec.filter(addAuthenticationHeaderDevFilter)) - .uri(consumers.getHodejegeren().getUrl())) - .build(); - } -} \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/src/main/resources/application-dev.yml b/proxies/hodejegeren-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index a1cf247e4df..00000000000 --- a/proxies/hodejegeren-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,2 +0,0 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/src/main/resources/application.yml b/proxies/hodejegeren-proxy/src/main/resources/application.yml deleted file mode 100644 index 9ecf1d53197..00000000000 --- a/proxies/hodejegeren-proxy/src/main/resources/application.yml +++ /dev/null @@ -1,28 +0,0 @@ -AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b - -spring: - application: - name: testnav-hodejegeren-proxy - desciption: Proxy for hodejegern som legger på sikkerhet og redirecter. - security: - oauth2: - resourceserver: - aad: - issuer-uri: ${AAD_ISSUER_URI}/v2.0 - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} - tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: ${TOKEN_X_CLIENT_ID} - cloud: - gateway: - httpclient: - response-timeout: 30s - -consumers: - hodejegeren: - name: testnorge-hodejegeren - namespace: dolly - url: http://testnorge-hodejegeren.dolly.svc.nais.local - cluster: dev-fss diff --git a/proxies/hodejegeren-proxy/src/main/resources/bootstrap.yml b/proxies/hodejegeren-proxy/src/main/resources/bootstrap.yml deleted file mode 100644 index 0451449ca23..00000000000 --- a/proxies/hodejegeren-proxy/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - cloud: - vault: - enabled: false \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/src/main/resources/logback-spring.xml b/proxies/hodejegeren-proxy/src/main/resources/logback-spring.xml deleted file mode 100644 index 52c15597b3c..00000000000 --- a/proxies/hodejegeren-proxy/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - 256 - 10280 - 20 - ^sun\.reflect\..*\.invoke - ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke - java\.util\.concurrent\..* - org\.apache\.catalina\..* - org\.apache\.coyote\..* - org\.apache\.tomcat\..* - - - - - - - - - - - - - %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n - - utf8 - - - - - - - - - \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java b/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java deleted file mode 100644 index 140c6860183..00000000000 --- a/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.testnav.proxies.hodejegerenproxy; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -class ApplicationContextTest { - - @MockBean - public ReactiveJwtDecoder reactiveJwtDecoder; - - @Test - @SuppressWarnings("java:S2699") - void load_app_context() { - } -} diff --git a/proxies/hodejegeren-proxy/src/test/resources/application-test.properties b/proxies/hodejegeren-proxy/src/test/resources/application-test.properties deleted file mode 100644 index f44e7773252..00000000000 --- a/proxies/hodejegeren-proxy/src/test/resources/application-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file diff --git a/proxies/tps-forvalteren-proxy/config.yml b/proxies/tps-forvalteren-proxy/config.yml index 8bec76b4ee6..4c336579ca7 100644 --- a/proxies/tps-forvalteren-proxy/config.yml +++ b/proxies/tps-forvalteren-proxy/config.yml @@ -36,8 +36,6 @@ spec: cluster: dev-gcp - application: dolly-backend cluster: dev-gcp - - application: testnorge-hodejegeren - cluster: dev-fss liveness: path: /internal/isAlive initialDelay: 4 diff --git a/settings.gradle b/settings.gradle index 4c0e59d4e0f..a585428fd09 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,7 +30,6 @@ includeBuild './proxies/dokarkiv-proxy' includeBuild './proxies/tps-forvalteren-proxy' includeBuild './proxies/aareg-synt-services-proxy' includeBuild './proxies/pdl-proxy' -includeBuild './proxies/hodejegeren-proxy' includeBuild './proxies/ereg-proxy' includeBuild './proxies/inntektstub-proxy' includeBuild './proxies/brregstub-proxy' @@ -96,7 +95,6 @@ includeBuild './apps/person-organisasjon-tilgang-service' includeBuild './apps/bruker-service' includeBuild './apps/testnorge-statisk-data-forvalter' includeBuild './apps/generer-arbeidsforhold-populasjon-service' -includeBuild './apps/mn-synt-arbeidsforhold-service' includeBuild './apps/brreg-stub' includeBuild './apps/ereg-batch-status-service' includeBuild './apps/generer-navn-service' @@ -116,7 +114,6 @@ includeBuild './apps/sykemelding-api' includeBuild './apps/person-search-service' includeBuild './apps/person-faste-data-service' includeBuild './apps/organisasjon-service' -includeBuild './apps/hodejegeren' includeBuild './apps/tilbakemelding-api' includeBuild './apps/tps-messaging-service' includeBuild './apps/organisasjon-tilgang-frontend' From 20a0dcc2a439190fde918c7a6597ad3a1669afbb Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Thu, 4 Jan 2024 15:19:28 +0100 Subject: [PATCH 13/13] Forhaapentligvis raskere henting av identer --- .../src/main/js/src/api/index.ts | 2 +- .../pdlPerson/PdlEksisterendePerson.tsx | 68 ++++++++----------- .../js/src/service/SelectOptionsOppslag.tsx | 65 +----------------- .../services/pdl/PdlForvalterService.tsx | 21 +----- .../js/src/utils/hooks/useSelectOptions.tsx | 24 +++++-- 5 files changed, 51 insertions(+), 129 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/api/index.ts b/apps/dolly-frontend/src/main/js/src/api/index.ts index 24c56207f32..4425dbdef05 100644 --- a/apps/dolly-frontend/src/main/js/src/api/index.ts +++ b/apps/dolly-frontend/src/main/js/src/api/index.ts @@ -111,7 +111,7 @@ export const multiFetcherDokarkiv = (miljoUrlListe) => ? fetcher(obj.url, { miljo: obj.miljo }).then((result) => ({ miljo: obj.miljo, data: result, - })) + })) : { miljo: obj.miljo, data: null }, ), ) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx index 2ea674831c0..4d747be6465 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx @@ -1,16 +1,16 @@ -import React, { useContext, useEffect, useState } from 'react' +import React, { useContext } from 'react' import { FormikSelect } from '@/components/ui/form/inputs/select/Select' import Loading from '@/components/ui/loading/Loading' import { isEmpty } from '@/components/fagsystem/pdlf/form/partials/utils' import * as _ from 'lodash-es' import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext' -import { identFraTestnorge } from '@/components/bestillingsveileder/stegVelger/steg/steg1/Steg1Person' -import { Option, SelectOptionsOppslag } from '@/service/SelectOptionsOppslag' -import { useBoolean } from 'react-use' +import { Option } from '@/service/SelectOptionsOppslag' import { FormikProps } from 'formik' -import { ForeldreBarnRelasjon, NyIdent, Sivilstand } from '@/components/fagsystem/pdlf/PdlTypes' +import { ForeldreBarnRelasjon, NyIdent } from '@/components/fagsystem/pdlf/PdlTypes' import { Alert } from '@navikt/ds-react' import { useParams } from 'react-router-dom' +import { useGruppeIdenter } from '@/utils/hooks/useGruppe' +import { usePdlOptions } from '@/utils/hooks/useSelectOptions' interface PdlEksisterendePersonValues { nyPersonPath?: string @@ -37,10 +37,8 @@ export const PdlEksisterendePerson = ({ const antall = opts?.antall || 1 const { gruppeId } = useParams() - const isTestnorgeIdent = identFraTestnorge(opts) - - const [identOptions, setIdentOptions] = useState>([]) - const [loadingIdentOptions, setLoadingIdentOptions] = useBoolean(true) + const { identer, loading: gruppeLoading, error: gruppeError } = useGruppeIdenter(gruppeId) + const { data: pdlOptions, loading: pdlLoading, error: pdlError } = usePdlOptions(identer) const harSivilstand = eksisterendePersonPath?.includes('sivilstand') const harNyIdent = eksisterendePersonPath?.includes('nyident') @@ -116,34 +114,17 @@ export const PdlEksisterendePerson = ({ const getFilteredOptionList = () => { const eksisterendeIdent = opts?.personFoerLeggTil?.pdlforvalter?.person?.ident - let tmpOptions = [] - // @ts-ignore - SelectOptionsOppslag.hentGruppeIdentOptions(gruppeId).then((response: [Option]) => { - tmpOptions = response?.filter((person) => { - return person.value !== eksisterendeIdent && filterOptions(person) - }) - if ( - eksisterendeNyPerson && - !tmpOptions.find((person) => person.value === eksisterendeNyPerson.value) - ) { - tmpOptions.push(eksisterendeNyPerson) - } - setIdentOptions(tmpOptions) - setLoadingIdentOptions(false) - }) - } - - useEffect(() => { - if (!isTestnorgeIdent && gruppeId) { - getFilteredOptionList() - } - }, []) - - useEffect(() => { - if (formikBag) { - getFilteredOptionList() + const tmpOptions = pdlOptions?.filter( + (person) => person.value !== eksisterendeIdent && filterOptions(person), + ) + if ( + eksisterendeNyPerson && + !tmpOptions.find((person) => person.value === eksisterendeNyPerson.value) + ) { + tmpOptions.push(eksisterendeNyPerson) } - }, [formikBag]) + return tmpOptions + } const hasNyPersonValues = nyIdentValg ? !isEmpty(nyIdentValg, ['syntetisk']) @@ -151,19 +132,26 @@ export const PdlEksisterendePerson = ({ const bestillingFlerePersoner = parseInt(antall) > 1 && (harSivilstand || harNyIdent) + const filteredOptions = getFilteredOptionList() + return (
- {loadingIdentOptions && } - {identOptions?.length > 0 ? ( + {(pdlLoading || gruppeLoading) && } + {filteredOptions?.length > 0 ? ( + ) : pdlError || gruppeError ? ( + + {pdlError?.message || gruppeError?.message || 'Feil ved henting av personer'} + ) : ( - !loadingIdentOptions && ( + !pdlLoading && + !gruppeLoading && ( Det finnes ingen eksisterende gyldige personer i denne gruppen. diff --git a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsOppslag.tsx b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsOppslag.tsx index 79128faa5c0..42545b513ce 100644 --- a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsOppslag.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsOppslag.tsx @@ -1,8 +1,6 @@ import { useAsync } from 'react-use' -import { BrregstubApi, DollyApi, KrrApi, PdlforvalterApi } from '@/service/Api' +import { BrregstubApi, DollyApi, KrrApi } from '@/service/Api' import Api from '@/api' -import { Person, PersonData } from '@/components/fagsystem/pdlf/PdlTypes' -import { getAlder } from '@/ducks/fagsystem' const uri = `/dolly-backend/api/v1` @@ -19,68 +17,7 @@ export type Option = { relasjoner?: Array } -type Data = { - label: string - id: string - navn: string - value: { - data: any - } -} - -type PersonListe = { - value: string - label: string - alder: number - sivilstand: string - vergemaal: boolean - doedsfall: boolean - foreldre: Array - foreldreansvar: Array -} - export const SelectOptionsOppslag = { - hentGruppeIdentOptions: async (gruppeId: string) => { - const gruppe = await DollyApi.getGruppeById(gruppeId).then((response: any) => { - return response.data?.identer?.map((person: PersonData) => { - if (person.master === 'PDL' || person.master === 'PDLF') { - return person.ident - } - }) - }) - if (gruppe?.length < 1) { - return null - } - const options = await PdlforvalterApi.getPersoner(gruppe).then((response: any) => { - if (gruppe?.length < 1) { - return null - } - const personListe: Array = [] - response?.data?.forEach((id: Person) => { - const navn = - id.person.navn?.length > 0 - ? `- ${id.person.navn?.[0]?.fornavn} ${id.person.navn?.[0]?.etternavn}` - : '' - personListe.push({ - value: id.person.ident, - label: `${id.person.ident} ${navn}`, - alder: getAlder(id.person.foedsel?.[0]?.foedselsdato), - sivilstand: id.person.sivilstand?.[0]?.type, - vergemaal: id.person.vergemaal?.length > 0, - doedsfall: id.person.doedsfall?.length > 0, - foreldre: id.relasjoner - ?.filter((relasjon) => relasjon.relasjonType === 'FAMILIERELASJON_FORELDER') - ?.map((relasjon) => relasjon.relatertPerson?.ident), - foreldreansvar: id.relasjoner - ?.filter((relasjon) => relasjon.relasjonType === 'FORELDREANSVAR_BARN') - ?.map((relasjon) => relasjon.relatertPerson?.ident), - }) - }) - return personListe - }) - return options || Promise.resolve() - }, - hentKrrLeverandoerer: () => { return useAsync(async () => KrrApi.getSdpLeverandoerListe(), [KrrApi.getSdpLeverandoerListe]) }, diff --git a/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx index e5547009be2..ee25d3016f2 100644 --- a/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx @@ -2,30 +2,13 @@ import Request from '@/service/services/Request' const getPdlUrl = () => '/testnav-pdl-forvalter/api/v1' -const sliceIdentListe = (identListe: string[]) => { - const maxAntall = 150 - if (identListe.length <= maxAntall) return [identListe] - const identer = [] - for (let i = 0; i < identListe.length; i += maxAntall) { - identer.push(identListe.slice(i, i + maxAntall)) - } - return identer -} - export default { getPersoner(identListe: string[]) { if (!identListe) { return } - const identerDelt = sliceIdentListe(identListe) - const promises = identerDelt.map((identer) => { - const endpoint = `${getPdlUrl()}/personer?identer=${identer}` - return Request.get(endpoint) - }) - return Promise.all(promises).then((responses) => { - const data = responses.map((response: any) => response?.data).flat() - return { data } - }) + const endpoint = `${getPdlUrl()}/personer?identer=${identListe}` + return Request.get(endpoint) }, soekPersoner(fragment: string) { if (!fragment || fragment.length > 11) { diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useSelectOptions.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useSelectOptions.tsx index 3966b2e5dc8..fd12f3e32b2 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useSelectOptions.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useSelectOptions.tsx @@ -1,5 +1,6 @@ import useSWR from 'swr' import { fetcher, multiFetcherAll } from '@/api' +import { getAlder } from '@/ducks/fagsystem' const sliceGruppe = (gruppe, maxAntall, url) => { let urlListe = [] @@ -12,20 +13,23 @@ const sliceGruppe = (gruppe, maxAntall, url) => { const multiplePdlforvalterUrl = (gruppe) => { if (!gruppe) return null - const maxAntall = 40 + const maxAntall = 150 const url = '/testnav-pdl-forvalter/api/v1/personer?' return sliceGruppe(gruppe, maxAntall, url) } const multiplePdlPersonUrl = (gruppe) => { if (!gruppe) return null - const maxAntall = 40 + const maxAntall = 150 const url = '/person-service/api/v2/personer/identer?' return sliceGruppe(gruppe, maxAntall, url) } export const usePdlOptions = (gruppe) => { - const { data, error } = useSWR([multiplePdlforvalterUrl(gruppe)], multiFetcherAll) + const { data, isLoading, error } = useSWR( + multiplePdlforvalterUrl(gruppe), + multiFetcherAll, + ) const personData = [] data?.flat().forEach((id) => { @@ -37,18 +41,28 @@ export const usePdlOptions = (gruppe) => { value: id?.person?.ident, label: `${id?.person?.ident} - ${fornavn} ${mellomnavn} ${etternavn}`, relasjoner: id?.relasjoner?.map((r) => r?.relatertPerson?.ident), + alder: getAlder(id.person.foedsel?.[0]?.foedselsdato), + sivilstand: id.person.sivilstand?.[0]?.type, + vergemaal: id.person.vergemaal?.length > 0, + doedsfall: id.person.doedsfall?.length > 0, + foreldre: id.relasjoner + ?.filter((relasjon) => relasjon.relasjonType === 'FAMILIERELASJON_FORELDER') + ?.map((relasjon) => relasjon.relatertPerson?.ident), + foreldreansvar: id.relasjoner + ?.filter((relasjon) => relasjon.relasjonType === 'FORELDREANSVAR_BARN') + ?.map((relasjon) => relasjon.relatertPerson?.ident), }) }) return { data: personData, - loading: false, + loading: isLoading, error: gruppe ? error : undefined, } } export const useTestnorgeOptions = (gruppe) => { - const { data, error } = useSWR([multiplePdlPersonUrl(gruppe)], multiFetcherAll) + const { data, error } = useSWR(multiplePdlPersonUrl(gruppe), multiFetcherAll) const getRelatertePersoner = (person) => { if (!person) {