diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml index 7315b50154..d111c5599e 100644 --- a/apps/adresse-service/src/main/resources/logback-spring.xml +++ b/apps/adresse-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 @@ -35,5 +35,5 @@ - + \ No newline at end of file diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/apps/amelding-service/src/main/resources/logback-spring.xml +++ b/apps/amelding-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml index 8fe635b4e5..af3859fcb0 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml +++ b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml index 2066327923..5128a1c0a2 100644 --- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml index 7315b50154..e8daa936d9 100644 --- a/apps/brreg-stub/src/main/resources/logback-spring.xml +++ b/apps/brreg-stub/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml index 70ee88e596..105bd213e9 100644 --- a/apps/bruker-service/src/main/resources/logback-spring.xml +++ b/apps/bruker-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 @@ -24,7 +24,7 @@ - + true 256 diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml index 8404dbd99f..e669cb2650 100644 --- a/apps/budpro-service/src/main/resources/logback-spring.xml +++ b/apps/budpro-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java index a06891bd25..c0d78e1c62 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java @@ -5,7 +5,7 @@ import no.nav.dolly.bestilling.ConsumerStatus; import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattDeleteCommand; import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattPostCommand; -import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonGetCommand; +import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonHentCommand; import no.nav.dolly.bestilling.tpsmessagingservice.command.TpsMessagingPostCommand; import no.nav.dolly.config.Consumers; import no.nav.dolly.metrics.Timed; @@ -52,7 +52,7 @@ public TpsMessagingConsumer( .build(); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createUtenlandskBankkonto"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createUtenlandskBankkonto" }) public Flux sendUtenlandskBankkontoRequest(String ident, List miljoer, BankkontonrUtlandDTO body) { @@ -61,7 +61,7 @@ public Flux sendUtenlandskBankkontoRequest(String ident, new TpsMessagingPostCommand(webClient, ident, miljoer, body, UTENLANDSK_BANKKONTO_URL, token.getTokenValue()).call()); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createNorskBankkonto"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createNorskBankkonto" }) public Flux sendNorskBankkontoRequest(String ident, List miljoer, BankkontonrNorskDTO body) { return tokenService.exchange(serverProperties) @@ -69,7 +69,7 @@ public Flux sendNorskBankkontoRequest(String ident, List< new TpsMessagingPostCommand(webClient, ident, miljoer, body, NORSK_BANKKONTO_URL, token.getTokenValue()).call()); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createSkjerming"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createSkjerming" }) public Flux sendEgenansattRequest(String ident, List miljoer, LocalDate fraOgMed) { return tokenService.exchange(serverProperties) @@ -77,14 +77,14 @@ public Flux sendEgenansattRequest(String ident, List deleteEgenansattRequest(String ident, List miljoer) { return tokenService.exchange(serverProperties) .flatMapMany(token -> new EgenansattDeleteCommand(webClient, ident, miljoer, token.getTokenValue()).call()); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createSpraakkode"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createSpraakkode" }) public Flux sendSpraakkodeRequest(String ident, List miljoer, SpraakDTO body) { return tokenService.exchange(serverProperties) @@ -92,11 +92,11 @@ public Flux sendSpraakkodeRequest(String ident, List getPerson(String ident, List miljoer) { return tokenService.exchange(serverProperties) - .flatMapMany(token -> new PersonGetCommand(webClient, ident, miljoer, token.getTokenValue()).call()); + .flatMapMany(token -> new PersonHentCommand(webClient, ident, miljoer, token.getTokenValue()).call()); } @Override diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java similarity index 86% rename from apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java rename to apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java index 7d30c111fd..66c17fa02a 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java @@ -14,10 +14,10 @@ @RequiredArgsConstructor @Slf4j -public class PersonGetCommand implements Callable> { +public class PersonHentCommand implements Callable> { private static final String MILJOER_PARAM = "miljoer"; - private static final String PERSONER_URL = "/api/v1/personer/{ident}"; + private static final String PERSONER_URL = "/api/v2/personer/ident"; private final WebClient webClient; private final String ident; @@ -27,11 +27,12 @@ public class PersonGetCommand implements Callable> { @Override public Flux call() { - return webClient.get() + return webClient.post() .uri(uriBuilder -> uriBuilder .path(PERSONER_URL) .queryParam(MILJOER_PARAM, miljoer) - .build(ident)) + .build()) + .bodyValue(ident) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToFlux(PersonMiljoeDTO.class) diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml index c5446a2acc..7edff7cd6b 100644 --- a/apps/dolly-backend/src/main/resources/logback-spring.xml +++ b/apps/dolly-backend/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 @@ -37,10 +37,10 @@ - - - - - - + + + + + + diff --git a/apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx index 4891afb4b2..4324c38a3d 100644 --- a/apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/services/tpsmessaging/TpsMessagingService.tsx @@ -1,21 +1,22 @@ import Request from '@/service/services/Request' -const TPS_MESSAGING_URL = `/testnav-tps-messaging-service/api/v1/personer` +const TPS_MESSAGING_URL_V1 = `/testnav-tps-messaging-service/api/v1/personer` +const TPS_MESSAGING_URL_V2 = `/testnav-tps-messaging-service/api/v2/personer` -const getTpsMessagingUrl = (ident, miljoe) => `${TPS_MESSAGING_URL}/${ident}?miljoer=${miljoe}` -const getTpsMessagingUrlAllEnvs = (ident) => `${TPS_MESSAGING_URL}/${ident}` +const getTpsMessagingUrl_V2 = (miljoe) => `${TPS_MESSAGING_URL_V2}/ident?miljoer=${miljoe}` +const getTpsMessagingUrlAllEnvs_V2 = () => `${TPS_MESSAGING_URL_V2}/ident` export default { getTpsPersonInfo(ident, miljoe) { - return Request.get(getTpsMessagingUrl(ident, miljoe)) + return Request.post(getTpsMessagingUrl_V2(miljoe), ident) }, getTpsPersonInfoAllEnvs(ident) { - return Request.get(getTpsMessagingUrlAllEnvs(ident)) + return Request.post(getTpsMessagingUrlAllEnvs_V2(), ident) }, deleteBankkontoNorsk(ident) { - return Request.delete(`${TPS_MESSAGING_URL}/${ident}/bankkonto-norsk`) + return Request.delete(`${TPS_MESSAGING_URL_V1}/${ident}/bankkonto-norsk`) }, deleteBankkontoUtenlandsk(ident) { - return Request.delete(`${TPS_MESSAGING_URL}/${ident}/bankkonto-utenlandsk`) + return Request.delete(`${TPS_MESSAGING_URL_V1}/${ident}/bankkonto-utenlandsk`) }, } diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml index deb09e10d2..2bce52c7cc 100644 --- a/apps/dolly-frontend/src/main/resources/logback-spring.xml +++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/apps/dollystatus/src/main/resources/logback-spring.xml +++ b/apps/dollystatus/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/endringsmelding-frontend/src/main/js/package-lock.json b/apps/endringsmelding-frontend/src/main/js/package-lock.json index e85b5d2de8..fa4a640552 100644 --- a/apps/endringsmelding-frontend/src/main/js/package-lock.json +++ b/apps/endringsmelding-frontend/src/main/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "endringsmelding-frontend", - "version": "1.2.16", + "version": "1.2.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "endringsmelding-frontend", - "version": "1.2.16", + "version": "1.2.17", "dependencies": { "@navikt/dolly-komponenter": "^1.3.33", "@navikt/ds-icons": "^3.4.3", @@ -1037,9 +1037,9 @@ } }, "node_modules/@navikt/aksel-icons": { - "version": "6.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.4.0/89a0ee5bf2d7fb57669cff8a33c547131ad06ea6", - "integrity": "sha512-8eWLkMMHQ92clPkfybPuJ+98kVzGnPkdemrrtdgXQ8sLHzBKeXzmizEyNccnYAqOolBl4XzWOuDgZfNzWT5sTQ==" + "version": "6.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.4.1/fee5c6dcfb02ec173a94d24fd57ec3cb4af1d3a0", + "integrity": "sha512-1RoKrD/r4eYZoXb//vt71Gol/E0pOKlUG/fUCUfWMVMo+RwzSD9lY7NXUO/itl9oHnf4GjmHd7SWf1+LITySBw==" }, "node_modules/@navikt/dolly-assets": { "version": "1.2.16", @@ -1081,9 +1081,9 @@ "integrity": "sha512-yTs1+Y4v3QOitFJiR/wHPwgiWZ0btJsDJ7++RGs/OkBpRqLNvPuKgvJSzZSZc9+nVolF01noT8T7vgoAO0+MLQ==" }, "node_modules/@navikt/ds-css": { - "version": "6.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.4.0/f17ee124b15bd768705c068342a43c6e20dc1d33", - "integrity": "sha512-5PcSPoWnACvqnSDF9AO+8RV7AYWzPsTKf0QOVBW0aGk6+eqsZlx2t/uG+0ZH+zBfDgdhJzw/zxRtsWQOQSPMdg==" + "version": "6.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.4.1/c9765472991a4510f4960ad97106b471b3b9044b", + "integrity": "sha512-Q/blXU5BC0rDoTLQoNbuptYZ1ONCa5l3QZ6LSHoiJtkkP0VHD7qI+WntB94ReUHteU7z2baxVN4WPQGcdXBiGg==" }, "node_modules/@navikt/ds-icons": { "version": "3.4.3", @@ -1095,13 +1095,13 @@ } }, "node_modules/@navikt/ds-react": { - "version": "6.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.4.0/aaba71adc0b3325f3aa9baa5f22840e0d44971a4", - "integrity": "sha512-asoAsaHd+8ot/VXX2oc6bgFAaGhqT7LMNRrV8mlrlmEpoVYhFGgOyQG4qmMGGkX2TIIoQ7Fv4uPLUU1hIW/D9A==", + "version": "6.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.4.1/f47381427c313e887ad8c6ae01aa8f4b7dfb9c09", + "integrity": "sha512-UCfRfp5yA0Ks9K243z1mVv3oa346nAIz9Aeo6yk2ySiXdXsFd0m8/tuzhwuNum+bZNv1TFMe1rzYUAJ21Fganw==", "dependencies": { "@floating-ui/react": "0.25.4", - "@navikt/aksel-icons": "^6.4.0", - "@navikt/ds-tokens": "^6.4.0", + "@navikt/aksel-icons": "^6.4.1", + "@navikt/ds-tokens": "^6.4.1", "@radix-ui/react-tabs": "1.0.0", "@radix-ui/react-toggle-group": "1.0.0", "clsx": "^2.1.0", @@ -1114,9 +1114,9 @@ } }, "node_modules/@navikt/ds-tokens": { - "version": "6.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.4.0/b584f23b1d5904073492b6902c4b78cc606f3637", - "integrity": "sha512-RKSNEaNECQg9NyowRZBYZRZvntl2gK0K3tuZbDY15l5tjT4AYcW0TvoDW2DbCNJLt41vtXZgLW7JjeBHP2U5eQ==" + "version": "6.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.4.1/97415efe3b21aa121a858f65cc65d1498f277d58", + "integrity": "sha512-kc2hF/XJQmf+1lkeyvl+Q9PGKKDCPHczY+lvZff7o+PaWXt+9MbDQEPwcOvTmUug7PK52aogtUTt7XiumN84xA==" }, "node_modules/@navikt/fnrvalidator": { "version": "2.0.7", @@ -1888,9 +1888,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.6.tgz", - "integrity": "sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==", + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", "dev": true, "peer": true, "dependencies": { @@ -2372,9 +2372,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001607", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001607.tgz", - "integrity": "sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w==", + "version": "1.0.30001608", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz", + "integrity": "sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==", "dev": true, "funding": [ { @@ -2591,9 +2591,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.730", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.730.tgz", - "integrity": "sha512-oJRPo82XEqtQAobHpJIR3zW5YO3sSRRkPz2an4yxi1UvqhsGm54vR/wzTFV74a3soDOJ8CKW7ajOOX5ESzddwg==", + "version": "1.4.731", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.731.tgz", + "integrity": "sha512-+TqVfZjpRz2V/5SPpmJxq9qK620SC5SqCnxQIOi7i/U08ZDcTpKbT7Xjj9FU5CbXTMUb4fywbIr8C7cGv4hcjw==", "dev": true }, "node_modules/enhanced-resolve": { @@ -3561,9 +3561,9 @@ } }, "node_modules/react-datepicker/node_modules/@floating-ui/react": { - "version": "0.26.11", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.11.tgz", - "integrity": "sha512-fo01Cu+jzLDVG/AYAV2OtV6flhXvxP5rDaR1Fk8WWhtsFqwk478Dr2HGtB8s0HqQCsFWVbdHYpPjMiQiR/A9VA==", + "version": "0.26.12", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.12.tgz", + "integrity": "sha512-D09o62HrWdIkstF2kGekIKAC0/N/Dl6wo3CQsnLcOmO3LkW6Ik8uIb3kw8JYkwxNCcg+uJ2bpWUiIijTBep05w==", "dependencies": { "@floating-ui/react-dom": "^2.0.0", "@floating-ui/utils": "^0.2.0", diff --git a/apps/endringsmelding-frontend/src/main/js/package.json b/apps/endringsmelding-frontend/src/main/js/package.json index 00e9a524bb..00e2bb0278 100644 --- a/apps/endringsmelding-frontend/src/main/js/package.json +++ b/apps/endringsmelding-frontend/src/main/js/package.json @@ -1,6 +1,6 @@ { "name": "endringsmelding-frontend", - "version": "1.2.16", + "version": "1.2.17", "private": true, "type": "module", "homepage": "/", diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml index 9ebcb909c3..f05ebb850a 100644 --- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/TpsMessagingConsumer.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/TpsMessagingConsumer.java index 9888efcefc..21ddec3baf 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/TpsMessagingConsumer.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/TpsMessagingConsumer.java @@ -6,10 +6,11 @@ import no.nav.testnav.endringsmeldingservice.consumer.command.GetAdressehistorikkCommand; import no.nav.testnav.endringsmeldingservice.consumer.command.GetEksistererPersonCommand; import no.nav.testnav.endringsmeldingservice.consumer.command.GetIdentEnvironmentsCommand; -import no.nav.testnav.endringsmeldingservice.consumer.command.GetPersondataCommand; +import no.nav.testnav.endringsmeldingservice.consumer.command.HentPersondataCommand; import no.nav.testnav.endringsmeldingservice.consumer.command.SendDoedsmeldingCommand; import no.nav.testnav.endringsmeldingservice.consumer.command.SendFoedselsmeldingCommand; import no.nav.testnav.endringsmeldingservice.consumer.command.SendKansellerDoedsmeldingCommand; +import no.nav.testnav.endringsmeldingservice.domain.IdenterRequest; import no.nav.testnav.libs.data.tpsmessagingservice.v1.AdressehistorikkDTO; import no.nav.testnav.libs.data.tpsmessagingservice.v1.AdressehistorikkRequest; import no.nav.testnav.libs.data.tpsmessagingservice.v1.DoedsmeldingRequest; @@ -19,7 +20,6 @@ import no.nav.testnav.libs.data.tpsmessagingservice.v1.IdentMiljoeDTO; import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonDTO; import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; -import no.nav.testnav.endringsmeldingservice.domain.IdenterRequest; import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsIdentStatusDTO; import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange; import no.nav.testnav.libs.securitycore.domain.ServerProperties; @@ -84,7 +84,7 @@ public Flux getPersondata(String ident, Set miljoer) { return accessTokenService .exchange(serverProperties) - .flatMapMany(accessToken -> new GetPersondataCommand(webClient, ident, miljoer, accessToken.getTokenValue()).call()); + .flatMapMany(accessToken -> new HentPersondataCommand(webClient, ident, miljoer, accessToken.getTokenValue()).call()); } public Flux getAdressehistorikk(String ident, LocalDate aksjonsdato, Set miljoer) { diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetPersondataCommand.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/HentPersondataCommand.java similarity index 83% rename from apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetPersondataCommand.java rename to apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/HentPersondataCommand.java index 63c7c8dd37..3899c0ea01 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetPersondataCommand.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/HentPersondataCommand.java @@ -13,9 +13,9 @@ import java.util.concurrent.Callable; @RequiredArgsConstructor -public class GetPersondataCommand implements Callable> { +public class HentPersondataCommand implements Callable> { - private static final String PERSON_DATA_URL = "/api/v1/personer/{ident}"; + private static final String PERSON_DATA_URL = "/api/v2/personer/ident"; private static final String MILJOER = "miljoer"; private final WebClient webClient; @@ -27,10 +27,11 @@ public class GetPersondataCommand implements Callable> { public Flux call() { return webClient - .get() + .post() .uri(builder -> builder.path(PERSON_DATA_URL) .queryParam(MILJOER, miljoer) - .build(ident)) + .build()) + .bodyValue(ident) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToFlux(PersonMiljoeDTO.class) diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml index de8c7308e9..8f79e8b8f6 100644 --- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml +++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/generer-navn-service/src/main/resources/logback-spring.xml +++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml +++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml +++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml +++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/kodeverk-service/src/main/resources/logback-spring.xml +++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/miljoer-service/src/main/resources/logback-spring.xml +++ b/apps/miljoer-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml index 6e5d6b01e7..24dca5b2e9 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml +++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml index 2066327923..5128a1c0a2 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml index 3d872283bf..04b97b1785 100644 --- a/apps/organisasjon-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml index ad7d0d2d70..c826335d84 100644 --- a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 @@ -24,7 +24,7 @@ - + true 256 diff --git a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml index 5321378f40..0d7c021e82 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/orgnummer-service/src/main/resources/logback-spring.xml +++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml +++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/pdl-forvalter/src/main/resources/logback-spring.xml b/apps/pdl-forvalter/src/main/resources/logback-spring.xml index a34b8d9776..103b3d089d 100644 --- a/apps/pdl-forvalter/src/main/resources/logback-spring.xml +++ b/apps/pdl-forvalter/src/main/resources/logback-spring.xml @@ -3,7 +3,7 @@ - + true 256 diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml index d540612930..df870adb59 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml index d36b5e4945..00fcb854d2 100644 --- a/apps/person-search-service/src/main/resources/logback-spring.xml +++ b/apps/person-search-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/apps/person-service/src/main/resources/logback-spring.xml +++ b/apps/person-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/profil-api/src/main/resources/logback-spring.xml +++ b/apps/profil-api/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/sykemelding-api/src/main/resources/logback-spring.xml b/apps/sykemelding-api/src/main/resources/logback-spring.xml index b9f5016c31..25e38e97a4 100644 --- a/apps/sykemelding-api/src/main/resources/logback-spring.xml +++ b/apps/sykemelding-api/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml +++ b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml index 6b4fa0a24d..98edfa50fe 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml index 2ca797bad5..f6869c3a6a 100644 --- a/apps/tenor-search-service/src/main/resources/logback-spring.xml +++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml index 7315b50154..e8daa936d9 100644 --- a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml +++ b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml index 7315b50154..e8daa936d9 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml +++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v2/PersonController.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v2/PersonController.java new file mode 100644 index 0000000000..96287017fa --- /dev/null +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v2/PersonController.java @@ -0,0 +1,31 @@ +package no.nav.testnav.apps.tpsmessagingservice.provider.v2; + +import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.tpsmessagingservice.service.PersonService; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; +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 java.util.List; + +import static java.util.Collections.emptyList; +import static java.util.Objects.nonNull; + +@RestController +@RequestMapping("/api/v2/personer") +@RequiredArgsConstructor +public class PersonController { + + private final PersonService personService; + + @PostMapping("/ident") + public List getPerson(@RequestBody String ident, + @RequestParam(required = false) List miljoer) { + + return personService.getPerson(ident, nonNull(miljoer) ? miljoer : emptyList()); + } +} + diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java index 469fdad698..bebaf770f6 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java @@ -68,19 +68,69 @@ public PersonService(ServicerutineConsumer servicerutineConsumer, this.requestContext = JAXBContext.newInstance(TpsServicerutineRequest.class); } - private static String mapRelasjonType(RelasjonType relasjonType) { + @SneakyThrows + public TpsServicerutineS610Response unmarshallFromXml(String endringsmeldingResponse) { - return switch (relasjonType) { - case MORA -> MOR.name(); - case FARA -> FAR.name(); - case EKTE, ENKE, SKIL, SEPR, REPA, SEPA, SKPA, GJPA, GLAD -> PARTNER.name(); - default -> relasjonType.name(); - }; + if (TpsMeldingCommand.NO_RESPONSE.equals(endringsmeldingResponse)) { + + return TpsServicerutineS610Response.builder() + .tpsPersonData(TpsServicerutineS610Response.TpsPersonData.builder() + .tpsSvar(TpsServicerutineS610Response.TpsSvar.builder() + .svarStatus(EndringsmeldingUtil.getNoAnswerStatus()) + .build()) + .build()) + .build(); + } else { + + var jsonRoot = XML.toJSONObject(endringsmeldingResponse); + + return objectMapper.readValue(jsonRoot.toString(), TpsServicerutineS610Response.class); + } } - private static boolean isStatusOK(TpsMeldingResponse response) { + public List getPerson(String ident, List miljoer) { - return STATUS_OK.equals(response.getReturStatus()); + if (miljoer.isEmpty()) { + miljoer = testmiljoerServiceConsumer.getMiljoer(); + } + + var tpsPersoner = readFromTps(ident, miljoer); + + var relasjoner = getRelasjoner(tpsPersoner.entrySet().stream() + .filter(entry -> nonNull(entry.getValue().getTpsPersonData()) && + nonNull(entry.getValue().getTpsPersonData().getTpsSvar()) && + isStatusOK(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus())) + .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue() + .getTpsPersonData() + .getTpsSvar() + .getPersonDataS610() + .getPerson()))); + + var personerMedRelasjoner = buildMiljoePersonWithRelasjon(relasjoner).entrySet().stream() + .map(entry -> PersonMiljoeDTO.builder() + .ident(ident) + .miljoe(entry.getKey()) + .status("OK") + .person(entry.getValue()) + .build()) + .toList(); + + var hentingMedFeil = tpsPersoner.entrySet().stream() + .filter(entry -> nonNull(entry.getValue().getTpsPersonData()) && + nonNull(entry.getValue().getTpsPersonData().getTpsSvar()) && + !isStatusOK(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus())) + .map(entry -> PersonMiljoeDTO.builder() + .miljoe(entry.getKey()) + .status("FEIL") + .melding(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus().getReturMelding()) + .utfyllendeMelding(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus().getUtfyllendeMelding()) + .build()) + .toList(); + + return Stream.of(personerMedRelasjoner, hentingMedFeil) + .flatMap(Collection::stream) + .filter(entry -> isBlank(entry.getUtfyllendeMelding()) || !NOT_FOUND.equals(entry.getUtfyllendeMelding())) + .toList(); } private Map buildMiljoePersonWithRelasjon(Map personRelasjon) { @@ -144,26 +194,6 @@ private PersonRelasjon getRelasjoner(String miljoe, S610PersonType tpsPerson) { .build(); } - @SneakyThrows - public TpsServicerutineS610Response unmarshallFromXml(String endringsmeldingResponse) { - - if (TpsMeldingCommand.NO_RESPONSE.equals(endringsmeldingResponse)) { - - return TpsServicerutineS610Response.builder() - .tpsPersonData(TpsServicerutineS610Response.TpsPersonData.builder() - .tpsSvar(TpsServicerutineS610Response.TpsSvar.builder() - .svarStatus(EndringsmeldingUtil.getNoAnswerStatus()) - .build()) - .build()) - .build(); - } else { - - var jsonRoot = XML.toJSONObject(endringsmeldingResponse); - - return objectMapper.readValue(jsonRoot.toString(), TpsServicerutineS610Response.class); - } - } - private Map readFromTps(String ident, List miljoer) { var request = TpsServicerutineRequest.builder() @@ -186,49 +216,19 @@ private Map readFromTps(String ident, List entry -> unmarshallFromXml(entry.getValue()))); } - public List getPerson(String ident, List miljoer) { - - if (miljoer.isEmpty()) { - miljoer = testmiljoerServiceConsumer.getMiljoer(); - } - - var tpsPersoner = readFromTps(ident, miljoer); - - var relasjoner = getRelasjoner(tpsPersoner.entrySet().stream() - .filter(entry -> nonNull(entry.getValue().getTpsPersonData()) && - nonNull(entry.getValue().getTpsPersonData().getTpsSvar()) && - isStatusOK(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus())) - .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue() - .getTpsPersonData() - .getTpsSvar() - .getPersonDataS610() - .getPerson()))); + private static String mapRelasjonType(RelasjonType relasjonType) { - var personerMedRelasjoner = buildMiljoePersonWithRelasjon(relasjoner).entrySet().stream() - .map(entry -> PersonMiljoeDTO.builder() - .ident(ident) - .miljoe(entry.getKey()) - .status("OK") - .person(entry.getValue()) - .build()) - .toList(); + return switch (relasjonType) { + case MORA -> MOR.name(); + case FARA -> FAR.name(); + case EKTE, ENKE, SKIL, SEPR, REPA, SEPA, SKPA, GJPA, GLAD -> PARTNER.name(); + default -> relasjonType.name(); + }; + } - var hentingMedFeil = tpsPersoner.entrySet().stream() - .filter(entry -> nonNull(entry.getValue().getTpsPersonData()) && - nonNull(entry.getValue().getTpsPersonData().getTpsSvar()) && - !isStatusOK(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus())) - .map(entry -> PersonMiljoeDTO.builder() - .miljoe(entry.getKey()) - .status("FEIL") - .melding(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus().getReturMelding()) - .utfyllendeMelding(entry.getValue().getTpsPersonData().getTpsSvar().getSvarStatus().getUtfyllendeMelding()) - .build()) - .toList(); + private static boolean isStatusOK(TpsMeldingResponse response) { - return Stream.of(personerMedRelasjoner, hentingMedFeil) - .flatMap(Collection::stream) - .filter(entry -> isBlank(entry.getUtfyllendeMelding()) || !NOT_FOUND.equals(entry.getUtfyllendeMelding())) - .toList(); + return STATUS_OK.equals(response.getReturStatus()); } @Data diff --git a/apps/tps-messaging-service/src/main/resources/logback-spring.xml b/apps/tps-messaging-service/src/main/resources/logback-spring.xml index 7315b50154..e8daa936d9 100644 --- a/apps/tps-messaging-service/src/main/resources/logback-spring.xml +++ b/apps/tps-messaging-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/udi-stub/src/main/resources/logback-spring.xml b/apps/udi-stub/src/main/resources/logback-spring.xml index ca13d7d7df..2bc01b7e3b 100644 --- a/apps/udi-stub/src/main/resources/logback-spring.xml +++ b/apps/udi-stub/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/apps/varslinger-service/src/main/resources/logback-spring.xml b/apps/varslinger-service/src/main/resources/logback-spring.xml index 156b355cbd..cd1b535de3 100644 --- a/apps/varslinger-service/src/main/resources/logback-spring.xml +++ b/apps/varslinger-service/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 @@ -24,7 +24,7 @@ - + true 256 diff --git a/examples/reactive-rest-example/src/main/resources/logback-spring.xml b/examples/reactive-rest-example/src/main/resources/logback-spring.xml index a9d860bed2..9c11d274d5 100644 --- a/examples/reactive-rest-example/src/main/resources/logback-spring.xml +++ b/examples/reactive-rest-example/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/libs/commands/src/main/java/no/nav/testnav/libs/commands/utils/DollyLogbackEncoder.java b/libs/commands/src/main/java/no/nav/testnav/libs/commands/utils/DollyLogbackEncoder.java new file mode 100644 index 0000000000..3dbbe7c943 --- /dev/null +++ b/libs/commands/src/main/java/no/nav/testnav/libs/commands/utils/DollyLogbackEncoder.java @@ -0,0 +1,30 @@ +package no.nav.testnav.libs.commands.utils; + +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.ILoggingEvent; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class DollyLogbackEncoder extends PatternLayout { + // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((? - + true 256 diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml +++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml index a2220412d3..1e161bea34 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml +++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/histark-proxy/src/main/resources/logback-spring.xml +++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/inst-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml index fac51a6eb4..dea71165cf 100644 --- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml +++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/medl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml +++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml index 1a9ce7a5e5..3147325b2c 100644 --- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml index 776178e5c7..9aae3bfb75 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/saf-proxy/src/main/resources/logback-spring.xml +++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml index e8c92e3122..991d6e38cf 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml +++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml index de8c7308e9..8f79e8b8f6 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml +++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256 diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml index 52c15597b3..31531686ef 100644 --- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + true 256