From 4f762760e7db12bbd431ce2e7f6fd7ccbb103482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Thu, 16 Nov 2023 10:00:42 +0100 Subject: [PATCH] Feature/open search ny start (#3323) Elastic/opensearch funksjonalitet lagt til --- apps/dolly-backend/README.md | 6 + apps/dolly-backend/build.gradle | 13 +- apps/dolly-backend/config.test.yml | 3 + apps/dolly-backend/config.yml | 3 + apps/dolly-backend/settings.gradle | 1 + .../dolly/DollyBackendApplicationStarter.java | 3 +- .../ArbeidsplassenCVClient.java | 2 +- .../arbeidsplassencv/dto/PAMCVDTO.java | 2 +- ...rbeidsplassenCVRequestMappingStrategy.java | 2 +- .../inntektstub/domain/Inntekt.java | 6 + .../KontoregisterClient.java | 6 +- .../KontoregisterConsumer.java | 8 +- .../command/KontoregisterDeleteCommand.java | 4 +- .../command/KontoregisterGetCommand.java | 6 +- .../command/KontoregisterPostCommand.java | 4 +- .../BankkontonrNorskMappingStrategy.java | 4 +- .../BankkontonrUtlandskMappingStrategy.java | 6 +- .../bestilling/pdldata/PdlDataConsumer.java | 8 +- .../command/PdlDataCheckIdentCommand.java | 2 +- .../pdldata/command/PdlDataHentCommand.java | 2 +- .../command/PdlDataOppdateringCommand.java | 2 +- .../command/PdlDataOpprettingCommand.java | 2 +- .../PensjonforvalterClient.java | 8 +- .../domain/PensjonSivilstandWrapper.java | 2 +- .../mapper/PensjonSamboerMappingStrategy.java | 2 +- .../personservice/PersonServiceClient.java | 4 +- .../service/DollyBestillingService.java | 26 ++ .../service/GjenopprettBestillingService.java | 13 +- .../service/GjenopprettGruppeService.java | 13 +- .../service/GjenopprettIdentService.java | 13 +- .../ImportAvPersonerFraPdlService.java | 15 +- .../service/LeggTilPaaGruppeService.java | 19 +- .../service/OppdaterPersonService.java | 19 +- .../OpprettPersonerByKriterierService.java | 15 +- ...PersonerFraIdenterMedKriterierService.java | 17 +- .../bestilling/service/OriginatorUtility.java | 2 +- .../mapper/SykemeldingMappingStrategy.java | 2 +- .../TagsHendelseslagerClient.java | 6 +- .../TpsMessagingClient.java | 8 +- .../TpsMessagingConsumer.java | 10 +- .../command/EgenansattDeleteCommand.java | 2 +- .../command/EgenansattPostCommand.java | 2 +- .../command/PersonGetCommand.java | 2 +- .../SikkerhetstiltakDeleteCommand.java | 2 +- .../command/TelefonnummerDeleteCommand.java | 2 +- .../command/TpsMessagingPostCommand.java | 2 +- .../mapper/TpsMessagingMappingStrategy.java | 11 +- .../service/TpsPersonService.java | 2 +- .../no/nav/dolly/config/OpenSearchConfig.java | 45 ++++ .../dolly/config/OpenSearchLocalConfig.java | 37 +++ .../java/no/nav/dolly/domain/PdlPerson.java | 44 ++-- .../domain/resultset/BestilteKriterier.java | 2 +- .../domain/resultset/RsDollyBestilling.java | 7 +- .../dolly/domain/resultset/SystemTyper.java | 1 - .../dolly/domain/resultset/aareg/RsAareg.java | 6 +- .../domain/resultset/aareg/RsAktoer.java | 11 +- .../resultset/aareg/RsAktoerPerson.java | 12 +- .../resultset/aareg/RsAnsettelsesPeriode.java | 5 + .../resultset/aareg/RsArbeidsavtale.java | 6 + .../resultset/aareg/RsOrganisasjon.java | 12 +- .../resultset/aareg/RsPeriodeAareg.java | 5 + .../resultset/aareg/RsPeriodeAmelding.java | 5 + .../arenaforvalter/ArenaPeriode.java | 5 + .../resultset/arenaforvalter/RsArenaAap.java | 5 + .../arenaforvalter/RsArenaAap115.java | 7 + .../arenaforvalter/RsArenaDagpenger.java | 4 + .../domain/resultset/breg/RsBregdata.java | 4 + .../entity/bestilling/RsBestillingStatus.java | 2 +- .../bestilling/RsMalBestillingWrapper.java | 2 +- .../domain/resultset/histark/RsHistark.java | 6 + .../RsInntektsmelding.java | 12 + .../domain/resultset/inntektstub/Inntekt.java | 5 + .../inntektstub/RsInntektsinformasjon.java | 9 + .../inntektstub/Tilleggsinformasjon.java | 5 + .../domain/resultset/inst/RsInstdata.java | 7 + .../kontoregister/BankkontoData.java | 4 +- .../krrstub/RsDigitalKontaktdata.java | 4 + .../dolly/domain/resultset/medl/RsMedl.java | 5 + .../resultset/pdldata/PdlPersondata.java | 9 +- .../domain/resultset/pensjon/PensjonData.java | 14 +- .../resultset/skjerming/RsSkjerming.java | 5 + .../resultset/sykemelding/RsSykemelding.java | 8 + .../NorskBankkontoRequest.java | 2 +- .../tpsmessagingservice/RsTpsMessaging.java | 9 +- .../UtenlandskBankkontoRequest.java | 2 +- .../resultset/udistub/model/RsUdiPeriode.java | 8 +- .../resultset/udistub/model/RsUdiPerson.java | 4 + .../opphold/RsUdiAvslagEllerBortfall.java | 10 + .../opphold/RsUdiOppholdSammeVilkaar.java | 9 +- .../model/opphold/RsUdiOppholdStatus.java | 13 +- .../opphold/RsUdiUtvistMedInnreiseForbud.java | 8 +- .../elastic/BestillingElasticRepository.java | 7 + .../nav/dolly/elastic/ElasticBestilling.java | 144 +++++++++++ .../no/nav/dolly/elastic/ElasticTyper.java | 37 +++ .../consumer/ElasticParamsConsumer.java | 34 +++ .../consumer/command/ElasticPutCommand.java | 40 +++ .../nav/dolly/elastic/dto/PersonRequest.java | 65 +++++ .../nav/dolly/elastic/dto/SearchRequest.java | 30 +++ .../nav/dolly/elastic/dto/SearchResponse.java | 24 ++ .../ElasticBestillingStrategyMapping.java | 103 ++++++++ .../service/ElasticsearchSearchService.java | 175 +++++++++++++ .../elastic/service/SearchHelperService.java | 106 ++++++++ .../dolly/elastic/utils/OpensearchImport.java | 106 ++++++++ .../dolly/elastic/utils/PersonQueryUtils.java | 228 +++++++++++++++++ .../BestillingPdlOrdreStatusMapper.java | 6 +- .../strategy/OriginatorMappingStrategy.java | 4 +- .../dolly/properties/CredentialsProps.java | 40 --- .../no/nav/dolly/properties/Environment.java | 5 - .../no/nav/dolly/properties/JiraProps.java | 17 -- .../dolly/provider/api/ElasticController.java | 81 ++++++ .../nav/dolly/provider/api/TagController.java | 6 +- .../BestillingProgressRepository.java | 2 + .../nav/dolly/service/BestillingService.java | 21 +- .../nav/dolly/service/NavigasjonService.java | 12 +- .../no/nav/dolly/service/PersonService.java | 12 +- .../service/excel/BankkontoExcelService.java | 6 +- .../service/excel/PersonExcelService.java | 16 +- .../src/main/resources/application-dev.yaml | 2 +- .../src/main/resources/application-local.yaml | 9 + .../src/main/resources/application.yaml | 4 + .../src/main/resources/logback-spring.xml | 2 + .../bestilling/aareg/AaregConsumerTest.java | 8 + .../ArenaForvalterConsumerTest.java | 8 + .../instdata/InstdataConsumerTest.java | 8 + .../KontoregisterConsumerTest.java | 14 +- .../BankkontonrNorskMappingStrategyTest.java | 4 +- .../krrstub/KrrstubConsumerTest.java | 8 + .../PensjonforvalterConsumerTest.java | 8 + .../PensjonSamboerMappingStrategyTest.java | 2 +- .../sigrunstub/SigrunStubConsumerTest.java | 9 +- .../TpsMessagingConsumerTest.java | 10 +- .../no/nav/dolly/config/OpenSearchConfig.java | 34 +++ .../TestgruppeMappingStrategyTest.java | 11 + .../provider/api/AbstractControllerTest.java | 9 + .../provider/api/ElasticControllerTest.java | 222 +++++++++++++++++ .../service/BestillingMalServiceTest.java | 25 +- .../OrganisasjonBestillingMalServiceTest.java | 18 +- .../src/test/resources/application-test.yaml | 7 + apps/endringsmelding-service/build.gradle | 1 + apps/endringsmelding-service/settings.gradle | 1 + .../consumer/TpsMessagingConsumer.java | 2 +- .../command/GetIdentEnvironmentsCommand.java | 2 +- .../controller/IdentMiljoeController.java | 2 +- .../src/main/resources/application.yml | 3 + apps/import-person-service/build.gradle | 2 +- apps/import-person-service/settings.gradle | 2 +- ...ersonServiceServiceApplicationStarter.java | 5 +- .../consumer/PdlForvalterConsumer.java | 2 +- .../command/SendPersonTilPdlCommand.java | 2 +- .../consumer/dto/NavnDTO.java | 2 +- .../consumer/dto/PersonDTO.java | 5 +- .../src/main/resources/application.yml | 3 + apps/oppsummeringsdokument-service/config.yml | 1 - apps/pdl-forvalter/build.gradle | 1 + apps/pdl-forvalter/settings.gradle | 1 + .../consumer/AdresseServiceConsumer.java | 4 +- .../consumer/PdlTestdataConsumer.java | 10 +- .../MatrikkeladresseServiceCommand.java | 2 +- .../command/PdlAktoerNpidCommand.java | 4 +- .../consumer/command/PdlDeleteCommandPdl.java | 4 +- .../command/PdlOpprettArtifactCommandPdl.java | 4 +- .../command/PdlOpprettPersonCommandPdl.java | 4 +- .../consumer/command/PdlTestdataCommand.java | 4 +- .../command/VegadresseServiceCommand.java | 2 +- .../controller/EksistensController.java | 2 +- .../controller/IdentitetController.java | 2 +- .../controller/PersonController.java | 60 ++--- .../pdl/forvalter/database/JSONUserType.java | 2 +- .../forvalter/database/model/DbPerson.java | 2 +- .../forvalter/database/model/DbRelasjon.java | 2 +- .../nav/pdl/forvalter/dto/ArtifactValue.java | 4 +- .../dto/FolkeregisterPersonstatus.java | 4 +- .../no/nav/pdl/forvalter/dto/IdentDTO.java | 2 +- .../pdl/forvalter/dto/IdentpoolStatusDTO.java | 4 +- .../nav/pdl/forvalter/dto/OpprettIdent.java | 2 +- .../nav/pdl/forvalter/dto/OpprettRequest.java | 2 +- .../java/no/nav/pdl/forvalter/dto/Ordre.java | 2 +- .../no/nav/pdl/forvalter/dto/PdlDelete.java | 2 +- .../pdl/forvalter/dto/PdlFalskIdentitet.java | 6 +- .../pdl/forvalter/dto/PdlKontaktadresse.java | 6 +- .../no/nav/pdl/forvalter/dto/PdlNavn.java | 2 +- .../pdl/forvalter/dto/PdlOpprettPerson.java | 2 +- .../nav/pdl/forvalter/dto/PdlSivilstand.java | 2 +- .../dto/PdlTilrettelagtKommunikasjon.java | 2 +- .../nav/pdl/forvalter/dto/PdlVergemaal.java | 2 +- .../dto/PersonUtenIdentifikatorRequest.java | 4 +- .../mapper/FalskIdentitetMappingStrategy.java | 2 +- ...keregisterPersonstatusMappingStrategy.java | 2 +- .../mapper/IdentPoolMappingStrategy.java | 10 +- ...tInformasjonForDoedsboMappingStrategy.java | 4 +- .../mapper/KontaktadresseMappingStrategy.java | 4 +- .../mapper/PersonMappingStrategy.java | 2 +- ...rettelagtKommunikasjonMappingStrategy.java | 2 +- .../mapper/VegadresseMappingStrategy.java | 2 +- .../mapper/VergemaalMappingStrategy.java | 8 +- .../pdl/forvalter/service/AdresseService.java | 8 +- .../service/AdressebeskyttelseService.java | 14 +- .../service/ArtifactDeleteService.java | 14 +- .../service/ArtifactGjeldendeService.java | 24 +- .../service/ArtifactUpdateService.java | 70 +++--- .../pdl/forvalter/service/BiValidation.java | 2 +- .../service/BostedAdresseService.java | 20 +- .../service/CreatePersonService.java | 24 +- .../CreatePersonUtenIdentifikatorService.java | 14 +- .../forvalter/service/DeltBostedService.java | 12 +- .../pdl/forvalter/service/DeployService.java | 6 +- .../service/DoedfoedtBarnService.java | 2 +- .../forvalter/service/DoedsfallService.java | 2 +- .../forvalter/service/EksistensService.java | 2 +- .../service/EnkelAdresseService.java | 12 +- .../service/FalskIdentitetService.java | 16 +- .../pdl/forvalter/service/FoedselService.java | 12 +- .../FolkeregisterPersonstatusService.java | 36 +-- .../service/ForelderBarnRelasjonService.java | 28 +-- .../service/ForeldreansvarService.java | 34 +-- .../forvalter/service/FullmaktService.java | 10 +- .../forvalter/service/IdentitetService.java | 2 +- .../forvalter/service/IdenttypeService.java | 30 +-- .../forvalter/service/InnflyttingService.java | 14 +- .../pdl/forvalter/service/KjoennService.java | 6 +- .../service/KontaktAdresseService.java | 22 +- .../KontaktinformasjonForDoedsboService.java | 20 +- .../pdl/forvalter/service/MergeService.java | 6 +- .../service/MetadataTidspunkterService.java | 38 +-- .../pdl/forvalter/service/NavnService.java | 8 +- .../pdl/forvalter/service/OppholdService.java | 2 +- .../service/OppholdsadresseService.java | 22 +- .../forvalter/service/PdlArtifactService.java | 4 +- .../forvalter/service/PdlOrdreService.java | 80 +++--- .../service/PersonArtifactService.java | 2 +- .../pdl/forvalter/service/PersonService.java | 28 +-- .../forvalter/service/RelasjonService.java | 2 +- .../service/RelasjonerAlderService.java | 8 +- .../service/SikkerhetstiltakService.java | 6 +- .../forvalter/service/SivilstandService.java | 20 +- .../service/StatsborgerskapService.java | 10 +- .../forvalter/service/SwopIdentsService.java | 12 +- .../service/TelefonnummerService.java | 4 +- .../TilrettelagtKommunikasjonService.java | 2 +- .../UnhookEksternePersonerService.java | 26 +- ...UtenlandsidentifikasjonsnummerService.java | 2 +- .../forvalter/service/UtflyttingService.java | 16 +- .../service/ValidateArtifactsService.java | 4 +- .../nav/pdl/forvalter/service/Validation.java | 2 +- .../forvalter/service/VergemaalService.java | 10 +- .../utils/DeleteRelasjonerUtility.java | 36 +-- .../forvalter/utils/FoedselsdatoUtility.java | 4 +- .../utils/IdenttypeFraIdentUtility.java | 8 +- .../utils/KjoennFraIdentUtility.java | 6 +- .../pdl/forvalter/utils/KjoennUtility.java | 8 +- .../utils/Kor2024KommuneEndringer.java | 4 +- .../pdl/forvalter/utils/PdlTestDataUrls.java | 58 ++--- .../src/main/resources/application.yaml | 3 + .../AdressebeskyttelseServiceTest.java | 16 +- .../service/ArtifactGjeldendeServiceTest.java | 14 +- .../service/BostedAdresseServiceTest.java | 18 +- .../service/DoedfoedtBarnServiceTest.java | 2 +- .../service/DoedsfallServiceTest.java | 2 +- .../service/FalskIdentitetServiceTest.java | 2 +- .../forvalter/service/FoedselServiceTest.java | 16 +- .../FolkeregisterPersonstatusServiceTest.java | 32 +-- .../ForelderBarnRelasjonServiceTest.java | 18 +- .../service/ForeldreansvarServiceTest.java | 10 +- .../service/FullmaktServiceTest.java | 2 +- .../service/IdenttypeServiceTest.java | 4 +- .../service/InnflyttingServiceTest.java | 4 +- .../forvalter/service/KjoennServiceTest.java | 8 +- .../service/KontaktAdresseServiceTest.java | 10 +- ...ntaktinformasjonForDoedsboServiceTest.java | 10 +- .../forvalter/service/NavnServiceTest.java | 4 +- .../forvalter/service/OppholdServiceTest.java | 6 +- .../service/OppholdsadresseServiceTest.java | 14 +- .../service/RelasjonerAlderServiceTest.java | 12 +- .../service/SikkerhetstiltakServiceTest.java | 4 +- .../service/SivilstandServiceTest.java | 8 +- .../service/StatsborgerskapServiceTest.java | 6 +- .../service/TelefonnummerServiceTest.java | 2 +- .../TilrettelagtKommunikasjonServiceTest.java | 2 +- ...landsidentifikasjonsnummerServiceTest.java | 2 +- .../service/UtflyttingServiceTest.java | 4 +- .../service/VergemaalServiceTest.java | 6 +- .../utils/DeleteRelasjonerUtilityTest.java | 12 +- .../src/main/resources/application.yml | 4 + apps/tps-messaging-service/build.gradle | 2 +- apps/tps-messaging-service/settings.gradle | 2 +- .../dto/KontaktopplysningerRequest.java | 2 +- .../dto/TelefonnummerRequest.java | 2 +- .../mapper/AdresseMappingStrategy.java | 12 +- .../BankkontonrNorskMappingStrategy.java | 2 +- .../BankkontonrUtlandMappingStrategy.java | 2 +- .../mapper/S610PersonMappingStrategy.java | 32 +-- .../SikkerhetstiltakMappingStrategy.java | 2 +- .../mapper/SivilstandMappingStrategy.java | 2 +- .../mapper/SpraakMappingStrategy.java | 2 +- .../StatsborgerskapMappingStrategy.java | 2 +- .../mapper/TelefonnummerMappingStrategy.java | 4 +- .../provider/v1/IdentController.java | 2 +- .../provider/v1/PersonController.java | 14 +- .../service/BankkontoNorskService.java | 2 +- .../service/BankkontoUtlandService.java | 2 +- .../service/IdentService.java | 2 +- .../service/PersonService.java | 12 +- .../service/SikkerhetstiltakService.java | 2 +- .../service/SpraakService.java | 2 +- .../service/TelefonnummerService.java | 2 +- .../src/main/resources/application.yaml | 4 + libs/data-transfer-objects/build.gradle | 1 - .../v1/FolkeregistermetadataDTO.java | 21 -- .../libs/dto/pdlforvalter/v1/PdlStatus.java | 5 - .../pdlforvalter/v1/StatsborgerskapDTO.java | 22 -- .../data-transfer-search-objects/build.gradle | 101 ++++++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + libs/data-transfer-search-objects/gradlew | 234 ++++++++++++++++++ libs/data-transfer-search-objects/gradlew.bat | 89 +++++++ .../gradlewUpdate.sh | 3 + .../settings.gradle | 13 + .../v1/ArbeidsplassenCVDTO.java | 20 +- .../v1/BankkontonrNorskDTO.java | 6 +- .../v1/BankkontonrUtlandDTO.java | 6 +- .../v1/HentKontoRequestDTO.java | 2 +- .../v1/HentKontoResponseDTO.java | 2 +- .../libs/data/kontoregister}/v1/KontoDTO.java | 2 +- .../v1/KontoregisterResponseDTO.java | 2 +- .../v1/OppdaterKontoRequestDTO.java | 2 +- .../v1/OppdaterKontoResponseDTO.java | 2 +- .../v1/SlettKontoRequestDTO.java | 2 +- .../kontoregister}/v1/UtenlandskKontoDTO.java | 2 +- .../data}/pdlforvalter/v1/AdresseDTO.java | 9 +- .../v1/AdressebeskyttelseDTO.java | 2 +- .../v1/AvailibilityResponseDTO.java | 2 +- .../pdlforvalter/v1/BestillingRequestDTO.java | 7 +- .../pdlforvalter/v1/BostedadresseDTO.java | 6 +- .../data}/pdlforvalter/v1/DbVersjonDTO.java | 2 +- .../data}/pdlforvalter/v1/DeltBostedDTO.java | 7 +- .../pdlforvalter/v1/DoedfoedtBarnDTO.java | 6 +- .../data}/pdlforvalter/v1/DoedsfallDTO.java | 6 +- .../pdlforvalter/v1/FalskIdentitetDTO.java | 7 +- .../data}/pdlforvalter/v1/FoedselDTO.java | 6 +- .../v1/FolkeregisterPersonstatusDTO.java | 7 +- .../v1/FolkeregistermetadataDTO.java | 27 ++ .../v1/ForelderBarnRelasjonDTO.java | 2 +- .../pdlforvalter/v1/ForeldreansvarDTO.java | 7 +- .../data}/pdlforvalter/v1/FullPersonDTO.java | 8 +- .../data}/pdlforvalter/v1/FullmaktDTO.java | 7 +- .../pdlforvalter/v1/IdentRequestDTO.java | 7 +- .../libs/data}/pdlforvalter/v1/Identtype.java | 2 +- .../data}/pdlforvalter/v1/InnflyttingDTO.java | 6 +- .../libs/data}/pdlforvalter/v1/KjoennDTO.java | 2 +- .../pdlforvalter/v1/KontaktadresseDTO.java | 2 +- .../v1/KontaktinformasjonForDoedsboDTO.java | 7 +- .../pdlforvalter/v1/MatrikkeladresseDTO.java | 2 +- .../libs/data}/pdlforvalter/v1/NavnDTO.java | 6 +- .../data}/pdlforvalter/v1/OppholdDTO.java | 7 +- .../pdlforvalter/v1/OppholdsadresseDTO.java | 4 +- .../pdlforvalter/v1/OrdreRequestDTO.java | 2 +- .../pdlforvalter/v1/OrdreResponseDTO.java | 2 +- .../data}/pdlforvalter/v1/PdlArtifact.java | 2 +- .../libs/data/pdlforvalter/v1/PdlStatus.java | 5 + .../libs/data}/pdlforvalter/v1/PersonDTO.java | 12 +- .../data}/pdlforvalter/v1/PersonIDDTO.java | 2 +- .../pdlforvalter/v1/PersonRequestDTO.java | 7 +- .../v1/PersonUpdateRequestDTO.java | 2 +- .../data}/pdlforvalter/v1/PersonnavnDTO.java | 2 +- .../data}/pdlforvalter/v1/RelasjonType.java | 2 +- .../pdlforvalter/v1/RelatertBiPersonDTO.java | 6 +- .../pdlforvalter/v1/SikkerhetstiltakDTO.java | 7 +- .../data}/pdlforvalter/v1/SivilstandDTO.java | 7 +- .../pdlforvalter/v1/StatsborgerskapDTO.java | 28 +++ .../pdlforvalter/v1/TelefonnummerDTO.java | 2 +- .../v1/TilrettelagtKommunikasjonDTO.java | 2 +- .../pdlforvalter/v1/UkjentBostedDTO.java | 2 +- .../pdlforvalter/v1/UtenlandskAdresseDTO.java | 2 +- .../UtenlandskIdentifikasjonsnummerDTO.java | 2 +- .../data}/pdlforvalter/v1/UtflyttingDTO.java | 6 +- .../data}/pdlforvalter/v1/VegadresseDTO.java | 2 +- .../data}/pdlforvalter/v1/VergemaalDTO.java | 7 +- .../pdlforvalter/v1/VergemaalEmbete.java | 2 +- .../pdlforvalter/v1/VergemaalMandattype.java | 2 +- .../pdlforvalter/v1/VergemaalSakstype.java | 2 +- .../OppholdAnnetStedEnumDeserializer.java | 4 +- .../tpsmessagingservice/v1/AdresseDTO.java | 2 +- .../v1/AdresseUtlandDTO.java | 2 +- .../v1/GateadresseDTO.java | 2 +- .../v1/InnvandretUtvandretDTO.java | 2 +- .../v1/MatrikkeladresseDTO.java | 2 +- .../v1/MidlertidigAdresseDTO.java | 2 +- .../v1/MidlertidigAdressetypeDTO.java | 2 +- .../tpsmessagingservice/v1/PersonDTO.java | 6 +- .../v1/PersonMiljoeDTO.java | 2 +- .../v1/PostadresseDTO.java | 2 +- .../tpsmessagingservice/v1/RelasjonDTO.java | 2 +- .../v1/SikkerhetTiltakDTO.java | 2 +- .../tpsmessagingservice/v1/SivilstandDTO.java | 2 +- .../tpsmessagingservice/v1/SpraakDTO.java | 2 +- .../v1/StatsborgerskapDTO.java | 2 +- .../v1/TelefonTypeNummerDTO.java | 2 +- .../v1/TpsIdentStatusDTO.java | 2 +- .../v1/TpsMeldingResponseDTO.java | 2 +- settings.gradle | 1 + 400 files changed, 3652 insertions(+), 1155 deletions(-) create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticTyper.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/command/ElasticPutCommand.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/PersonRequest.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchRequest.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchResponse.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/mapper/ElasticBestillingStrategyMapping.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/ElasticsearchSearchService.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/SearchHelperService.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/OpensearchImport.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/PersonQueryUtils.java delete mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/properties/CredentialsProps.java delete mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/properties/Environment.java delete mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/properties/JiraProps.java create mode 100644 apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/ElasticController.java create mode 100644 apps/dolly-backend/src/test/java/no/nav/dolly/config/OpenSearchConfig.java create mode 100644 apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/ElasticControllerTest.java delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregistermetadataDTO.java delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlStatus.java delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/StatsborgerskapDTO.java create mode 100644 libs/data-transfer-search-objects/build.gradle create mode 100644 libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.jar create mode 100644 libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties create mode 100755 libs/data-transfer-search-objects/gradlew create mode 100644 libs/data-transfer-search-objects/gradlew.bat create mode 100755 libs/data-transfer-search-objects/gradlewUpdate.sh create mode 100644 libs/data-transfer-search-objects/settings.gradle rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java (82%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/BankkontonrNorskDTO.java (57%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/BankkontonrUtlandDTO.java (62%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/HentKontoRequestDTO.java (80%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/HentKontoResponseDTO.java (84%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/KontoDTO.java (90%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/KontoregisterResponseDTO.java (87%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/OppdaterKontoRequestDTO.java (87%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/OppdaterKontoResponseDTO.java (87%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/SlettKontoRequestDTO.java (86%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister}/v1/UtenlandskKontoDTO.java (90%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/AdresseDTO.java (69%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/AdressebeskyttelseDTO.java (92%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/AvailibilityResponseDTO.java (85%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/BestillingRequestDTO.java (59%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/BostedadresseDTO.java (76%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/DbVersjonDTO.java (96%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/DeltBostedDTO.java (64%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/DoedfoedtBarnDTO.java (50%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/DoedsfallDTO.java (50%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/FalskIdentitetDTO.java (84%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/FoedselDTO.java (57%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java (59%) create mode 100644 libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregistermetadataDTO.java rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/ForelderBarnRelasjonDTO.java (97%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/ForeldreansvarDTO.java (71%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/FullPersonDTO.java (64%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/FullmaktDTO.java (65%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/IdentRequestDTO.java (68%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/Identtype.java (51%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/InnflyttingDTO.java (56%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/KjoennDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/KontaktadresseDTO.java (98%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java (86%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/MatrikkeladresseDTO.java (90%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/NavnDTO.java (57%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/OppholdDTO.java (51%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/OppholdsadresseDTO.java (88%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/OrdreRequestDTO.java (83%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/OrdreResponseDTO.java (96%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/PdlArtifact.java (94%) create mode 100644 libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlStatus.java rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/PersonDTO.java (94%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/PersonIDDTO.java (86%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/PersonRequestDTO.java (64%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/PersonUpdateRequestDTO.java (82%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/PersonnavnDTO.java (87%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/RelasjonType.java (87%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/RelatertBiPersonDTO.java (54%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/SikkerhetstiltakDTO.java (71%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/SivilstandDTO.java (81%) create mode 100644 libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/StatsborgerskapDTO.java rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/TelefonnummerDTO.java (88%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java (93%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/UkjentBostedDTO.java (85%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/UtenlandskAdresseDTO.java (96%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java (93%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/UtflyttingDTO.java (65%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/VegadresseDTO.java (91%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/VergemaalDTO.java (66%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/VergemaalEmbete.java (93%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/VergemaalMandattype.java (92%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/VergemaalSakstype.java (92%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java (86%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/AdresseDTO.java (94%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/AdresseUtlandDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/GateadresseDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/InnvandretUtvandretDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/MatrikkeladresseDTO.java (90%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/MidlertidigAdresseDTO.java (97%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java (58%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/PersonDTO.java (91%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/PersonMiljoeDTO.java (91%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/PostadresseDTO.java (88%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/RelasjonDTO.java (88%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/SikkerhetTiltakDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/SivilstandDTO.java (87%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/SpraakDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/StatsborgerskapDTO.java (88%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/TelefonTypeNummerDTO.java (88%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/TpsIdentStatusDTO.java (89%) rename libs/{data-transfer-objects/src/main/java/no/nav/testnav/libs/dto => data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data}/tpsmessagingservice/v1/TpsMeldingResponseDTO.java (88%) diff --git a/apps/dolly-backend/README.md b/apps/dolly-backend/README.md index 5a7cd6e8460..23c2a347fd7 100644 --- a/apps/dolly-backend/README.md +++ b/apps/dolly-backend/README.md @@ -40,3 +40,9 @@ DOCKER_HOST=unix://${HOME}/.colima/default/docker.sock TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock TESTCONTAINERS_RYUK_DISABLED=true ``` + +For å kjøre lokalt med elastic search: + +``` +docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" --name opensearch-node -d opensearchproject/opensearch:latest +``` \ No newline at end of file diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 3392f791ca2..2d6faaa0b92 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/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-dolly-backend" @@ -65,14 +65,13 @@ repositories { dependencies { - implementation platform('org.testcontainers:testcontainers-bom:1.19.1') - implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.libs:servlet-insecure-security' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:database' implementation 'no.nav.testnav.libs:data-transfer-objects' + implementation 'no.nav.testnav.libs:data-transfer-search-objects' implementation 'no.nav.testnav.libs:reactive-core' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' @@ -92,6 +91,9 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.retry:spring-retry:2.0.0' + implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' + implementation 'org.opensearch.client:spring-data-opensearch:1.2.0' + implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'com.github.ben-manes.caffeine:caffeine' @@ -107,6 +109,8 @@ dependencies { implementation 'org.apache.poi:poi-ooxml:5.2.3' testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation 'org.opensearch:opensearch-testcontainers:2.0.0' + testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'com.h2database:h2' @@ -114,6 +118,7 @@ dependencies { testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' testImplementation 'org.bitbucket.b_c:jose4j:0.9.3' + implementation 'net.java.dev.jna:jna:5.13.0' annotationProcessor 'org.projectlombok:lombok' diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml index 44a619bad94..2d00a455023 100644 --- a/apps/dolly-backend/config.test.yml +++ b/apps/dolly-backend/config.test.yml @@ -71,6 +71,9 @@ spec: enabled: true tenant: nav.no image: {{image}} + openSearch: + instance: bestillinger-dev + access: admin env: - name: SPRING_PROFILES_ACTIVE value: dev diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml index bc6f805448a..a9d5f98a273 100644 --- a/apps/dolly-backend/config.yml +++ b/apps/dolly-backend/config.yml @@ -78,6 +78,9 @@ spec: enabled: true tenant: nav.no image: {{image}} + openSearch: + instance: bestillinger + access: admin env: - name: SPRING_PROFILES_ACTIVE value: prod diff --git a/apps/dolly-backend/settings.gradle b/apps/dolly-backend/settings.gradle index 5717c7262a2..c1551aa80b4 100644 --- a/apps/dolly-backend/settings.gradle +++ b/apps/dolly-backend/settings.gradle @@ -11,6 +11,7 @@ includeBuild '../../libs/servlet-insecure-security' includeBuild '../../libs/security-core' includeBuild '../../libs/database' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/data-transfer-search-objects' includeBuild '../../.github/workflows' gradleEnterprise { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java index 317d2b3da4a..d0743b7b81b 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java @@ -2,8 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; -@SpringBootApplication +@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) public class DollyBackendApplicationStarter { public static void main(String[] args) { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVClient.java index 11ba599fea5..e2d30b28572 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVClient.java @@ -12,7 +12,7 @@ import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.util.CallIdUtil; import no.nav.dolly.util.TransactionHelperService; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/dto/PAMCVDTO.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/dto/PAMCVDTO.java index 4436d02bded..4a6a324783f 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/dto/PAMCVDTO.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/dto/PAMCVDTO.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/mapper/ArbeidsplassenCVRequestMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/mapper/ArbeidsplassenCVRequestMappingStrategy.java index e896dda5cf7..1dd66c9d06b 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/mapper/ArbeidsplassenCVRequestMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/mapper/ArbeidsplassenCVRequestMappingStrategy.java @@ -7,7 +7,7 @@ import no.nav.dolly.bestilling.arbeidsplassencv.dto.PAMCVDTO; import no.nav.dolly.exceptions.DollyFunctionalException; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import org.springframework.stereotype.Component; import org.springframework.util.ReflectionUtils; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntekt.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntekt.java index 8c41c208b6d..5fc71a431b3 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntekt.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntekt.java @@ -5,6 +5,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; @@ -22,7 +25,10 @@ public enum InntektType {LOENNSINNTEKT, YTELSE_FRA_OFFENTLIGE, PENSJON_ELLER_TRY private InntektType inntektstype; private Double beloep; + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDate startOpptjeningsperiode; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDate sluttOpptjeningsperiode; private Boolean inngaarIGrunnlagForTrekk; private Boolean utloeserArbeidsgiveravgift; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterClient.java index 518ed321eda..13bd3097677 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterClient.java @@ -11,9 +11,9 @@ import no.nav.dolly.domain.resultset.dolly.DollyPerson; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.util.TransactionHelperService; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumer.java index b63264a0c14..f26212ace0f 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumer.java @@ -8,10 +8,10 @@ import no.nav.dolly.bestilling.kontoregisterservice.command.KontoregisterPostCommand; import no.nav.dolly.config.Consumers; import no.nav.dolly.metrics.Timed; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoResponseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.HentKontoResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.springframework.http.client.reactive.ReactorClientHttpConnector; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterDeleteCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterDeleteCommand.java index 58177aa8738..e79b88444fd 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterDeleteCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterDeleteCommand.java @@ -2,8 +2,8 @@ import lombok.RequiredArgsConstructor; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.SlettKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.SlettKontoRequestDTO; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterGetCommand.java index 47ff7eeb014..87109f69bbd 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterGetCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterGetCommand.java @@ -2,9 +2,9 @@ import lombok.RequiredArgsConstructor; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoResponseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoDTO; +import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.HentKontoResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.KontoDTO; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterPostCommand.java index e25a38729f7..80b35468e4e 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterPostCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterPostCommand.java @@ -2,8 +2,8 @@ import lombok.RequiredArgsConstructor; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategy.java index e42123785cd..103bea0f5c7 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategy.java @@ -5,8 +5,8 @@ import ma.glasnost.orika.MappingContext; import no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; import org.apache.commons.lang3.BooleanUtils; import org.springframework.stereotype.Component; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrUtlandskMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrUtlandskMappingStrategy.java index 953c6213b15..be84d48de0d 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrUtlandskMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrUtlandskMappingStrategy.java @@ -6,9 +6,9 @@ import no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator; import no.nav.dolly.bestilling.kontoregisterservice.util.KontoregisterLandkode; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.UtenlandskKontoDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.UtenlandskKontoDTO; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java index 2da8a245f32..74b20add474 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java @@ -16,10 +16,10 @@ import no.nav.dolly.config.Consumers; import no.nav.dolly.metrics.Timed; import no.nav.dolly.util.JacksonExchangeStrategyUtil; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.springframework.http.client.reactive.ReactorClientHttpConnector; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataCheckIdentCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataCheckIdentCommand.java index d98ab1d6974..3fba9b3cb89 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataCheckIdentCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataCheckIdentCommand.java @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO; import no.nav.testnav.libs.securitycore.config.UserConstant; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataHentCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataHentCommand.java index ee7731d1f5b..1111b26fb0a 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataHentCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataHentCommand.java @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO; import no.nav.testnav.libs.securitycore.config.UserConstant; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOppdateringCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOppdateringCommand.java index 2727e86c781..1a213993311 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOppdateringCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOppdateringCommand.java @@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j; import no.nav.dolly.bestilling.pdldata.dto.PdlResponse; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO; import no.nav.testnav.libs.securitycore.config.UserConstant; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOpprettingCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOpprettingCommand.java index e47074f7a50..7877e7ba5dd 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOpprettingCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOpprettingCommand.java @@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j; import no.nav.dolly.bestilling.pdldata.dto.PdlResponse; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; import no.nav.testnav.libs.securitycore.config.UserConstant; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; 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 d6cf1d717b1..28923047f08 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 @@ -34,10 +34,10 @@ import no.nav.dolly.service.TransaksjonMappingService; import no.nav.dolly.util.IdentTypeUtil; import no.nav.dolly.util.TransactionHelperService; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSivilstandWrapper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSivilstandWrapper.java index b10c3973590..9e9c8114bb7 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSivilstandWrapper.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSivilstandWrapper.java @@ -4,7 +4,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; import java.util.ArrayList; import java.util.List; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategy.java index 318248aba3d..4ee87c5f634 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategy.java @@ -6,7 +6,7 @@ import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSamboerRequest; import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSivilstandWrapper; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; import org.springframework.stereotype.Component; import java.time.LocalDate; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceClient.java index 9696d734730..9b2067db120 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceClient.java @@ -15,7 +15,7 @@ import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.exceptions.DollyFunctionalException; import no.nav.dolly.util.TransactionHelperService; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; import org.apache.commons.lang3.StringUtils; import org.apache.poi.util.StringUtil; import org.springframework.stereotype.Service; @@ -102,7 +102,7 @@ private Map> getHendelseIder(boolean isOrdre, BestillingProg } catch (JsonProcessingException e) { - throw new DollyFunctionalException("Feilet å hente hendelseId fra opprettinng.", e); + throw new DollyFunctionalException("Feilet å hente hendelseId fra oppretting.", e); } } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/DollyBestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/DollyBestillingService.java index 5d815926258..d381b9ee018 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/DollyBestillingService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/DollyBestillingService.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.MapperFacade; import no.nav.dolly.bestilling.ClientFuture; import no.nav.dolly.bestilling.ClientRegister; import no.nav.dolly.bestilling.aareg.AaregClient; @@ -17,10 +18,13 @@ import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.Testident; +import no.nav.dolly.domain.resultset.RsDollyBestilling; import no.nav.dolly.domain.resultset.RsDollyBestillingRequest; import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; import no.nav.dolly.domain.resultset.Tags; import no.nav.dolly.domain.resultset.dolly.DollyPerson; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.dolly.elastic.ElasticBestilling; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.repository.IdentRepository; @@ -42,6 +46,7 @@ import static java.util.Objects.nonNull; import static no.nav.dolly.domain.jpa.Testident.Master.PDL; import static no.nav.dolly.util.MdcUtil.MDC_KEY_BESTILLING; +import static org.apache.logging.log4j.util.Strings.isBlank; import static org.apache.logging.log4j.util.Strings.isNotBlank; @Slf4j @@ -52,12 +57,14 @@ public class DollyBestillingService { protected final IdentService identService; protected final BestillingService bestillingService; protected final ObjectMapper objectMapper; + protected final MapperFacade mapperFacade; protected final List clientRegisters; protected final CounterCustomRegistry counterCustomRegistry; protected final PdlDataConsumer pdlDataConsumer; protected final ErrorStatusDecoder errorStatusDecoder; protected final TransactionHelperService transactionHelperService; protected final TpsPersonService tpsPersonService; + protected final BestillingElasticRepository bestillingElasticRepository; public static Set getEnvironments(String miljoer) { return isNotBlank(miljoer) ? Set.of(miljoer.split(",")) : emptySet(); @@ -97,6 +104,7 @@ protected RsDollyBestillingRequest getDollyBestillingRequest(Bestilling bestilli bestKriterier.setNavSyntetiskIdent(bestilling.getNavSyntetiskIdent()); bestKriterier.setEnvironments(getEnvironments(bestilling.getMiljoer())); bestKriterier.setBeskrivelse(bestilling.getBeskrivelse()); + return bestKriterier; } catch (JsonProcessingException e) { @@ -167,6 +175,24 @@ protected void doFerdig(Bestilling bestilling) { log.info("Bestilling med id=#{} er ferdig", bestilling.getId()); } + protected void saveBestillingToElasticServer(RsDollyBestilling bestillingRequest, Bestilling bestilling) { + + if (isBlank(bestilling.getFeil()) && + isNull(bestilling.getOpprettetFraId()) && + isBlank(bestilling.getGjenopprettetFraIdent()) && + isNull(bestilling.getOpprettetFraGruppeId())) { + + var request = mapperFacade.map(bestillingRequest, ElasticBestilling.class); + request.setId(bestilling.getId()); + var progresser = bestillingService.getProgressByBestillingId(bestilling.getId()); + request.setIdenter(progresser.stream() + .filter(BestillingProgress::isIdentGyldig) + .map(BestillingProgress::getIdent) + .toList()); + bestillingElasticRepository.save(request); + } + } + protected Flux opprettProgress(Bestilling bestilling, Testident.Master master) { return opprettProgress(bestilling, master, null); diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettBestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettBestillingService.java index d3a3b3f363f..d2380d24ce1 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettBestillingService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettBestillingService.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.MapperFacade; import no.nav.dolly.bestilling.ClientFuture; import no.nav.dolly.bestilling.ClientRegister; import no.nav.dolly.bestilling.pdldata.PdlDataConsumer; @@ -10,6 +11,7 @@ import no.nav.dolly.bestilling.tpsmessagingservice.service.TpsPersonService; import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.service.BestillingProgressService; @@ -42,24 +44,29 @@ public GjenopprettBestillingService( IdentService identService, BestillingProgressService bestillingProgressService, BestillingService bestillingService, - ObjectMapper objectMapper, List clientRegisters, + ObjectMapper objectMapper, + MapperFacade mapperFacade, + List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository ) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.bestillingProgressService = bestillingProgressService; this.personServiceClient = personServiceClient; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettGruppeService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettGruppeService.java index ba2d909c554..a453cf5fe9c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettGruppeService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettGruppeService.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.MapperFacade; import no.nav.dolly.bestilling.ClientFuture; import no.nav.dolly.bestilling.ClientRegister; import no.nav.dolly.bestilling.pdldata.PdlDataConsumer; @@ -10,7 +11,7 @@ import no.nav.dolly.bestilling.tpsmessagingservice.service.TpsPersonService; import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; -import no.nav.dolly.domain.resultset.RsDollyBestilling; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.repository.IdentRepository.GruppeBestillingIdent; @@ -45,24 +46,28 @@ public GjenopprettGruppeService( IdentService identService, BestillingService bestillingService, ObjectMapper objectMapper, + MapperFacade mapperFacade, List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository ) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.personServiceClient = personServiceClient; } @@ -105,7 +110,7 @@ public void executeAsync(Bestilling bestilling) { .flatMapSequential(cobestilling -> createBestilling(bestilling, cobestilling) .filter(bestillingRequest -> bestillingRequest.getId() == isFirstBestilling(coBestillinger, cobestilling.getIdent()) || - RsDollyBestilling.isNonEmpty(bestillingRequest)) + bestillingRequest.isNonEmpty()) .doOnNext(request -> log.info("Startet gjenopprett bestilling {} for ident: {}", request.getId(), testident.getIdent())) .flatMapSequential(bestillingRequest -> Flux.concat( diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettIdentService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettIdentService.java index c7705b7a5ec..5f3eddd991d 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettIdentService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettIdentService.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.MapperFacade; import no.nav.dolly.bestilling.ClientFuture; import no.nav.dolly.bestilling.ClientRegister; import no.nav.dolly.bestilling.pdldata.PdlDataConsumer; @@ -10,8 +11,8 @@ import no.nav.dolly.bestilling.tpsmessagingservice.service.TpsPersonService; import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; -import no.nav.dolly.domain.resultset.RsDollyBestilling; import no.nav.dolly.domain.resultset.RsDollyBestillingRequest; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.repository.IdentRepository.GruppeBestillingIdent; @@ -45,24 +46,28 @@ public GjenopprettIdentService( IdentService identService, BestillingService bestillingService, ObjectMapper objectMapper, + MapperFacade mapperFacade, List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository ) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.personServiceClient = personServiceClient; } @@ -106,7 +111,7 @@ public void executeAsync(Bestilling bestilling) { .filter(cobestilling -> ident.equals(cobestilling.getIdent())) .flatMap(cobestilling -> createBestilling(bestilling, cobestilling) .filter(bestillingRequest -> countEmptyBestillinger.getAndIncrement() == 0 || - RsDollyBestilling.isNonEmpty(bestillingRequest)) + bestillingRequest.isNonEmpty()) .doOnNext(request -> log.info("Startet gjenopprett bestilling {} for ident: {}", request.getId(), testident.getIdent())) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/ImportAvPersonerFraPdlService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/ImportAvPersonerFraPdlService.java index 64f02821029..0742c20f43e 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/ImportAvPersonerFraPdlService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/ImportAvPersonerFraPdlService.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.MapperFacade; import no.nav.dolly.bestilling.ClientFuture; import no.nav.dolly.bestilling.ClientRegister; import no.nav.dolly.bestilling.pdldata.PdlDataConsumer; @@ -10,6 +11,7 @@ import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsDollyBestillingRequest; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.service.BestillingService; @@ -39,23 +41,27 @@ public class ImportAvPersonerFraPdlService extends DollyBestillingService { public ImportAvPersonerFraPdlService(IdentService identService, BestillingService bestillingService, ObjectMapper objectMapper, + MapperFacade mapperFacade, List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService) { + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.personServiceClient = personServiceClient; } @@ -104,7 +110,10 @@ public void executeAsync(Bestilling bestilling) { .doOnNext(status -> oppdaterStatus(progress)))) .takeWhile(test -> !bestillingService.isStoppet(bestilling.getId())) .collectList() - .doFinally(done -> doFerdig(bestilling)) + .doFinally(done -> { + doFerdig(bestilling); + saveBestillingToElasticServer(bestKriterier, bestilling); + }) .subscribe(); } else { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/LeggTilPaaGruppeService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/LeggTilPaaGruppeService.java index ee683b0a8d2..40aed486399 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/LeggTilPaaGruppeService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/LeggTilPaaGruppeService.java @@ -13,6 +13,7 @@ import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsDollyBestillingRequest; import no.nav.dolly.domain.resultset.dolly.DollyPerson; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.service.BestillingProgressService; @@ -21,7 +22,7 @@ import no.nav.dolly.util.ThreadLocalContextLifter; import no.nav.dolly.util.TransactionHelperService; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; import org.springframework.scheduling.annotation.Async; @@ -42,35 +43,36 @@ public class LeggTilPaaGruppeService extends DollyBestillingService { private final PersonServiceClient personServiceClient; - private final MapperFacade mapperFacade; private final BestillingProgressService bestillingProgressService; public LeggTilPaaGruppeService( IdentService identService, BestillingProgressService bestillingProgressService, BestillingService bestillingService, - MapperFacade mapperFacade, ObjectMapper objectMapper, + MapperFacade mapperFacade, List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService) { + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.personServiceClient = personServiceClient; - this.mapperFacade = mapperFacade; this.bestillingProgressService = bestillingProgressService; } @@ -126,7 +128,10 @@ public void executeAsync(Bestilling bestilling) { }))))) .takeWhile(test -> !bestillingService.isStoppet(bestilling.getId())) .collectList() - .doFinally(done -> doFerdig(bestilling)) + .doFinally(done -> { + doFerdig(bestilling); + saveBestillingToElasticServer(bestKriterier, bestilling); + }) .subscribe(); } } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java index d3b1392a9ad..8bb8010e14d 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java @@ -13,6 +13,7 @@ import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsDollyUpdateRequest; import no.nav.dolly.domain.resultset.dolly.DollyPerson; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.service.BestillingProgressService; @@ -20,7 +21,7 @@ import no.nav.dolly.service.IdentService; import no.nav.dolly.util.TransactionHelperService; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; import org.springframework.scheduling.annotation.Async; @@ -37,35 +38,36 @@ public class OppdaterPersonService extends DollyBestillingService { private final PersonServiceClient personServiceClient; - private final MapperFacade mapperFacade; private final BestillingProgressService bestillingProgressService; public OppdaterPersonService( IdentService identService, BestillingProgressService bestillingProgressService, BestillingService bestillingService, - MapperFacade mapperFacade, ObjectMapper objectMapper, + MapperFacade mapperFacade, List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService) { + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.personServiceClient = personServiceClient; - this.mapperFacade = mapperFacade; this.bestillingProgressService = bestillingProgressService; } @@ -116,7 +118,10 @@ public void oppdaterPersonAsync(RsDollyUpdateRequest request, Bestilling bestill }))) .takeWhile(test -> !bestillingService.isStoppet(bestilling.getId())) .collectList() - .doFinally(done -> doFerdig(bestilling)) + .doFinally(done -> { + doFerdig(bestilling); + saveBestillingToElasticServer(request, bestilling); + }) .subscribe(); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerByKriterierService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerByKriterierService.java index ff425cbfd49..cacafd29de6 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerByKriterierService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerByKriterierService.java @@ -10,6 +10,7 @@ import no.nav.dolly.bestilling.tpsmessagingservice.service.TpsPersonService; import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.service.BestillingService; @@ -36,7 +37,6 @@ public class OpprettPersonerByKriterierService extends DollyBestillingService { private final PersonServiceClient personServiceClient; - private final MapperFacade mapperFacade; public OpprettPersonerByKriterierService( IdentService identService, @@ -49,20 +49,22 @@ public OpprettPersonerByKriterierService( PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService) { + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); this.personServiceClient = personServiceClient; - this.mapperFacade = mapperFacade; } @Async @@ -113,7 +115,10 @@ public void executeAsync(Bestilling bestilling) { })))) .takeWhile(test -> !bestillingService.isStoppet(bestilling.getId())) .collectList() - .doFinally(done -> doFerdig(bestilling)) + .doFinally(done -> { + doFerdig(bestilling); + saveBestillingToElasticServer(bestKriterier, bestilling); + }) .subscribe(); } else { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerFraIdenterMedKriterierService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerFraIdenterMedKriterierService.java index ce0ac0843b9..2d9426e34f8 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerFraIdenterMedKriterierService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerFraIdenterMedKriterierService.java @@ -11,6 +11,7 @@ import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsDollyBestillingRequest; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.metrics.CounterCustomRegistry; import no.nav.dolly.service.BestillingService; @@ -36,33 +37,34 @@ @Service public class OpprettPersonerFraIdenterMedKriterierService extends DollyBestillingService { - private final MapperFacade mapperFacade; private final PersonServiceClient personServiceClient; public OpprettPersonerFraIdenterMedKriterierService( IdentService identService, BestillingService bestillingService, - MapperFacade mapperFacade, ObjectMapper objectMapper, + MapperFacade mapperFacade, List clientRegisters, CounterCustomRegistry counterCustomRegistry, ErrorStatusDecoder errorStatusDecoder, PdlDataConsumer pdlDataConsumer, TransactionHelperService transactionHelperService, PersonServiceClient personServiceClient, - TpsPersonService tpsPersonService) { + TpsPersonService tpsPersonService, + BestillingElasticRepository bestillingElasticRepository) { super( identService, bestillingService, objectMapper, + mapperFacade, clientRegisters, counterCustomRegistry, pdlDataConsumer, errorStatusDecoder, transactionHelperService, - tpsPersonService + tpsPersonService, + bestillingElasticRepository ); - this.mapperFacade = mapperFacade; this.personServiceClient = personServiceClient; } @@ -116,7 +118,10 @@ public void executeAsync(Bestilling bestilling) { })))) .takeWhile(test -> !bestillingService.isStoppet(bestilling.getId())) .collectList() - .doFinally(done -> doFerdig(bestilling)) + .doFinally(done -> { + doFerdig(bestilling); + saveBestillingToElasticServer(bestKriterier, bestilling); + }) .subscribe(); } else { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OriginatorUtility.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OriginatorUtility.java index 440f8e22fcc..2f1761bc527 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OriginatorUtility.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OriginatorUtility.java @@ -12,7 +12,7 @@ import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; import no.nav.dolly.domain.resultset.pdldata.PdlPersondata; import no.nav.dolly.mapper.MappingContextUtils; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/mapper/SykemeldingMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/mapper/SykemeldingMappingStrategy.java index 179dd309827..db1da6171de 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/mapper/SykemeldingMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/mapper/SykemeldingMappingStrategy.java @@ -14,7 +14,7 @@ import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding; import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding.RsDetaljertSykemelding; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tagshendelseslager/TagsHendelseslagerClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tagshendelseslager/TagsHendelseslagerClient.java index 18acfda3eaa..c51c73bb1e5 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tagshendelseslager/TagsHendelseslagerClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tagshendelseslager/TagsHendelseslagerClient.java @@ -14,9 +14,9 @@ import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; import no.nav.dolly.domain.resultset.Tags; import no.nav.dolly.domain.resultset.dolly.DollyPerson; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingClient.java index c777d4f0388..d516a100825 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingClient.java @@ -13,10 +13,10 @@ import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; import no.nav.dolly.domain.resultset.dolly.DollyPerson; import no.nav.dolly.util.TransactionHelperService; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; 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 cfbc4fa333b..e6fedcbea1c 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 @@ -12,11 +12,11 @@ import no.nav.dolly.bestilling.tpsmessagingservice.command.TpsMessagingPostCommand; import no.nav.dolly.config.Consumers; import no.nav.dolly.metrics.Timed; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.springframework.http.client.reactive.ReactorClientHttpConnector; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattDeleteCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattDeleteCommand.java index 82fc50d0cc4..c6a62cee4dd 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattDeleteCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattDeleteCommand.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattPostCommand.java index d80863249e2..8a62aa2d58b 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattPostCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattPostCommand.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; 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/PersonGetCommand.java index fe30d60d4e6..a13a8ab9cbb 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/PersonGetCommand.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/SikkerhetstiltakDeleteCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/SikkerhetstiltakDeleteCommand.java index 06682ec67c7..30e9018ec2c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/SikkerhetstiltakDeleteCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/SikkerhetstiltakDeleteCommand.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TelefonnummerDeleteCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TelefonnummerDeleteCommand.java index 9ea6ec0deac..13c64d24bbe 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TelefonnummerDeleteCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TelefonnummerDeleteCommand.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TpsMessagingPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TpsMessagingPostCommand.java index 8810ed6a397..0f91dcf9fce 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TpsMessagingPostCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TpsMessagingPostCommand.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.util.WebClientFilter; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/mapper/TpsMessagingMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/mapper/TpsMessagingMappingStrategy.java index e53070ec702..b5da4d461fb 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/mapper/TpsMessagingMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/mapper/TpsMessagingMappingStrategy.java @@ -5,9 +5,10 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TelefonnummerDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO.TypeTelefon; +import no.nav.testnav.libs.data.pdlforvalter.v1.TelefonnummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO.TypeTelefon; import org.springframework.stereotype.Component; @Slf4j @@ -27,10 +28,10 @@ public void mapAtoB(String rsSpraakKode, SpraakDTO spraakKode, MappingContext co }) .register(); - factory.classMap(TelefonnummerDTO.class, no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO.class) + factory.classMap(TelefonnummerDTO.class, TelefonTypeNummerDTO.class) .customize(new CustomMapper<>() { @Override - public void mapAtoB(TelefonnummerDTO kilde, no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO destinasjon, MappingContext context) { + public void mapAtoB(TelefonnummerDTO kilde, TelefonTypeNummerDTO destinasjon, MappingContext context) { destinasjon.setTelefonnummer(kilde.getNummer()); destinasjon.setLandkode(kilde.getLandskode()); diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java index 7bb71d92d79..56caf578416 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java @@ -14,7 +14,7 @@ import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.dolly.service.TransaksjonMappingService; import no.nav.dolly.util.TransactionHelperService; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java new file mode 100644 index 00000000000..4fc5b6e3393 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java @@ -0,0 +1,45 @@ +package no.nav.dolly.config; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.opensearch.client.RestHighLevelClient; +import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration; +import org.opensearch.data.client.orhlc.ClientConfiguration; +import org.opensearch.data.client.orhlc.RestClients; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; + +import java.time.Duration; + +@Slf4j +@Configuration +@Profile({"prod", "dev"}) +@RequiredArgsConstructor +@EnableElasticsearchRepositories("no.nav.dolly.elastic") +public class OpenSearchConfig extends AbstractOpenSearchConfiguration { + + @Value("${open.search.username}") + private String username; + + @Value("${open.search.password}") + private String password; + + @Value("${open.search.uri}") + private String uri; + + @Override + @SuppressWarnings("java:S2095") + public RestHighLevelClient opensearchClient() { + + return RestClients.create(ClientConfiguration.builder() + .connectedTo(uri.replace("https://", "")) + .usingSsl() + .withBasicAuth(username, password) + .withConnectTimeout(Duration.ofSeconds(10)) + .withSocketTimeout(Duration.ofSeconds(5)) + .build()) + .rest(); + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java new file mode 100644 index 00000000000..3e1b1f4d227 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java @@ -0,0 +1,37 @@ +package no.nav.dolly.config; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.opensearch.client.RestHighLevelClient; +import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration; +import org.opensearch.data.client.orhlc.ClientConfiguration; +import org.opensearch.data.client.orhlc.RestClients; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; + +import java.time.Duration; + +@Slf4j +@Configuration +@Profile("local") +@RequiredArgsConstructor +@EnableElasticsearchRepositories("no.nav.dolly.elastic") +public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration { + + @Value("${open.search.uri}") + private String uri; + + @Override + @SuppressWarnings("java:S2095") + public RestHighLevelClient opensearchClient() { + + return RestClients.create(ClientConfiguration.builder() + .connectedTo(uri.replace("http://", "")) + .withConnectTimeout(Duration.ofSeconds(10)) + .withSocketTimeout(Duration.ofSeconds(5)) + .build()) + .rest(); + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPerson.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPerson.java index 94b5441e56e..badb074bdcb 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPerson.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPerson.java @@ -11,27 +11,27 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import no.nav.dolly.domain.deserialization.PersonStatusEnumDeserializer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DeltBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedfoedtBarnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TelefonnummerDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DeltBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedfoedtBarnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TelefonnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import java.io.Serializable; import java.time.LocalDate; @@ -530,7 +530,7 @@ public static class Kontaktadresse extends AdresseDTO { private VegadresseDTO vegadresse; private UtenlandskAdresseDTO utenlandskAdresse; - private no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO.PostboksadresseDTO postboksadresse; + private no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO.PostboksadresseDTO postboksadresse; private PostadresseIFrittFormat postadresseIFrittFormat; private UtenlandskAdresseIFrittFormat utenlandskAdresseIFrittFormat; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java index e40d71af4cc..a831e69ed00 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java @@ -25,7 +25,7 @@ import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding; import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging; import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import java.util.List; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java index 46bc8018e3c..9bf2874f112 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java @@ -26,7 +26,7 @@ import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding; import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging; import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -111,14 +111,15 @@ public List getInstdata() { return instdata; } - public static boolean isNonEmpty(RsDollyBestilling bestilling) { + @JsonIgnore + public boolean isNonEmpty() { return Arrays.stream(RsDollyBestilling.class.getMethods()) .filter(method -> "get".equals(method.getName().substring(0, 3))) .filter(method -> !EXCLUDE_METHODS.contains(method.getName())) .anyMatch(method -> { try { - var object = method.invoke(bestilling); + var object = method.invoke(this); return nonNull(object) && (!(object instanceof List) || !((List) object).isEmpty()); } catch (IllegalAccessException | InvocationTargetException e) { return true; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java index 50300f718b1..93f50ad8a63 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java @@ -35,7 +35,6 @@ public enum SystemTyper { SYKEMELDING("NAV sykemelding"), PDLIMPORT("Import av identer (TESTNORGE)"), SKJERMINGSREGISTER("Skjermingsregisteret"), - SAKOGARKIV("Sak og arkivfasade (SAF)"), ORGANISASJON_FORVALTER("Enhetsregisteret (EREG)"), PDL_FORVALTER("Persondetaljer"), PDL_ORDRE("Ordre til PDL"), diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAareg.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAareg.java index 227f76f004b..8447b237863 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAareg.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAareg.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.YearMonth; import java.util.ArrayList; @@ -43,7 +46,8 @@ public class RsAareg { private RsAktoer arbeidsgiver; - @Schema(description = "Angir periode oppdateringen gjelder fra") + @Schema(description = "Angir periode oppdateringen gjelder fra", type = "string", pattern="^\\d{4}-\\d{2}$") + @Field(type = FieldType.Date, format = DateFormat.year_month, pattern = "uuuu-MM") private YearMonth navArbeidsforholdPeriode; @Schema(description = "Angir om posten er oppdatering") diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoer.java index 3a0b38e4745..4bb3aab0b06 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoer.java @@ -4,17 +4,20 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "aktoertype") @JsonSubTypes({ @JsonSubTypes.Type(value = RsOrganisasjon.class, name = "ORG"), @JsonSubTypes.Type(value = RsAktoerPerson.class, name = "PERS") }) -@Getter -@Setter + +@Data +@SuperBuilder @JsonInclude(JsonInclude.Include.NON_NULL) +@NoArgsConstructor public abstract class RsAktoer { @Schema(description = "Type av aktør er ORG eller PERS for organisasjon eller person") diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoerPerson.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoerPerson.java index 6ca5f66bcab..9aa8a592f87 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoerPerson.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAktoerPerson.java @@ -2,14 +2,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; +import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.experimental.SuperBuilder; -@Getter -@Setter -@Builder +@Data +@SuperBuilder +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor public class RsAktoerPerson extends RsAktoer { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAnsettelsesPeriode.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAnsettelsesPeriode.java index b0c00e36c6e..68bb551db20 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAnsettelsesPeriode.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAnsettelsesPeriode.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -19,10 +22,12 @@ public class RsAnsettelsesPeriode { @Schema(description = "Dato fra-og-med", type = "LocalDateTime", requiredMode = Schema.RequiredMode.REQUIRED) + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fom; @Schema(description = "Dato til-og-med", type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tom; @Schema(description = "Årsak for avsluttet ansettelsesperiode (kodeverk: SluttÅrsakAareg)", diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsArbeidsavtale.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsArbeidsavtale.java index bc044d81167..831d0dc732b 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsArbeidsavtale.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsArbeidsavtale.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -28,8 +31,10 @@ public class RsArbeidsavtale { private String avloenningstype; @Schema(type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime endringsdatoStillingsprosent; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sisteLoennsendringsdato; private Double stillingsprosent; @@ -44,5 +49,6 @@ public class RsArbeidsavtale { private String ansettelsesform; @Schema(type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime endringsdatoLoenn; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsOrganisasjon.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsOrganisasjon.java index 8d511e46faf..bb7b5c61069 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsOrganisasjon.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsOrganisasjon.java @@ -2,14 +2,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; +import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.experimental.SuperBuilder; -@Getter -@Setter -@Builder +@Data +@SuperBuilder +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor public class RsOrganisasjon extends RsAktoer { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAareg.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAareg.java index 6351caa4d64..339775144a2 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAareg.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAareg.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -19,9 +22,11 @@ public class RsPeriodeAareg { @Schema(description = "Dato fra-og-med", type = "LocalDateTime", requiredMode = Schema.RequiredMode.REQUIRED) + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fom; @Schema(description = "Dato til-og-med", type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tom; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAmelding.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAmelding.java index 26f3381e334..0370221008d 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAmelding.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAmelding.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -23,10 +26,12 @@ public class RsPeriodeAmelding { @Schema(description = "Dato fra-og-med", type = "LocalDateTime", requiredMode = Schema.RequiredMode.REQUIRED) + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fom; @Schema(description = "Dato til-og-med", type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tom; @Schema(description = "Samlet liste over periode", diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/ArenaPeriode.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/ArenaPeriode.java index ea09c90e111..1cbaa760344 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/ArenaPeriode.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/ArenaPeriode.java @@ -5,6 +5,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -15,8 +18,10 @@ public class ArenaPeriode { @Schema(type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fraDato; @Schema(type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tilDato; } \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap.java index 11e9a9fc665..3e1a45b0913 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap.java @@ -7,6 +7,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -25,6 +28,7 @@ public class RsArenaAap extends ArenaPeriode{ public enum VedtakType {O, E, G, S} private String aktivitetsfase; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime datoMottatt; @Schema(description = "O = ny rettighet, S = sletting") private VedtakType vedtaktype; @@ -32,6 +36,7 @@ public enum VedtakType {O, E, G, S} private MedlemFolketrygden medlemFolketrygden; private List andreOkonomYtelserListe; private List institusjonsopphold; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime justertFra; private List vilkaar; private String utfall; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap115.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap115.java index d1551fd4178..68b9cbe56f9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap115.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap115.java @@ -5,6 +5,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -21,8 +24,11 @@ public class RsArenaAap115 { public enum VedtaksType {O, S} + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fraDato; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tilDato; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime datoMottatt; @Schema(description = "Gyldige verdier: O (ny), S (stans)") @@ -56,6 +62,7 @@ public static class MedisinskOpplysning { private String klassifisering; private String diagnose; private String kilde; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime kildeDato; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaDagpenger.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaDagpenger.java index 869d6c1a695..03173f858e0 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaDagpenger.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaDagpenger.java @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -22,5 +25,6 @@ public class RsArenaDagpenger extends ArenaPeriode { private String rettighetKode; @Schema(type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime mottattDato; } \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/breg/RsBregdata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/breg/RsBregdata.java index 69070a66ddb..06488efe3f9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/breg/RsBregdata.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/breg/RsBregdata.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -55,6 +58,7 @@ public static class RolleTo { private AdresseTo postAdresse; @Schema(defaultValue = "dagens dato") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime registreringsdato; @Schema diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsBestillingStatus.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsBestillingStatus.java index a7408fc84e2..e0fdc364c23 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsBestillingStatus.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsBestillingStatus.java @@ -26,7 +26,7 @@ import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding; import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging; import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingWrapper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingWrapper.java index 3ef798b2e5d..5033027879a 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingWrapper.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingWrapper.java @@ -26,7 +26,7 @@ import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding; import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging; import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson; -import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; import java.util.List; import java.util.Map; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/histark/RsHistark.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/histark/RsHistark.java index b7cba3b3963..67be357d25c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/histark/RsHistark.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/histark/RsHistark.java @@ -8,6 +8,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; import java.time.LocalDateTime; @@ -49,6 +52,7 @@ public static class RsHistarkDokument { private String skannested; @Schema(description = "Når saksmappen ble skannet") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime skanningsTidspunkt; @Schema(description = "Temakoder som forsendelsen tilhører, for eksempel “DAG” (Dagpenger)") private List temakoder; @@ -60,9 +64,11 @@ public static class RsHistarkDokument { private String enhetsnummer; @Schema(description = "Startåret for saksmappen") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate startAar; @Schema(description = "Sluttåret for saksmappen") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate sluttAar; @Schema(description = "Selve PDF dokumentet. Ved fysisk dokument brukes bytearray.") diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektsmeldingstub/RsInntektsmelding.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektsmeldingstub/RsInntektsmelding.java index a636cbbd26b..7f1b84503d7 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektsmeldingstub/RsInntektsmelding.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektsmeldingstub/RsInntektsmelding.java @@ -5,6 +5,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; import java.time.LocalDateTime; @@ -60,6 +63,7 @@ public static class Inntektsmelding { private List opphoerAvNaturalytelseListe; private List pleiepengerPerioder; private RsRefusjon refusjon; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate startdatoForeldrepengeperiode; private RsSykepengerIArbeidsgiverperioden sykepengerIArbeidsgiverperioden; private YtelseType ytelse; @@ -86,6 +90,7 @@ public static class RsRefusjon { private List endringIRefusjonListe; private Double refusjonsbeloepPrMnd; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate refusjonsopphoersdato; } @@ -96,6 +101,7 @@ public static class RsRefusjon { @JsonInclude(JsonInclude.Include.NON_NULL) public static class RsEndringIRefusjon { + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate endringsdato; private Double refusjonsbeloepPrMnd; } @@ -108,6 +114,7 @@ public static class RsEndringIRefusjon { public static class RsNaturalYtelseDetaljer { private Double beloepPrMnd; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate fom; private NaturalytelseType naturalytelseType; } @@ -131,6 +138,7 @@ public static class RsOmsorgspenger { @JsonInclude(JsonInclude.Include.NON_NULL) public static class RsDelvisFravaer { + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate dato; private Double timer; } @@ -142,6 +150,7 @@ public static class RsDelvisFravaer { @JsonInclude(JsonInclude.Include.NON_NULL) public static class RsAvsendersystem { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime innsendingstidspunkt; private String systemnavn; private String systemversjon; @@ -190,6 +199,7 @@ public static class RsArbeidsforhold { private String arbeidsforholdId; private List avtaltFerieListe; private RsAltinnInntekt beregnetInntekt; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate foersteFravaersdag; private List graderingIForeldrepengerListe; private List utsettelseAvForeldrepengerListe; @@ -234,7 +244,9 @@ public static class RsAltinnInntekt { @JsonInclude(JsonInclude.Include.NON_NULL) public static class RsPeriode { + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate fom; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate tom; } } \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Inntekt.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Inntekt.java index c7ea54bb991..7488ed89819 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Inntekt.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Inntekt.java @@ -7,6 +7,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -23,10 +26,12 @@ public class Inntekt { @Schema(description = "Startdato på perioden inntekten var opptjent", example = "yyyy-MM-dd", type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startOpptjeningsperiode; @Schema(description = "Sluttdato på perioden inntekten var opptjent", example = "yyyy-MM-dd", type = "LocalDateTime") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sluttOpptjeningsperiode; private Boolean inngaarIGrunnlagForTrekk; private Boolean utloeserArbeidsgiveravgift; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/RsInntektsinformasjon.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/RsInntektsinformasjon.java index 32c5cc30196..cbca91b25e9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/RsInntektsinformasjon.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/RsInntektsinformasjon.java @@ -7,6 +7,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -51,6 +54,7 @@ public class RsInntektsinformasjon { private List historikk; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime rapporteringsdato; private Integer versjon; @@ -125,10 +129,12 @@ public static class Arbeidsforhold { @Schema(type = "LocalDateTime", example = "yyyy-MM-dd") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startdato; @Schema(type = "LocalDateTime", example = "yyyy-MM-dd") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sluttdato; private Double antallTimerPerUkeSomEnFullStillingTilsvarer; @@ -146,10 +152,12 @@ public static class Arbeidsforhold { @Schema(type = "LocalDateTime", example = "yyyy-MM-dd") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sisteLoennsendringsdato; @Schema(type = "LocalDateTime", example = "yyyy-MM-dd") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sisteDatoForStillingsprosentendring; } @@ -167,6 +175,7 @@ public static class Historikk { private List arbeidsforholdsliste; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime rapporteringsdato; } } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Tilleggsinformasjon.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Tilleggsinformasjon.java index 1fe46d8c160..a896f0bca25 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Tilleggsinformasjon.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/Tilleggsinformasjon.java @@ -8,6 +8,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.Objects; @@ -86,10 +89,12 @@ public static class Periode { @Schema(type = "LocalDateTime", example = "yyyy-MM-dd") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startdato; @Schema(type = "LocalDateTime", example = "yyyy-MM-dd") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sluttdato; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/RsInstdata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/RsInstdata.java index 33725afecfb..d5cb0e75058 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/RsInstdata.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/RsInstdata.java @@ -6,6 +6,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -24,18 +27,22 @@ public class RsInstdata { @Schema( type = "LocalDateTime", description = "Dato for begynnelsen av oppholdet") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startdato; @Schema(type = "LocalDateTime", description = "Dato oppholdet er forventet å være avsluttet") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime forventetSluttdato; @Schema(type = "LocalDateTime", description = "Dato oppholdet var avsluttet") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime faktiskSluttdato; @Schema(type = "LocalDateTime", description = "Nytt Api har kun denne for slutt av opphold") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sluttdato; @Schema(description = "Kodeverdi for oppholdskategori. " diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/kontoregister/BankkontoData.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/kontoregister/BankkontoData.java index c96fdea449d..516fa8a5916 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/kontoregister/BankkontoData.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/kontoregister/BankkontoData.java @@ -4,8 +4,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; @Data @Builder diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java index 7e901b2de60..b3f813fe599 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java @@ -4,6 +4,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -13,6 +16,7 @@ @AllArgsConstructor public class RsDigitalKontaktdata { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFra; private boolean reservert; private String mobil; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/medl/RsMedl.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/medl/RsMedl.java index d5b4477eb60..2fd5abfa1f5 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/medl/RsMedl.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/medl/RsMedl.java @@ -6,6 +6,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; @@ -18,8 +21,10 @@ public class RsMedl { @Schema(description = "Startdatoen for perioden til medlemskapsunntaket, på ISO-8601 format.") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate fraOgMed; @Schema(description = "Sluttdatoen for perioden til medlemskapsunntaket, på ISO-8601 format.") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate tilOgMed; @Schema(description = "Grunnlaget for dette medlemskapsunntaket.\n" + diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pdldata/PdlPersondata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pdldata/PdlPersondata.java index 71e05705c09..14255dc9ba6 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pdldata/PdlPersondata.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pdldata/PdlPersondata.java @@ -4,8 +4,11 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -26,7 +29,9 @@ public static class PdlPerson { private Identtype identtype; + @Field(type=FieldType.Date, format=DateFormat.date_hour_minute_second, pattern="uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtEtter; + @Field(type=FieldType.Date, format=DateFormat.date_hour_minute_second, pattern="uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtFoer; private Integer alder; private Boolean syntetisk; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pensjon/PensjonData.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pensjon/PensjonData.java index dd2d4c7cfec..a47a095986f 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pensjon/PensjonData.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pensjon/PensjonData.java @@ -6,6 +6,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; import java.util.ArrayList; @@ -115,13 +118,16 @@ public static class TpYtelse { @Schema( description = "Dato innmeldt ytelse fom, kan være tidligere eller samme som iverksatt fom dato.") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate datoInnmeldtYtelseFom; @Schema( description = "Dato iverksatt fom") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate datoYtelseIverksattFom; @Schema(description = "Dato iverksatt tom") + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate datoYtelseIverksattTom; } @@ -130,7 +136,8 @@ public static class TpYtelse { @NoArgsConstructor @AllArgsConstructor public static class Alderspensjon { - @Schema + + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate iverksettelsesdato; @Schema @@ -163,8 +170,11 @@ public static class SkjemaRelasjon { @AllArgsConstructor public static class Uforetrygd { + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate kravFremsattDato; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate onsketVirkningsDato; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate uforetidspunkt; private Integer inntektForUforhet; private Integer uforegrad; @@ -205,7 +215,9 @@ public List getForventedeInntekterEP() { @NoArgsConstructor @AllArgsConstructor public static class ForventetInntekt { + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate datoFom; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate datoTom; private InntektType inntektType; private Integer belop; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skjerming/RsSkjerming.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skjerming/RsSkjerming.java index a845e4aaa67..7cefe177e02 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skjerming/RsSkjerming.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skjerming/RsSkjerming.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -17,6 +20,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class RsSkjerming { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime egenAnsattDatoFom; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime egenAnsattDatoTom; } \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java index b268e7736b2..430979e7f77 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java @@ -7,6 +7,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; import java.time.LocalDateTime; @@ -37,6 +40,7 @@ public static class RsSyntSykemelding { private String arbeidsforholdId; private String orgnummer; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startDato; } @@ -58,6 +62,7 @@ public static class RsDetaljertSykemelding { private Pasient pasient; private List perioder; private Organisasjon sender; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate startDato; private Boolean umiddelbarBistand; @@ -159,6 +164,7 @@ public static class Pasient { private Adresse adresse; private String etternavn; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate foedselsdato; private String fornavn; private String ident; @@ -176,7 +182,9 @@ public static class Pasient { public static class Periode { private DollyAktivitet aktivitet; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate fom; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate tom; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/NorskBankkontoRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/NorskBankkontoRequest.java index ca8b7a27a03..1ca4e94a0ea 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/NorskBankkontoRequest.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/NorskBankkontoRequest.java @@ -1,6 +1,6 @@ package no.nav.dolly.domain.resultset.tpsmessagingservice; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; import java.util.List; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/RsTpsMessaging.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/RsTpsMessaging.java index 466539a6dcd..9d924efc87a 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/RsTpsMessaging.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/RsTpsMessaging.java @@ -6,8 +6,11 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDate; @@ -20,7 +23,9 @@ public class RsTpsMessaging { private String spraakKode; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate egenAnsattDatoFom; + @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd") private LocalDate egenAnsattDatoTom; private BankkontonrUtlandDTO utenlandskBankkonto; private BankkontonrNorskDTO norskBankkonto; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/UtenlandskBankkontoRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/UtenlandskBankkontoRequest.java index e2a4efdffcb..66c1d96898e 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/UtenlandskBankkontoRequest.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/UtenlandskBankkontoRequest.java @@ -1,6 +1,6 @@ package no.nav.dolly.domain.resultset.tpsmessagingservice; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; import java.util.List; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPeriode.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPeriode.java index 04e38e99539..8d9c7775671 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPeriode.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPeriode.java @@ -1,10 +1,12 @@ package no.nav.dolly.domain.resultset.udistub.model; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -12,8 +14,10 @@ @Builder @NoArgsConstructor @AllArgsConstructor -@JsonInclude(JsonInclude.Include.NON_NULL) public class RsUdiPeriode { + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fra; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime til; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPerson.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPerson.java index 709e094edda..8bc248039ac 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPerson.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/RsUdiPerson.java @@ -7,6 +7,9 @@ import lombok.NoArgsConstructor; import no.nav.dolly.domain.resultset.udistub.model.arbeidsadgang.RsUdiArbeidsadgang; import no.nav.dolly.domain.resultset.udistub.model.opphold.RsUdiOppholdStatus; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -23,5 +26,6 @@ public class RsUdiPerson { private Boolean harOppholdsTillatelse; private Boolean flyktning; private String soeknadOmBeskyttelseUnderBehandling; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime soknadDato; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiAvslagEllerBortfall.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiAvslagEllerBortfall.java index ceed231ef56..e0579e5dfa6 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiAvslagEllerBortfall.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiAvslagEllerBortfall.java @@ -6,6 +6,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -17,16 +20,23 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class RsUdiAvslagEllerBortfall { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime avgjorelsesDato; private UdiOppholdsrettType avslagOppholdsrettBehandlet; private UdiGrunnlagEos avslagOppholdstillatelseBehandletGrunnlagEOS; private UdiGrunnlagOverig avslagOppholdstillatelseBehandletGrunnlagOvrig; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime avslagOppholdstillatelseBehandletUtreiseFrist; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime avslagOppholdstillatelseUtreiseFrist; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime bortfallAvPOellerBOSDato; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tilbakeKallUtreiseFrist; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime formeltVedtakUtreiseFrist; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime tilbakeKallVirkningsDato; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdSammeVilkaar.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdSammeVilkaar.java index 445063e4004..f868f459596 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdSammeVilkaar.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdSammeVilkaar.java @@ -1,13 +1,16 @@ package no.nav.dolly.domain.resultset.udistub.model.opphold; -import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonInclude; - import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import no.nav.dolly.domain.resultset.udistub.model.RsUdiPeriode; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor @@ -16,8 +19,10 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class RsUdiOppholdSammeVilkaar { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime oppholdSammeVilkaarEffektuering; private RsUdiPeriode oppholdSammeVilkaarPeriode; private UdiOppholdstillatelseType oppholdstillatelseType; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime oppholdstillatelseVedtaksDato; } \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdStatus.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdStatus.java index b31e555898f..8cd876a5dcf 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdStatus.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiOppholdStatus.java @@ -1,14 +1,17 @@ package no.nav.dolly.domain.resultset.udistub.model.opphold; -import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonInclude; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import no.nav.dolly.domain.resultset.udistub.model.RsUdiPeriode; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor @@ -19,14 +22,20 @@ public class RsUdiOppholdStatus { private UdiOppholdsrettType eosEllerEFTABeslutningOmOppholdsrett; + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime eosEllerEFTABeslutningOmOppholdsrettEffektuering; private RsUdiPeriode eosEllerEFTABeslutningOmOppholdsrettPeriode; private UdiOppholdstillatelse eosEllerEFTAOppholdstillatelse; + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime eosEllerEFTAOppholdstillatelseEffektuering; private RsUdiPeriode eosEllerEFTAOppholdstillatelsePeriode; private UdiVarighetOpphold eosEllerEFTAVedtakOmVarigOppholdsrett; + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime eosEllerEFTAVedtakOmVarigOppholdsrettEffektuering; private RsUdiPeriode eosEllerEFTAVedtakOmVarigOppholdsrettPeriode; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiUtvistMedInnreiseForbud.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiUtvistMedInnreiseForbud.java index d30dc6d947b..bd100fd183c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiUtvistMedInnreiseForbud.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/udistub/model/opphold/RsUdiUtvistMedInnreiseForbud.java @@ -1,14 +1,17 @@ package no.nav.dolly.domain.resultset.udistub.model.opphold; -import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonInclude; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import no.nav.dolly.domain.resultset.udistub.model.UdiHarType; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor @@ -19,6 +22,7 @@ public class RsUdiUtvistMedInnreiseForbud { private UdiHarType innreiseForbud; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime innreiseForbudVedtaksDato; private UdiVarighetType varighet; } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java new file mode 100644 index 00000000000..d5b1df4c683 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java @@ -0,0 +1,7 @@ +package no.nav.dolly.elastic; + +import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; + +public interface BestillingElasticRepository extends ElasticsearchRepository { + +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java new file mode 100644 index 00000000000..d51132dac6e --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java @@ -0,0 +1,144 @@ +package no.nav.dolly.elastic; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import no.nav.dolly.domain.resultset.aareg.RsAareg; +import no.nav.dolly.domain.resultset.arenaforvalter.ArenaBrukertype; +import no.nav.dolly.domain.resultset.arenaforvalter.ArenaKvalifiseringsgruppe; +import no.nav.dolly.domain.resultset.arenaforvalter.RsArenaAap; +import no.nav.dolly.domain.resultset.arenaforvalter.RsArenaAap115; +import no.nav.dolly.domain.resultset.arenaforvalter.RsArenaDagpenger; +import no.nav.dolly.domain.resultset.breg.RsBregdata; +import no.nav.dolly.domain.resultset.dokarkiv.RsDokarkiv; +import no.nav.dolly.domain.resultset.histark.RsHistark; +import no.nav.dolly.domain.resultset.inntektsmeldingstub.RsInntektsmelding; +import no.nav.dolly.domain.resultset.inntektstub.InntektMultiplierWrapper; +import no.nav.dolly.domain.resultset.inst.RsInstdata; +import no.nav.dolly.domain.resultset.kontoregister.BankkontoData; +import no.nav.dolly.domain.resultset.krrstub.RsDigitalKontaktdata; +import no.nav.dolly.domain.resultset.medl.RsMedl; +import no.nav.dolly.domain.resultset.pdldata.PdlPersondata; +import no.nav.dolly.domain.resultset.pensjon.PensjonData; +import no.nav.dolly.domain.resultset.sigrunstub.RsLignetInntekt; +import no.nav.dolly.domain.resultset.sigrunstub.RsPensjonsgivendeForFolketrygden; +import no.nav.dolly.domain.resultset.skjerming.RsSkjerming; +import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding; +import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson; +import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.Transient; +import org.springframework.data.domain.Persistable; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Document; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import static java.util.Objects.isNull; + +@Document(indexName = "bestilling") +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class ElasticBestilling implements Persistable { + + @Id + private Long id; + + @Override + @JsonIgnore + @Transient + public boolean isNew() { + + return false; + } + + @Field + private PdlPersondata pdldata; + @Field + private RsDigitalKontaktdata krrstub; + @Field + private RsMedl medl; + @Field + private List instdata; + @Field + private List aareg; + @Field + private List sigrunInntekt; + @Field + private List sigrunPensjonsgivende; + @Field + private InntektMultiplierWrapper inntektstub; + @Field + private ArenaBruker arenaBruker; + @Field + private List arenaAap115; + @Field + private List arenaAap; + @Field + private List arenaDagpenger; + @Field + private RsUdiPerson udistub; + @Field + private PensjonData.PoppInntekt penInntekt; + @Field + private List penTp; + @Field + private PensjonData.Alderspensjon penAlderspensjon; + @Field + private PensjonData.Uforetrygd penUforetrygd; + @Field + private RsInntektsmelding inntektsmelding; + @Field + private RsBregdata brregstub; + @Field + private RsDokarkiv dokarkiv; + @Field + private RsHistark histark; + @Field + private RsSykemelding sykemelding; + @Field + private BankkontoData bankkonto; + @Field + private RsSkjerming skjerming; + @Field + private ArbeidsplassenCVDTO arbeidsplassenCV; + @Field + private List identer; + + @Transient + @JsonIgnore + private boolean ignore; + + public List getIdenter() { + if (isNull(identer)) { + identer = new ArrayList<>(); + } + return identer; + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ArenaBruker { + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime aktiveringDato; + + private ArenaBrukertype arenaBrukertype; + private ArenaKvalifiseringsgruppe kvalifiseringsgruppe; + private Boolean automatiskInnsendingAvMeldekort; + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime inaktiveringDato; + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticTyper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticTyper.java new file mode 100644 index 00000000000..b4fda7de9fd --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticTyper.java @@ -0,0 +1,37 @@ +package no.nav.dolly.elastic; + +public enum ElasticTyper { + + AAREG("Arbeidsregister (AAREG)"), + INST("Institusjonsopphold (INST2)"), + KRRSTUB("Digital kontaktinformasjon (DKIF)"), + SIGRUN_LIGNET("Lignet skatteinntekt (Sigrunstub)"), + SIGRUN_PENSJONSGIVENDE("Pensjonsgivende inntekt (Sigrunstub)"), + ARENA_BRUKER("Arena bruker"), + ARENA_AAP("Arena AAP ytelse"), + ARENA_AAP115("Arena AAP115 rettighet"), + ARENA_DAGP("Arena dagpenger"), + UDISTUB("Utlendingsdirektoratet (UDI)"), + INNTK("Inntektskomponenten (INNTK)"), + PEN_INNTEKT("Pensjonsopptjening (POPP)"), + PEN_TP("Tjenestepensjon (TP)"), + PEN_AP("Alderspensjon (AP)"), + PEN_UT("Uføretrygd (UT)"), + INNTKMELD("Inntektsmelding (ALTINN/JOARK)"), + BRREGSTUB("Brønnøysundregistrene (BRREGSTUB)"), + DOKARKIV("Dokumentarkiv (JOARK)"), + MEDL("Medlemskap (MEDL)"), + HISTARK("Saksmappearkiv (HISTARK)"), + SYKEMELDING("NAV sykemelding"), + SKJERMING("Skjermingsregisteret"), + BANKKONTO("Bankkontoregister"), + BANKKONTO_NORGE("Norsk bankkonto"), + BANKKONTO_UTLAND("Utenlandsk bankkonto"), + ARBEIDSPLASSENCV("Arbeidsplassen CV"); + + private final String beskrivelse; + + ElasticTyper(String beskrivelse) { + this.beskrivelse = beskrivelse; + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java new file mode 100644 index 00000000000..498c39f3a9f --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java @@ -0,0 +1,34 @@ +package no.nav.dolly.elastic.consumer; + +import com.fasterxml.jackson.databind.JsonNode; +import no.nav.dolly.elastic.consumer.command.ElasticPutCommand; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; + +@Service +public class ElasticParamsConsumer { + + private WebClient webClient; + private String username; + private String password; + + public ElasticParamsConsumer( + WebClient.Builder webClientBuilder, + @Value("${open.search.username}") String username, + @Value("${open.search.password}") String password, + @Value("${open.search.uri}") String uri) { + + webClient = webClientBuilder + .baseUrl(uri) + .build(); + this.username = username; + this.password = password; + } + + public Mono oppdaterParametre(JsonNode parametere) { + + return new ElasticPutCommand(webClient, username, password, parametere).call(); + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/command/ElasticPutCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/command/ElasticPutCommand.java new file mode 100644 index 00000000000..4847778fbe6 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/command/ElasticPutCommand.java @@ -0,0 +1,40 @@ +package no.nav.dolly.elastic.consumer.command; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.RequiredArgsConstructor; +import no.nav.dolly.util.WebClientFilter; +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.concurrent.Callable; + +@RequiredArgsConstructor +public class ElasticPutCommand implements Callable> { + + private static final String ELASTIC_SETTINGS_URL = "/bestilling/_settings"; + + private final WebClient webClient; + private final String username; + private final String password; + private final JsonNode params; + + @Override + public Mono call() { + + return webClient.put() + .uri(builder -> builder.path(ELASTIC_SETTINGS_URL) + .build()) + .body(BodyInserters.fromValue(params)) + .headers(httpHeaders -> httpHeaders.setBasicAuth(username, password)) + .retrieve() + .bodyToMono(String.class) + .doOnError(WebClientFilter::logErrorMessage) + .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) + .filter(WebClientFilter::is5xxException)) + .onErrorResume(throwable -> Mono.just(String.format("Feilet å oppdatere %s: %s", + ELASTIC_SETTINGS_URL, WebClientFilter.getMessage(throwable)))); + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/PersonRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/PersonRequest.java new file mode 100644 index 00000000000..ceaa1cfece0 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/PersonRequest.java @@ -0,0 +1,65 @@ +package no.nav.dolly.elastic.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor(force = true) +public class PersonRequest { + + @Schema($comment = "Status: " + + "UOPPGITT, UGIFT," + + "GIFT, ENKE_ELLER_ENKEMANN," + + "SKILT, SEPARERT," + + "REGISTRERT_PARTNER, SEPARERT_PARTNER," + + "SKILT_PARTNER, GJENLEVENDE_PARTNER" + + "SAMBOER") + private SivilstandDTO.Sivilstand sivilstand; + private AdressebeskyttelseDTO.AdresseBeskyttelse addressebeskyttelse; + private Boolean harBarn; + private Boolean harForeldre; + private Boolean harDoedfoedtBarn; + private Boolean harForeldreAnsvar; + private Boolean harVerge; + private Boolean harFullmakt; + private Boolean harDoedsfall; + private Boolean harInnflytting; + private Boolean harUtflytting; + private Boolean harKontaktinformasjonForDoedsbo; + private Boolean harUtenlandskIdentifikasjonsnummer; + private Boolean harFalskIdentitet; + private Boolean harTilrettelagtKommunikasjon; + private Boolean harSikkerhetstiltak; + private Boolean harOpphold; + @Schema($comment = "landkode") + private String statsborgerskap; + private Boolean nyIdentitet; + + private BostedAdresseRequest bostedsadresse; + private Boolean harDeltBosted; + + private Boolean harKontaktadresse; + private Boolean harOppholdsadresse; + + @Data + @Builder + @AllArgsConstructor + @NoArgsConstructor(force = true) + public static class BostedAdresseRequest { + + private String kommunenummer; + private String postnummer; + private String bydelsnummer; + private Boolean harUtenlandsadresse; + private Boolean harMatrikkelAdresse; + private Boolean harUkjentAdresse; + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchRequest.java new file mode 100644 index 00000000000..8c1ec2d08fb --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchRequest.java @@ -0,0 +1,30 @@ +package no.nav.dolly.elastic.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import no.nav.dolly.elastic.ElasticTyper; + +import java.util.ArrayList; +import java.util.List; + +import static java.util.Objects.isNull; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SearchRequest { + + private List typer; + private PersonRequest personRequest; + + public List getTyper() { + + if (isNull(typer)) { + typer = new ArrayList<>(); + } + return typer; + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchResponse.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchResponse.java new file mode 100644 index 00000000000..986aafdd85a --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchResponse.java @@ -0,0 +1,24 @@ +package no.nav.dolly.elastic.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class SearchResponse { + + private long totalHits; + private int pageNumber; + private int pageSize; + private int windowSize; + private List identer; + private String error; +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/mapper/ElasticBestillingStrategyMapping.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/mapper/ElasticBestillingStrategyMapping.java new file mode 100644 index 00000000000..9d25ec0f80d --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/mapper/ElasticBestillingStrategyMapping.java @@ -0,0 +1,103 @@ +package no.nav.dolly.elastic.mapper; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.CustomMapper; +import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MappingContext; +import no.nav.dolly.domain.jpa.Bestilling; +import no.nav.dolly.domain.jpa.BestillingProgress; +import no.nav.dolly.domain.resultset.RsDollyBestilling; +import no.nav.dolly.elastic.ElasticBestilling; +import no.nav.dolly.mapper.MappingStrategy; +import org.springframework.stereotype.Component; + +import static java.util.Objects.nonNull; +import static org.apache.logging.log4j.util.Strings.isBlank; + +@Slf4j +@Component +@RequiredArgsConstructor +public class ElasticBestillingStrategyMapping implements MappingStrategy { + + private final ObjectMapper objectMapper; + + @Override + @SuppressWarnings("java:S3776") + public void register(MapperFactory factory) { + + factory.classMap(RsDollyBestilling.class, ElasticBestilling.class) + .customize(new CustomMapper<>() { + @Override + public void mapAtoB(RsDollyBestilling dollyBestilling, ElasticBestilling elasticBestilling, MappingContext context) { + + elasticBestilling.setPenInntekt(nonNull(dollyBestilling.getPensjonforvalter()) ? + dollyBestilling.getPensjonforvalter().getInntekt() : null); + + elasticBestilling.setPenAlderspensjon(nonNull(dollyBestilling.getPensjonforvalter()) ? + dollyBestilling.getPensjonforvalter().getAlderspensjon() : null); + + elasticBestilling.setPenUforetrygd(nonNull(dollyBestilling.getPensjonforvalter()) ? + dollyBestilling.getPensjonforvalter().getUforetrygd() : null); + + elasticBestilling.setPenTp(nonNull(dollyBestilling.getPensjonforvalter()) ? + dollyBestilling.getPensjonforvalter().getTp() : null); + + elasticBestilling.setSigrunInntekt(dollyBestilling.getSigrunstub()); + + elasticBestilling.setSigrunPensjonsgivende(dollyBestilling.getSigrunstubPensjonsgivende()); + + elasticBestilling.setArenaBruker(nonNull(dollyBestilling.getArenaforvalter()) ? + mapperFacade.map(dollyBestilling.getArenaforvalter(), ElasticBestilling.ArenaBruker.class) : null); + elasticBestilling.setArenaAap(nonNull(dollyBestilling.getArenaforvalter()) ? + dollyBestilling.getArenaforvalter().getAap() : null); + + elasticBestilling.setArenaAap115(nonNull(dollyBestilling.getArenaforvalter()) ? + dollyBestilling.getArenaforvalter().getAap115() : null); + + elasticBestilling.setArenaDagpenger(nonNull(dollyBestilling.getArenaforvalter()) ? + dollyBestilling.getArenaforvalter().getDagpenger() : null); + } + } + ).byDefault() + .register(); + + + factory.classMap(Bestilling.class, ElasticBestilling.class) + .customize(new CustomMapper<>() { + @Override + public void mapAtoB(Bestilling bestilling, ElasticBestilling elasticBestilling, MappingContext context) { + + try { + elasticBestilling.setIgnore(isBlank(bestilling.getBestKriterier()) || + "{}".equals(bestilling.getBestKriterier()) || + bestilling.getProgresser().stream().noneMatch(BestillingProgress::isIdentGyldig)); + + if (!elasticBestilling.isIgnore()) { + + var dollyBestilling = objectMapper.readValue(bestilling.getBestKriterier(), RsDollyBestilling.class); + mapperFacade.map(dollyBestilling, elasticBestilling); + + elasticBestilling.setIdenter(bestilling.getProgresser().stream() + .filter(BestillingProgress::isIdentGyldig) + .map(BestillingProgress::getIdent) + .toList()); + } + + } catch (JsonProcessingException | IllegalArgumentException e) { + + elasticBestilling.setIgnore(true); + log.warn("Kunne ikke konvertere fra JSON for bestilling-ID={}", bestilling.getId()); + + } finally { + + elasticBestilling.setId(bestilling.getId()); + } + } + } + ) + .register(); + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/ElasticsearchSearchService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/ElasticsearchSearchService.java new file mode 100644 index 00000000000..b33c9d13a2b --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/ElasticsearchSearchService.java @@ -0,0 +1,175 @@ +package no.nav.dolly.elastic.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.dolly.elastic.ElasticBestilling; +import no.nav.dolly.elastic.ElasticTyper; +import no.nav.dolly.elastic.dto.SearchRequest; +import no.nav.dolly.elastic.dto.SearchResponse; +import org.springframework.core.convert.ConverterNotFoundException; +import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; +import org.springframework.data.elasticsearch.core.SearchHits; +import org.springframework.data.elasticsearch.core.query.Criteria; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Optional; + +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addAdressebeskyttelseQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBarnQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBostedBydelsnrQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBostedKommuneQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBostedMatrikkelQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBostedPostnrQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBostedUkjentQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addBostedUtlandQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addDoedsfallQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addForeldreQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addFullmaktQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarDeltBostedQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarDoedfoedtbarnQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarFalskIdentitetQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarForeldreansvarQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarInnflyttingQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarKontaktadresseQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarKontaktinformasjonForDoedsboQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarNyIdentitetQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarOppholdQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarOppholdsadresseQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarSikkerhetstiltakQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarTilrettelagtKommunikasjonQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarUtenlandskIdentifikasjonsnummerQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addHarUtflyttingQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addSivilstandQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addStatsborgerskapQuery; +import static no.nav.dolly.elastic.utils.PersonQueryUtils.addVergemaalQuery; + +@Slf4j +@Service +@RequiredArgsConstructor +public class ElasticsearchSearchService { + + private final SearchHelperService searchHelperService; + + public SearchHits getAll(SearchRequest request) { + + return searchHelperService.getRaw(getCriteria(request)); + } + public SearchHits getAll(String ident) { + + var identCriteria = new Criteria("identer").contains(ident); + return searchHelperService.getRaw(identCriteria); + } + + public SearchResponse getTyper(ElasticTyper[] typer) { + + var criteria = new Criteria(); + + Arrays.stream(typer) + .map(this::getCriteria) + .forEach(criteria::and); + + try { + return searchHelperService.search(criteria); + + } catch ( + UncategorizedElasticsearchException | ConverterNotFoundException e) { + + log.warn("Feilet å utføre søk {}: {}", criteria, e.getLocalizedMessage()); + return SearchResponse.builder() + .error(e.getLocalizedMessage()) + .build(); + } + } + + public SearchResponse search(SearchRequest request) { + + var criteria = getCriteria(request); + + try { + return searchHelperService.search(criteria); + + } catch ( + UncategorizedElasticsearchException | ConverterNotFoundException e) { + + log.warn("Feilet å utføre søk {}: {}", criteria, e.getLocalizedMessage()); + return SearchResponse.builder() + .error(e.getLocalizedMessage()) + .build(); + } + } + + private Criteria getCriteria(SearchRequest request) { + + var criteria = new Criteria(); + + request.getTyper().stream() + .map(this::getCriteria) + .forEach(criteria::and); + + Optional.ofNullable(request.getPersonRequest()) + .ifPresent(value -> { + addBarnQuery(criteria, request); + addForeldreQuery(criteria, request); + addSivilstandQuery(criteria, request); + addHarDoedfoedtbarnQuery(criteria, request); + addHarForeldreansvarQuery(criteria, request); + addVergemaalQuery(criteria, request); + addFullmaktQuery(criteria, request); + addDoedsfallQuery(criteria, request); + addHarInnflyttingQuery(criteria, request); + addHarUtflyttingQuery(criteria, request); + addAdressebeskyttelseQuery(criteria, request); + addHarOppholdsadresseQuery(criteria, request); + addHarKontaktadresseQuery(criteria, request); + addBostedKommuneQuery(criteria, request); + addBostedPostnrQuery(criteria, request); + addBostedBydelsnrQuery(criteria, request); + addBostedUtlandQuery(criteria, request); + addBostedMatrikkelQuery(criteria, request); + addBostedUkjentQuery(criteria, request); + addHarDeltBostedQuery(criteria, request); + addHarKontaktinformasjonForDoedsboQuery(criteria, request); + addHarUtenlandskIdentifikasjonsnummerQuery(criteria, request); + addHarFalskIdentitetQuery(criteria, request); + addHarTilrettelagtKommunikasjonQuery(criteria, request); + addHarSikkerhetstiltakQuery(criteria, request); + addStatsborgerskapQuery(criteria, request); + addHarOppholdQuery(criteria, request); + addHarNyIdentitetQuery(criteria, request); + }); + return criteria; + } + + private Criteria getCriteria(ElasticTyper type) { + + return switch (type) { + case AAREG -> new Criteria("aareg").exists(); + case INST -> new Criteria("instdata").exists(); + case KRRSTUB -> new Criteria("krrstub").exists(); + case SIGRUN_LIGNET -> new Criteria("sigrunInntekt").exists(); + case SIGRUN_PENSJONSGIVENDE -> new Criteria("sigrunPensjonsgivende").exists(); + case ARENA_BRUKER -> new Criteria("arenaBruker").exists(); + case ARENA_AAP -> new Criteria("arenaAap").exists(); + case ARENA_AAP115 -> new Criteria("arenaAap115").exists(); + case ARENA_DAGP -> new Criteria("arenaDagpenger").exists(); + case UDISTUB -> new Criteria("udistub").exists(); + case INNTK -> new Criteria("inntektstub").exists(); + case PEN_INNTEKT -> new Criteria("penInntekt").exists(); + case PEN_TP -> new Criteria("penTp").exists(); + case PEN_AP -> new Criteria("penAlderspensjon").exists(); + case PEN_UT -> new Criteria("penUforetrygd").exists(); + case INNTKMELD -> new Criteria("inntektsmelding").exists(); + case BRREGSTUB -> new Criteria("brregstub").exists(); + case DOKARKIV -> new Criteria("dokarkiv").exists(); + case MEDL -> new Criteria("medl").exists(); + case HISTARK -> new Criteria("histark").exists(); + case SYKEMELDING -> new Criteria("sykemelding").exists(); + case SKJERMING -> new Criteria("skjerming").exists(); + case BANKKONTO -> new Criteria("bankkonto").exists(); + case BANKKONTO_NORGE -> new Criteria("bankkonto.norskBankkonto").exists(); + case BANKKONTO_UTLAND -> new Criteria("bankkonto.utenlandskBankkonto").exists(); + case ARBEIDSPLASSENCV -> new Criteria("arbeidsplassenCV").exists(); + }; + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/SearchHelperService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/SearchHelperService.java new file mode 100644 index 00000000000..68406e5010f --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/SearchHelperService.java @@ -0,0 +1,106 @@ +package no.nav.dolly.elastic.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.dolly.elastic.ElasticBestilling; +import no.nav.dolly.elastic.dto.SearchResponse; +import org.springframework.data.domain.Pageable; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; +import org.springframework.data.elasticsearch.core.SearchHit; +import org.springframework.data.elasticsearch.core.SearchHits; +import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; +import org.springframework.data.elasticsearch.core.query.Criteria; +import org.springframework.data.elasticsearch.core.query.CriteriaQueryBuilder; +import org.springframework.stereotype.Service; + +import java.security.SecureRandom; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SearchHelperService { + + private static final String INDEX_NAME = "bestilling"; + + private static final int WINDOW_SIZE = 10; + private static final double FACTOR = 2; + + private final ElasticsearchOperations elasticsearchOperations; + private Random random = new SecureRandom(); + + public SearchHits getRaw(Criteria criteria) { + + return elasticsearchOperations.search(new CriteriaQueryBuilder(criteria) + .withTimeout(Duration.ofSeconds(3)) + .build(), + ElasticBestilling.class, IndexCoordinates.of(INDEX_NAME)); + } + + public SearchResponse search(Criteria criteria) { + + var blockSize = (int) (WINDOW_SIZE * FACTOR); + var currentPage = 0; + var hits = search(criteria, blockSize, currentPage); + var noOfPages = (int) Math.ceil(hits.getTotalHits() / (WINDOW_SIZE * FACTOR)); + + if (noOfPages > 0) { + + currentPage = random.nextInt(noOfPages); + if (currentPage + 1 == noOfPages) { + + currentPage = currentPage / 2; + blockSize = blockSize * 2; + hits = search(criteria, blockSize, currentPage); + + } else if (currentPage > 0) { + hits = search(criteria, blockSize, currentPage); + } + } + log.info("Total hits={}, currentSize={}, currentPage={}", hits.getTotalHits(), blockSize, currentPage); + + var identer = hits.getSearchHits().stream() + .map(SearchHit::getContent) + .map(ElasticBestilling::getIdenter) + .flatMap(Collection::stream) + .distinct() + .collect(toShuffledList()); + + return SearchResponse.builder() + .identer(identer.subList(0, Math.min(identer.size(), WINDOW_SIZE))) + .totalHits(hits.getTotalHits()) + .pageNumber(currentPage) + .pageSize(blockSize) + .windowSize(WINDOW_SIZE) + .build(); + } + + private static final Collector SHUFFLER = Collectors.collectingAndThen( + Collectors.toCollection(ArrayList::new), + list -> { + Collections.shuffle(list); + return list; + } + ); + + @SuppressWarnings("unchecked") + private static Collector> toShuffledList() { + return (Collector>) SHUFFLER; + } + + private SearchHits search(Criteria criteria, int pageSize, int pageNo) { + + return elasticsearchOperations.search(new CriteriaQueryBuilder(criteria) + .withPageable(Pageable.ofSize(pageSize).withPage(pageNo)) + .withTimeout(Duration.ofSeconds(3)) + .build(), + ElasticBestilling.class, IndexCoordinates.of(INDEX_NAME)); + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/OpensearchImport.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/OpensearchImport.java new file mode 100644 index 00000000000..a680a1c7497 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/OpensearchImport.java @@ -0,0 +1,106 @@ +package no.nav.dolly.elastic.utils; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import ma.glasnost.orika.MapperFacade; +import no.nav.dolly.domain.jpa.Bestilling; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.dolly.elastic.ElasticBestilling; +import no.nav.dolly.elastic.consumer.ElasticParamsConsumer; +import no.nav.dolly.repository.BestillingRepository; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationListener; +import org.springframework.context.annotation.Profile; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import reactor.core.publisher.Flux; + +import java.io.IOException; +import java.util.Comparator; +import java.util.concurrent.atomic.AtomicInteger; + +@Slf4j +@Profile("!test") +@Component +@RequiredArgsConstructor +public class OpensearchImport implements ApplicationListener { + + private static final String INDEX_SETTING = + "{\"settings\":{\"index\":{\"mapping\":{\"total_fields\":{\"limit\":\"%s\"}}}}}"; + + @Value("${open.search.total-fields}") + private String totalFields; + + private final BestillingRepository bestillingRepository; + private final BestillingElasticRepository bestillingElasticRepository; + private final MapperFacade mapperFacade; + private final ElasticParamsConsumer elasticParamsConsumer; + private final ObjectMapper objectMapper; + + @Override + @Transactional + public void onApplicationEvent(ContextRefreshedEvent event) { + + oppdaterIndexSetting(); + + var start = System.currentTimeMillis(); + var antallLest = new AtomicInteger(0); + var antallSkrevet = new AtomicInteger(0); + log.info("OpenSearch database oppdatering starter ..."); + + importAll(antallLest, antallSkrevet); + + log.info("OpenSearch database oppdatering ferdig; antall lest {}, antall skrevet {}, medgått tid {} ms", + antallLest.get(), + antallSkrevet.get(), + System.currentTimeMillis() - start); + } + + private void oppdaterIndexSetting() { + + try { + var indexSetting = String.format(INDEX_SETTING, totalFields); + var jsonFactory = objectMapper.getFactory(); + var jsonParser = jsonFactory.createParser(indexSetting); + var jsonNode = (JsonNode) objectMapper.readTree(jsonParser); + elasticParamsConsumer.oppdaterParametre(jsonNode) + .subscribe(status -> log.info("OpenSearch; status fra indeks parameter oppdatering: {}", status)); + + } catch (IOException e) { + log.error("Feilet å gjøre setting for indekser {}", INDEX_SETTING, e); + } + } + + private void importAll(AtomicInteger antallLest, AtomicInteger antallSkrevet) { + + Flux.fromIterable(bestillingRepository.findAll()) + .sort(Comparator.comparing(Bestilling::getId).reversed()) + .doOnNext(bestilling -> antallLest.incrementAndGet()) + .takeWhile(bestilling -> hasNotBestilling(bestilling.getId())) + .map(bestilling -> mapperFacade.map(bestilling, ElasticBestilling.class)) + .filter(bestilling -> !bestilling.isIgnore()) + .doOnNext(bestilling -> antallSkrevet.incrementAndGet()) + .doOnNext(this::save) + .subscribe(); + } + + private boolean hasNotBestilling(Long id) { + + return !bestillingElasticRepository.existsById(id); + } + + private void save(ElasticBestilling elasticBestilling) { + + try { + bestillingElasticRepository.save(elasticBestilling); + + } catch (UncategorizedElasticsearchException e) { + + log.warn("Feilet å lagre elastic id {}, {}", elasticBestilling.getId(), e.getLocalizedMessage()); + } + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/PersonQueryUtils.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/PersonQueryUtils.java new file mode 100644 index 00000000000..235e9d30b3f --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/utils/PersonQueryUtils.java @@ -0,0 +1,228 @@ +package no.nav.dolly.elastic.utils; + +import lombok.experimental.UtilityClass; +import no.nav.dolly.elastic.dto.SearchRequest; +import org.springframework.data.elasticsearch.core.query.Criteria; + +import java.util.Optional; + +import static java.util.Objects.nonNull; +import static org.apache.commons.lang3.BooleanUtils.isTrue; +import static org.apache.commons.lang3.StringUtils.isNotBlank; + +@UtilityClass +public class PersonQueryUtils { + + public static void addBarnQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarBarn())) { + criteria.and(getCriteria("pdldata.person.forelderBarnRelasjon.relatertPersonsRolle", "BARN")); + } + } + + public static void addForeldreQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarForeldre())) { + criteria.and(getCriteria("pdldata.person.forelderBarnRelasjon.minRolleForPerson", "BARN")); + } + } + + public static void addSivilstandQuery(Criteria criteria, SearchRequest request) { + + if (nonNull(request.getPersonRequest().getSivilstand())) { + criteria.and(getCriteria("pdldata.person.sivilstand.type", + request.getPersonRequest().getSivilstand().name())); + } + } + + public static void addHarDoedfoedtbarnQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarDoedfoedtBarn())) { + criteria.and(new Criteria("pdldata.person.doedfoedtBarn").exists()); + } + } + + public static void addHarForeldreansvarQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarForeldreAnsvar())) { + criteria.and(new Criteria("pdldata.person.foreldreansvar").exists()); + } + } + + public static void addVergemaalQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarVerge())) { + criteria.and(new Criteria("pdldata.person.vergemaal").exists()); + } + } + + public static void addDoedsfallQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarDoedsfall())) { + criteria.and(new Criteria("pdldata.person.doedsfall").exists()); + } + } + + public static void addFullmaktQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarFullmakt())) { + criteria.and(new Criteria("pdldata.person.fullmakt").exists()); + } + } + + public static void addHarInnflyttingQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarInnflytting())) { + criteria.and(new Criteria("pdldata.person.innflytting").exists()); + } + } + + public static void addHarUtflyttingQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarUtflytting())) { + criteria.and(new Criteria("pdldata.person.utflytting").exists()); + } + } + + public static void addAdressebeskyttelseQuery(Criteria criteria, SearchRequest request) { + + if (nonNull(request.getPersonRequest().getAddressebeskyttelse())) { + criteria.and(getCriteria("pdldata.person.adressebeskyttelse.gradering", + request.getPersonRequest().getAddressebeskyttelse().name())); + } + } + + public static void addHarOppholdsadresseQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarOppholdsadresse())) { + criteria.and(new Criteria("pdldata.person.oppholdsadresse").exists()); + } + } + + public static void addHarKontaktadresseQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarKontaktadresse())) { + criteria.and(new Criteria("pdldata.person.kontaktadresse").exists()); + } + } + + public static void addBostedKommuneQuery(Criteria criteria, SearchRequest request) { + + Optional.ofNullable(request.getPersonRequest().getBostedsadresse()) + .filter(boadresse -> isNotBlank(boadresse.getKommunenummer())) + .ifPresent(boadresse -> + criteria.and(getCriteria("pdldata.person.bostedsadresse.vegadresse.kommunenummer", + boadresse.getKommunenummer()))); + } + + public static void addBostedPostnrQuery(Criteria criteria, SearchRequest request) { + + Optional.ofNullable(request.getPersonRequest().getBostedsadresse()) + .filter(boadresse -> isNotBlank(boadresse.getPostnummer())) + .ifPresent(boadresse -> + criteria.and(getCriteria("pdldata.person.bostedsadresse.vegadresse.postnummer", + boadresse.getPostnummer()))); + } + + public static void addBostedBydelsnrQuery(Criteria criteria, SearchRequest request) { + + Optional.ofNullable(request.getPersonRequest().getBostedsadresse()) + .filter(boadresse -> isNotBlank(boadresse.getBydelsnummer())) + .ifPresent(boadresse -> + criteria.and(getCriteria("pdldata.person.bostedsadresse.vegadresse.bydelsnummer", + boadresse.getBydelsnummer()))); + } + + public static void addBostedUtlandQuery(Criteria criteria, SearchRequest request) { + + Optional.ofNullable(request.getPersonRequest().getBostedsadresse()) + .filter(boadresse -> isTrue(boadresse.getHarUtenlandsadresse())) + .ifPresent(boadresse -> + criteria.and(new Criteria("pdldata.person.bostedsadresse.utenlandskAdresse").exists())); + } + + public static void addBostedMatrikkelQuery(Criteria criteria, SearchRequest request) { + + Optional.ofNullable(request.getPersonRequest().getBostedsadresse()) + .filter(boadresse -> isTrue(boadresse.getHarMatrikkelAdresse())) + .ifPresent(boadresse -> + criteria.and(new Criteria("pdldata.person.bostedsadresse.matrikkeladresse").exists())); + } + + public static void addBostedUkjentQuery(Criteria criteria, SearchRequest request) { + + Optional.ofNullable(request.getPersonRequest().getBostedsadresse()) + .filter(boadresse -> isTrue(boadresse.getHarUkjentAdresse())) + .ifPresent(boadresse -> + criteria.and(new Criteria("pdldata.person.bostedsadresse.ukjentBosted").exists())); + } + + public static void addHarDeltBostedQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarDeltBosted())) { + criteria.and(new Criteria("pdldata.person.forelderBarnRelasjon.deltBosted").exists()); + } + } + + public static void addHarKontaktinformasjonForDoedsboQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarKontaktinformasjonForDoedsbo())) { + criteria.and(new Criteria("pdldata.person.kontaktinformasjonForDoedsbo").exists()); + } + } + + public static void addHarUtenlandskIdentifikasjonsnummerQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarUtenlandskIdentifikasjonsnummer())) { + criteria.and(new Criteria("pdldata.person.utenlandskIdentifikasjonsnummer").exists()); + } + } + + public static void addHarFalskIdentitetQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarFalskIdentitet())) { + criteria.and(new Criteria("pdldata.person.falskIdentitet").exists()); + } + } + + public static void addHarTilrettelagtKommunikasjonQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarTilrettelagtKommunikasjon())) { + criteria.and(new Criteria("pdldata.person.tilrettelagtKommunikasjon").exists()); + } + } + + public static void addHarSikkerhetstiltakQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarSikkerhetstiltak())) { + criteria.and(new Criteria("pdldata.person.sikkerhetstiltak").exists()); + } + } + + public static void addStatsborgerskapQuery(Criteria criteria, SearchRequest request) { + + if (isNotBlank(request.getPersonRequest().getStatsborgerskap())) { + criteria.and(new Criteria("pdldata.person.statsborgerskap.landkode") + .is(request.getPersonRequest().getStatsborgerskap())); + } + } + + public static void addHarOppholdQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getHarOpphold())) { + criteria.and(new Criteria("pdldata.person.opphold").exists()); + } + } + + public static void addHarNyIdentitetQuery(Criteria criteria, SearchRequest request) { + + if (isTrue(request.getPersonRequest().getNyIdentitet())) { + criteria.and(new Criteria("pdldata.person.nyident").exists()); + } + } + + private Criteria getCriteria(String field, String value) { + + return new Criteria(field).is(value); + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingPdlOrdreStatusMapper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingPdlOrdreStatusMapper.java index 5ee7233ed93..4df9cf49bea 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingPdlOrdreStatusMapper.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingPdlOrdreStatusMapper.java @@ -9,9 +9,9 @@ import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsStatusRapport; import no.nav.dolly.domain.resultset.SystemTyper; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PdlStatus; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact; +import no.nav.testnav.libs.data.pdlforvalter.v1.PdlStatus; import java.util.ArrayList; import java.util.Collection; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/OriginatorMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/OriginatorMappingStrategy.java index 5cc6dcdd784..f8a79c84806 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/OriginatorMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/OriginatorMappingStrategy.java @@ -5,8 +5,8 @@ import ma.glasnost.orika.MappingContext; import no.nav.dolly.domain.resultset.pdldata.PdlPersondata; import no.nav.dolly.mapper.MappingStrategy; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/properties/CredentialsProps.java b/apps/dolly-backend/src/main/java/no/nav/dolly/properties/CredentialsProps.java deleted file mode 100644 index b680aeca908..00000000000 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/properties/CredentialsProps.java +++ /dev/null @@ -1,40 +0,0 @@ -package no.nav.dolly.properties; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -import static no.nav.dolly.properties.Environment.PREPROD; - -@Getter -@Setter -@Configuration -@ConfigurationProperties(prefix = "credentials") -public class CredentialsProps { - - private Preprod preprod = new Preprod(); - private Test test = new Test(); - - public String getUsername(Environment env) { - return env == PREPROD ? this.getPreprod().getUsername() : this.getTest().getUsername(); - } - - public String getPassword(Environment env) { - return env == PREPROD ? this.getPreprod().getPassword() : this.getTest().getPassword(); - } - - @Getter - @Setter - public static class Preprod { - private String username; - private String password; - } - - @Getter - @Setter - public static class Test { - private String username; - private String password; - } -} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/properties/Environment.java b/apps/dolly-backend/src/main/java/no/nav/dolly/properties/Environment.java deleted file mode 100644 index cf4aa8ccf2d..00000000000 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/properties/Environment.java +++ /dev/null @@ -1,5 +0,0 @@ -package no.nav.dolly.properties; - -public enum Environment { - PREPROD, TEST; -} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/properties/JiraProps.java b/apps/dolly-backend/src/main/java/no/nav/dolly/properties/JiraProps.java deleted file mode 100644 index 13097c9ab6b..00000000000 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/properties/JiraProps.java +++ /dev/null @@ -1,17 +0,0 @@ -package no.nav.dolly.properties; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Getter -@Setter -@Configuration -@ConfigurationProperties(prefix = "jira") -public class JiraProps { - - private String host; - private String username; - private String password; -} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/ElasticController.java b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/ElasticController.java new file mode 100644 index 00000000000..8d3e4446c15 --- /dev/null +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/ElasticController.java @@ -0,0 +1,81 @@ +package no.nav.dolly.provider.api; + +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.dolly.elastic.ElasticBestilling; +import no.nav.dolly.elastic.ElasticTyper; +import no.nav.dolly.elastic.dto.SearchRequest; +import no.nav.dolly.elastic.dto.SearchResponse; +import no.nav.dolly.elastic.service.ElasticsearchSearchService; +import no.nav.dolly.exceptions.NotFoundException; +import org.springframework.data.elasticsearch.core.SearchHits; +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 static java.lang.String.format; + +@RestController +@RequestMapping("/api/v1/elastic") +@RequiredArgsConstructor +public class ElasticController { + + private final ElasticsearchSearchService elasticsearchSearchService; + private final BestillingElasticRepository bestillingElasticRepository; + + @PostMapping("/search-hits") + @Operation(description = "Henter all lagret informasjon i hht request") + public SearchHits getAll(@RequestBody(required = false) SearchRequest request) { + + return elasticsearchSearchService.getAll(request); + } + + @GetMapping("/search-hits/ident/{ident}") + @Operation(description = "Henter all lagret informasjon basert på ident") + public SearchHits getAll(@PathVariable String ident) { + + return elasticsearchSearchService.getAll(ident); + } + + @GetMapping("/identer") + @Operation(description = "Henter identer som matcher søk i request, registre kun") + public SearchResponse getIdenterMed(@RequestParam ElasticTyper... typer) { + + return elasticsearchSearchService.getTyper(typer); + } + + @PostMapping("/identer") + @Operation(description = "Henter identer som matcher søk i request, både registre og persondetaljer") + public SearchResponse getIdenterMed(@RequestBody SearchRequest request) { + + return elasticsearchSearchService.search(request); + } + + @GetMapping("/bestilling/id/{id}") + @Operation(description = "Henter lagret bestilling, basert på id") + public ElasticBestilling getBestillinger(@PathVariable long id) { + + return bestillingElasticRepository.findById(id) + .orElseThrow(() -> new NotFoundException(format("Bestilling med id: %d finnes ikke", id))); + } + + @DeleteMapping("/bestilling/id/{id}") + @Operation(description = "Sletter søkbar bestilling, basert på id") + public void deleteBestilling(@PathVariable long id) { + + bestillingElasticRepository.deleteById(id); + } + + @DeleteMapping() + @Operation(description = "Sletter all data") + public void delete() { + + bestillingElasticRepository.deleteAll(); + } +} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/TagController.java b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/TagController.java index e70a631385f..54c25bbee3c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/TagController.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/TagController.java @@ -14,9 +14,9 @@ import no.nav.dolly.domain.resultset.Tags.TagBeskrivelse; import no.nav.dolly.exceptions.NotFoundException; import no.nav.dolly.repository.TestgruppeRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; import org.springframework.cache.annotation.CacheEvict; import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingProgressRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingProgressRepository.java index 7218e30473a..e27e064d0be 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingProgressRepository.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingProgressRepository.java @@ -25,6 +25,8 @@ public interface BestillingProgressRepository extends CrudRepository findByIdent(String ident); + List findByBestilling_Id(Long bestillingId); + @Modifying @Query(value = "update BestillingProgress bp set bp.ident = :newIdent where bp.ident = :oldIdent") void swapIdent(@Param(value = "oldIdent") String oldIdent, @Param(value = "newIdent") String newIdent); diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java index 3c97397b790..4f26489068e 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java @@ -10,7 +10,6 @@ import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.Testgruppe; -import no.nav.dolly.domain.jpa.Testident; import no.nav.dolly.domain.resultset.BestilteKriterier; import no.nav.dolly.domain.resultset.RsDollyBestilling; import no.nav.dolly.domain.resultset.RsDollyBestillingLeggTilPaaGruppe; @@ -19,6 +18,7 @@ import no.nav.dolly.domain.resultset.aareg.RsAareg; import no.nav.dolly.domain.resultset.aareg.RsOrganisasjon; import no.nav.dolly.domain.resultset.entity.bestilling.RsBestillingFragment; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.exceptions.ConstraintViolationException; import no.nav.dolly.exceptions.DollyFunctionalException; import no.nav.dolly.exceptions.NotFoundException; @@ -39,6 +39,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Set; @@ -75,6 +76,7 @@ public class BestillingService { private final TestgruppeRepository testgruppeRepository; private final BrukerService brukerService; private final GetUserInfo getUserInfo; + private final BestillingElasticRepository elasticRepository; public Bestilling fetchBestillingById(Long bestillingId) { return bestillingRepository.findById(bestillingId) @@ -201,12 +203,12 @@ public Consumer cleanBestilling() { @Transactional public Bestilling saveBestilling(RsDollyUpdateRequest request, String ident) { - Testident testident = identRepository.findByIdent(ident) + var testident = identRepository.findByIdent(ident) .orElseThrow(() -> new NotFoundException(format("Testident %s ble ikke funnet", ident))); var bruker = fetchOrCreateBruker(); fixAaregAbstractClassProblem(request.getAareg()); - Bestilling bestilling = Bestilling.builder() + var bestilling = Bestilling.builder() .gruppe(testident.getTestgruppe()) .ident(ident) .antallIdenter(1) @@ -353,6 +355,12 @@ public Bestilling saveBestilling(Long gruppeId, RsDollyBestillingLeggTilPaaGrupp public void slettBestillingerByGruppeId(Long gruppeId) { + testgruppeRepository.findById(gruppeId).stream() + .map(Testgruppe::getBestillinger) + .flatMap(Collection::stream) + .map(Bestilling::getId) + .forEach(elasticRepository::deleteById); + bestillingKontrollRepository.deleteByGruppeId(gruppeId); bestillingProgressRepository.deleteByGruppeId(gruppeId); bestillingRepository.deleteByGruppeId(gruppeId); @@ -364,6 +372,7 @@ public void slettBestillingByBestillingId(Long bestillingId) { bestillingProgressRepository.deleteByBestilling_Id(bestillingId); bestillingKontrollRepository.deleteByBestillingWithNoChildren(bestillingId); bestillingRepository.deleteById(bestillingId); + elasticRepository.deleteById(bestillingId); } public void slettBestillingByTestIdent(String ident) { @@ -380,6 +389,7 @@ public void slettBestillingByTestIdent(String ident) { bestillingKontrollRepository.deleteByBestillingWithNoChildren(id); bestillingRepository.deleteBestillingWithNoChildren(id); + elasticRepository.deleteById(id); }); } @@ -441,4 +451,9 @@ private static void fixAaregAbstractClassProblem(List aaregdata) { } }); } + + public List getProgressByBestillingId(Long bestillingId) { + + return bestillingProgressRepository.findByBestilling_Id(bestillingId); + } } \ No newline at end of file diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java index 79f6a3d0afe..dce039152a5 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java @@ -12,12 +12,12 @@ import no.nav.dolly.domain.resultset.entity.testident.RsWhereAmI; import no.nav.dolly.exceptions.NotFoundException; import no.nav.dolly.repository.IdentRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/PersonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/PersonService.java index e5cb84338e7..a9b3bb6850a 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/PersonService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/PersonService.java @@ -9,12 +9,12 @@ import no.nav.dolly.domain.PdlPersonBolk; import no.nav.dolly.domain.dto.TestidentDTO; import no.nav.dolly.domain.jpa.Testident; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/BankkontoExcelService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/BankkontoExcelService.java index f7340687b5c..26c9155646b 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/BankkontoExcelService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/BankkontoExcelService.java @@ -6,7 +6,7 @@ import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.jpa.Testgruppe; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoDTO; +import no.nav.testnav.libs.data.kontoregister.v1.KontoDTO; import org.apache.poi.ss.usermodel.IgnoredErrorType; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -24,7 +24,9 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static no.nav.dolly.service.excel.ExcelUtil.*; +import static no.nav.dolly.service.excel.ExcelUtil.BANKKONTO_COL_WIDTHS; +import static no.nav.dolly.service.excel.ExcelUtil.BANKKONTO_FANE; +import static no.nav.dolly.service.excel.ExcelUtil.BANKKONTO_HEADER; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Slf4j diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/PersonExcelService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/PersonExcelService.java index 986dab30c5e..1719eec1ff5 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/PersonExcelService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/PersonExcelService.java @@ -11,14 +11,14 @@ import no.nav.dolly.domain.jpa.Testident; import no.nav.dolly.util.DatoFraIdentUtil; import no.nav.dolly.util.IdentTypeUtil; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IgnoredErrorType; import org.apache.poi.ss.util.CellRangeAddress; diff --git a/apps/dolly-backend/src/main/resources/application-dev.yaml b/apps/dolly-backend/src/main/resources/application-dev.yaml index 1791bf94b59..24bba60292a 100644 --- a/apps/dolly-backend/src/main/resources/application-dev.yaml +++ b/apps/dolly-backend/src/main/resources/application-dev.yaml @@ -14,4 +14,4 @@ consumers: url: http://testnav-pdl-forvalter-dev.dolly.svc.cluster.local testnav-organisasjon-tilgang-service: cluster: dev-gcp - url: http://testnav-organisasjon-tilgang-service.dolly.svc.cluster.local \ No newline at end of file + url: http://testnav-organisasjon-tilgang-service.dolly.svc.cluster.local diff --git a/apps/dolly-backend/src/main/resources/application-local.yaml b/apps/dolly-backend/src/main/resources/application-local.yaml index 3d27ef8cb0c..451b25e4adc 100644 --- a/apps/dolly-backend/src/main/resources/application-local.yaml +++ b/apps/dolly-backend/src/main/resources/application-local.yaml @@ -39,6 +39,15 @@ management: include: "*" path-mapping: prometheus: "prometheus" + health: + elasticsearch: + enabled: false + +open: + search: + uri: http://localhost:9200 + username: dummy + password: dummy consumers: testnav-pdl-forvalter: diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml index 46c5708b5ee..5932435d1e7 100644 --- a/apps/dolly-backend/src/main/resources/application.yaml +++ b/apps/dolly-backend/src/main/resources/application.yaml @@ -82,6 +82,10 @@ logging: results: jdbc: ERROR +open: + search: + total-fields: 1500 + consumers: testnav-organisasjon-forvalter: name: testnav-organisasjon-forvalter diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml index 8404dbd99f3..c5446a2acc1 100644 --- a/apps/dolly-backend/src/main/resources/logback-spring.xml +++ b/apps/dolly-backend/src/main/resources/logback-spring.xml @@ -39,6 +39,8 @@ + + diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java index 6ecd97d5fcd..42ee11142ff 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import no.nav.dolly.bestilling.aareg.domain.ArbeidsforholdRespons; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.testnav.libs.dto.aareg.v1.Arbeidsforhold; import no.nav.testnav.libs.dto.aareg.v1.OrdinaerArbeidsavtale; import no.nav.testnav.libs.dto.aareg.v1.Organisasjon; @@ -16,6 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -57,6 +59,12 @@ class AaregConsumerTest { @MockBean private TokenExchange tokenService; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + private Arbeidsforhold opprettRequest; private ArbeidsforholdRespons arbeidsforholdRespons; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java index 33e48a32be7..d8e29a9d42d 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java @@ -3,6 +3,7 @@ import no.nav.dolly.domain.resultset.arenaforvalter.ArenaBruker; import no.nav.dolly.domain.resultset.arenaforvalter.ArenaNyBruker; import no.nav.dolly.domain.resultset.arenaforvalter.ArenaNyeBrukere; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -15,6 +16,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -49,6 +51,12 @@ class ArenaForvalterConsumerTest { @Autowired private ArenaForvalterConsumer arenaForvalterConsumer; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @BeforeEach void setup() { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java index f4c60501e71..8a5bdf1c5ea 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java @@ -1,6 +1,7 @@ package no.nav.dolly.bestilling.instdata; import no.nav.dolly.domain.resultset.inst.Instdata; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.errorhandling.ErrorStatusDecoder; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; @@ -13,6 +14,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -51,6 +53,12 @@ class InstdataConsumerTest { @Autowired private InstdataConsumer instdataConsumer; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @BeforeEach void setup() { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java index 407138d5e00..2e26426511d 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java @@ -3,9 +3,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.client.WireMock; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -18,6 +19,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; @@ -49,6 +51,12 @@ class KontoregisterConsumerTest { @MockBean private TokenExchange tokenService; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @Autowired private KontoregisterConsumer kontoregisterConsumer; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategyTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategyTest.java index 27a111227ec..473841d8981 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategyTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategyTest.java @@ -3,8 +3,8 @@ import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MappingContext; import no.nav.dolly.mapper.utils.MapperTestUtils; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java index b9f527da366..d5afa94ac60 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java @@ -5,6 +5,7 @@ import no.nav.dolly.bestilling.krrstub.dto.DigitalKontaktdataResponse; import no.nav.dolly.domain.CommonKeysAndUtils; import no.nav.dolly.domain.resultset.krrstub.DigitalKontaktdata; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -16,6 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; @@ -54,6 +56,12 @@ class KrrstubConsumerTest { @MockBean private TokenExchange tokenService; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @Autowired private KrrstubConsumer krrStubConsumer; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java index 4587fe9cc84..6aa4613ac43 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java @@ -5,6 +5,7 @@ import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonTpForholdRequest; import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonTpYtelseRequest; import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonforvalterResponse; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -16,6 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -43,6 +45,12 @@ class PensjonforvalterConsumerTest { @MockBean private TokenExchange tokenService; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @Autowired private PensjonforvalterConsumer pensjonforvalterConsumer; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategyTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategyTest.java index de738c8379c..0a9dd38bee8 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategyTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategyTest.java @@ -6,7 +6,7 @@ import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSivilstandWrapper; import no.nav.dolly.mapper.strategy.LocalDateCustomMapping; import no.nav.dolly.mapper.utils.MapperTestUtils; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java index 5fb9a3c77da..a2d09fd56ad 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java @@ -6,7 +6,7 @@ import no.nav.dolly.bestilling.sigrunstub.dto.SigrunstubLignetInntektRequest; import no.nav.dolly.bestilling.sigrunstub.dto.SigrunstubPensjonsgivendeInntektRequest; import no.nav.dolly.bestilling.sigrunstub.dto.SigrunstubResponse; -import no.nav.dolly.config.Consumers; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -18,6 +18,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; @@ -49,6 +50,12 @@ class SigrunStubConsumerTest { @MockBean private TokenExchange tokenService; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @Autowired private SigrunStubConsumer sigrunStubConsumer; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java index 1f65f19cb66..8c3f2a441a9 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java @@ -3,7 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.client.WireMock; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -15,6 +16,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -52,6 +54,12 @@ class TpsMessagingConsumerTest { @MockBean private AccessToken accessToken; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @Autowired private TpsMessagingConsumer tpsMessagingConsumer; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/config/OpenSearchConfig.java b/apps/dolly-backend/src/test/java/no/nav/dolly/config/OpenSearchConfig.java new file mode 100644 index 00000000000..6c94c7f5b8c --- /dev/null +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/config/OpenSearchConfig.java @@ -0,0 +1,34 @@ +package no.nav.dolly.config; + +import org.opensearch.client.RestHighLevelClient; +import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration; +import org.opensearch.data.client.orhlc.ClientConfiguration; +import org.opensearch.data.client.orhlc.RestClients; +import org.opensearch.testcontainers.OpensearchContainer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; +import org.testcontainers.utility.DockerImageName; + +@Configuration +@EnableElasticsearchRepositories("no.nav.dolly.elastic") +public class OpenSearchConfig extends AbstractOpenSearchConfiguration { + + private static final DockerImageName OPENSEARCH_IMAGE = DockerImageName.parse("opensearchproject/opensearch:2.0.0"); + + @Override + @Bean + public RestHighLevelClient opensearchClient() { + + var container = new OpensearchContainer(OPENSEARCH_IMAGE); + // Start the container. This step might take some time... + container.start(); + assert (container.isRunning()); + + final ClientConfiguration clientConfiguration = ClientConfiguration.builder() + .connectedTo(container.getHost() + ":" + container.getFirstMappedPort()) + .build(); + + return RestClients.create(clientConfiguration).rest(); + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java index b137ab3242e..742699674c8 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java @@ -8,11 +8,15 @@ import no.nav.dolly.domain.jpa.Testident; import no.nav.dolly.domain.resultset.entity.testgruppe.RsTestgruppe; import no.nav.dolly.domain.resultset.entity.testident.RsTestident; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.mapper.utils.MapperTestUtils; import no.nav.testnav.libs.servletsecurity.action.GetUserInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; +import org.springframework.test.context.ActiveProfiles; import java.time.LocalDate; import java.util.List; @@ -21,9 +25,16 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +@ActiveProfiles("test") @SpringBootTest class TestgruppeMappingStrategyTest { + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + private final static String BRUKERID = "123"; private MapperFacade mapper; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/AbstractControllerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/AbstractControllerTest.java index 4ad55727f0b..b7b975ca118 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/AbstractControllerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/AbstractControllerTest.java @@ -4,6 +4,7 @@ import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.Testgruppe; import no.nav.dolly.domain.jpa.Testident; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.repository.BrukerRepository; import no.nav.dolly.repository.IdentRepository; import no.nav.dolly.repository.TestgruppeRepository; @@ -14,7 +15,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.testcontainers.junit.jupiter.Testcontainers; @@ -43,6 +46,12 @@ public abstract class AbstractControllerTest { @Autowired private Flyway flyway; + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + @BeforeEach public void beforeEach() { flyway.migrate(); diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/ElasticControllerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/ElasticControllerTest.java new file mode 100644 index 00000000000..7d81a94439d --- /dev/null +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/ElasticControllerTest.java @@ -0,0 +1,222 @@ +package no.nav.dolly.provider.api; + +import lombok.extern.slf4j.Slf4j; +import no.nav.dolly.domain.resultset.aareg.RsAareg; +import no.nav.dolly.domain.resultset.aareg.RsAnsettelsesPeriode; +import no.nav.dolly.domain.resultset.aareg.RsArbeidsavtale; +import no.nav.dolly.domain.resultset.aareg.RsOrganisasjon; +import no.nav.dolly.domain.resultset.kontoregister.BankkontoData; +import no.nav.dolly.domain.resultset.pdldata.PdlPersondata; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.dolly.elastic.ElasticBestilling; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.domain.PageImpl; +import org.springframework.http.MediaType; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.web.servlet.MockMvc; + +import java.time.LocalDateTime; +import java.util.List; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@Slf4j +@ActiveProfiles({"test", "integrationtest"}) +@ExtendWith(SpringExtension.class) +@AutoConfigureMockMvc(addFilters = false) +@SpringBootTest(webEnvironment = RANDOM_PORT) +class ElasticControllerTest { + + private static final String BASE_URL = "/api/v1/elastic"; + private static final String IDENT1 = "11111111111"; + private static final String IDENT2 = "22222222222"; + private static final String IDENT3 = "33333333333"; + private static final String IDENT4 = "44444444444"; + private static final String IDENT5 = "55555555555"; + private static final String IDENT6 = "66666666666"; + + @Autowired + private BestillingElasticRepository bestillingElasticRepository; + + @Autowired + private MockMvc mockMvc; + + @BeforeEach + void setup() { + + bestillingElasticRepository.saveAll(getTestBestillinger()); + } + + @AfterEach + void teardown() { + + bestillingElasticRepository.deleteAll(); + } + + @Test + void getAllSearchHits_OK() throws Exception { + + mockMvc + .perform(post(BASE_URL + "/search-hits") + .contentType(MediaType.APPLICATION_JSON) + .content("{}")) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.totalHits").value(2L)); + } + + @Test + void getSpecificSearchHit_OK() throws Exception { + + mockMvc + .perform(get(BASE_URL + "/search-hits/ident/{ident}", IDENT1) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.totalHits").value(1L)) + .andExpect(jsonPath("$.searchHits[*].content.identer[*]", hasSize(3))) + .andExpect(jsonPath("$.searchHits[*].content.identer[*]", hasItem(IDENT1))); + } + + @Test + void getSpecificSearchHit_NotFound() throws Exception { + + mockMvc + .perform(get(BASE_URL + "/search-hits/ident/{ident}", IDENT6) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.totalHits").value(0L)); + } + + @Test + void getSearchResponseFromSpecifQuery_OK() throws Exception { + + mockMvc + .perform(get(BASE_URL + "/identer") + .queryParam("typer", "BANKKONTO") + .contentType(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.totalHits").value(1L)) + .andExpect(jsonPath("$.identer[*]", hasSize(3))) + .andExpect(jsonPath("$.identer[*]", hasItems(IDENT1, IDENT2, IDENT3))); + } + + @Test + void getSearchResponseFromSpecifQuery2_OK() throws Exception { + + mockMvc + .perform(post(BASE_URL + "/identer") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"typer\":[\"AAREG\"]}")) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.totalHits").value(1L)) + .andExpect(jsonPath("$.identer[*]", hasSize(2))) + .andExpect(jsonPath("$.identer[*]", hasItems(IDENT4, IDENT5))); + } + + @Test + void getBestillingFromQuery_OK() throws Exception { + + mockMvc + .perform(get(BASE_URL + "/bestilling/id/{id}", 1L) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.pdldata.opprettNyPerson.syntetisk").value(true)) + .andExpect(jsonPath("$.bankkonto.utenlandskBankkonto.tilfeldigKontonummer").value(true)) + .andExpect(jsonPath("$.identer[*]", hasSize(3))) + .andExpect(jsonPath("$.identer[*]", hasItems(IDENT1, IDENT2, IDENT3))); + } + + @Test + void deleteBestilling_OK() throws Exception { + + mockMvc + .perform(delete(BASE_URL + "/bestilling/id/{id}", 2L) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(status().isOk()); + + var bestilling = bestillingElasticRepository.findById(2L); + assertThat(bestilling.isPresent(), is(false)); + } + + @Test + void deleteAlleBestilling_OK() throws Exception { + + mockMvc + .perform(delete(BASE_URL)) + .andDo(print()) + .andExpect(status().isOk()); + + var bestillinger = (PageImpl) bestillingElasticRepository.findAll(); + assertThat(bestillinger.getTotalElements(), is(equalTo(0L))); + } + + private List getTestBestillinger() { + + return List.of( + ElasticBestilling.builder() + .id(1L) + .pdldata(PdlPersondata.builder() + .opprettNyPerson(PdlPersondata.PdlPerson.builder() + .identtype(Identtype.FNR) + .syntetisk(true) + .build()) + .build()) + .bankkonto(BankkontoData.builder() + .utenlandskBankkonto(BankkontonrUtlandDTO.builder() + .tilfeldigKontonummer(true) + .build()) + .build()) + .identer(List.of(IDENT1, IDENT2, IDENT3)) + .build(), + ElasticBestilling.builder() + .id(2L) + .pdldata(PdlPersondata.builder() + .opprettNyPerson(PdlPersondata.PdlPerson.builder() + .identtype(Identtype.FNR) + .syntetisk(true) + .build()) + .build()) + .aareg(List.of(RsAareg.builder() + .arbeidsforholdstype("forenkletOppgjoersordning") + .ansettelsesPeriode(RsAnsettelsesPeriode.builder() + .fom(LocalDateTime.of(2003, 10, 20, 0, 0)) + .build()) + .arbeidsavtale(RsArbeidsavtale.builder() + .yrke("2521106") + .build()) + .arbeidsgiver(RsOrganisasjon.builder() + .aktoertype("ORG") + .orgnummer("896929119") + .build()) + .build())) + .identer(List.of(IDENT4, IDENT5)) + .build()); + } +} \ No newline at end of file diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java index 8fdee959a88..05ee46d0f89 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java @@ -5,7 +5,13 @@ import no.nav.dolly.domain.jpa.BestillingMal; import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.Testgruppe; -import no.nav.dolly.repository.*; +import no.nav.dolly.elastic.BestillingElasticRepository; +import no.nav.dolly.repository.BestillingMalRepository; +import no.nav.dolly.repository.BestillingRepository; +import no.nav.dolly.repository.BrukerFavoritterRepository; +import no.nav.dolly.repository.BrukerRepository; +import no.nav.dolly.repository.IdentRepository; +import no.nav.dolly.repository.TestgruppeRepository; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -15,7 +21,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.transaction.annotation.Transactional; @@ -24,9 +32,14 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -38,6 +51,12 @@ @AutoConfigureMockMvc(addFilters = false) class BestillingMalServiceTest { + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + private final static String MALNAVN = "test"; private final static String NYTT_MALNAVN = "nyttMalnavn"; private final static String BEST_KRITERIER = "Testeteste"; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java index c4ece908390..2c4f101d152 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java @@ -4,6 +4,7 @@ import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.OrganisasjonBestilling; import no.nav.dolly.domain.jpa.OrganisasjonBestillingMal; +import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.repository.BrukerRepository; import no.nav.dolly.repository.OrganisasjonBestillingMalRepository; import no.nav.dolly.repository.OrganisasjonBestillingRepository; @@ -16,7 +17,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.transaction.annotation.Transactional; @@ -24,9 +27,14 @@ import java.time.LocalDateTime; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -38,6 +46,12 @@ @AutoConfigureMockMvc(addFilters = false) class OrganisasjonBestillingMalServiceTest { + @MockBean + private BestillingElasticRepository bestillingElasticRepository; + + @MockBean + private ElasticsearchOperations elasticsearchOperations; + private final static String MALNAVN = "test"; private final static String NYTT_MALNAVN = "nyttMalnavn"; private final static String BEST_KRITERIER = "Testeteste"; diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml index 681a4e2f38e..cc7f8bd495a 100644 --- a/apps/dolly-backend/src/test/resources/application-test.yaml +++ b/apps/dolly-backend/src/test/resources/application-test.yaml @@ -17,6 +17,13 @@ azure: id: dummy secret: dummy +open: + search: + uri: dummy + username: dummy + password: dummy + total-fields: 150 + consumers: testnav-kodeverk-proxy: name: kodeverk-mock diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 2cc022dd5a3..b44f0c2ff04 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -46,6 +46,7 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:data-transfer-objects' + implementation 'no.nav.testnav.libs:data-transfer-search-objects' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/apps/endringsmelding-service/settings.gradle b/apps/endringsmelding-service/settings.gradle index 0c85541f9dc..8cc0ba8d46d 100644 --- a/apps/endringsmelding-service/settings.gradle +++ b/apps/endringsmelding-service/settings.gradle @@ -8,6 +8,7 @@ includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/data-transfer-search-objects' gradleEnterprise { buildScan { 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 ef051126dac..dbed99e80e6 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 @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import no.nav.testnav.endringsmeldingservice.config.Consumers; import no.nav.testnav.endringsmeldingservice.consumer.command.GetIdentEnvironmentsCommand; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import org.springframework.http.MediaType; diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetIdentEnvironmentsCommand.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetIdentEnvironmentsCommand.java index ad2a6e45933..c0c14e4e837 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetIdentEnvironmentsCommand.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/consumer/command/GetIdentEnvironmentsCommand.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/controller/IdentMiljoeController.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/controller/IdentMiljoeController.java index 8179803b49f..2eda8247e5d 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/controller/IdentMiljoeController.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/controller/IdentMiljoeController.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.endringsmeldingservice.consumer.TpsMessagingConsumer; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml index 3126b5aa398..fb09b764336 100644 --- a/apps/endringsmelding-service/src/main/resources/application.yml +++ b/apps/endringsmelding-service/src/main/resources/application.yml @@ -45,6 +45,9 @@ management: endpoint: prometheus.enabled: true heapdump.enabled: true + health: + elasticsearch: + enabled: false prometheus: metrics: export: diff --git a/apps/import-person-service/build.gradle b/apps/import-person-service/build.gradle index 5c5c42ef204..551675dd947 100644 --- a/apps/import-person-service/build.gradle +++ b/apps/import-person-service/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:data-transfer-objects' + implementation 'no.nav.testnav.libs:data-transfer-search-objects' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/apps/import-person-service/settings.gradle b/apps/import-person-service/settings.gradle index deb254d0802..8b741eaa1c5 100644 --- a/apps/import-person-service/settings.gradle +++ b/apps/import-person-service/settings.gradle @@ -7,7 +7,7 @@ rootProject.name = 'import-person-service' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/data-transfer-search-objects' gradleEnterprise { buildScan { diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/ImportPersonServiceServiceApplicationStarter.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/ImportPersonServiceServiceApplicationStarter.java index 19caeeb8443..754e44c2697 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/ImportPersonServiceServiceApplicationStarter.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/ImportPersonServiceServiceApplicationStarter.java @@ -1,13 +1,12 @@ package no.nav.testnav.apps.importpersonservice; +import no.nav.testnav.libs.reactivecore.config.CoreConfig; +import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Import; import org.springframework.web.reactive.config.EnableWebFlux; -import no.nav.testnav.libs.reactivecore.config.CoreConfig; -import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; - @Import({ CoreConfig.class, SecureOAuth2ServerToServerConfiguration.class diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/PdlForvalterConsumer.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/PdlForvalterConsumer.java index 4b68679fc21..f5a99c7c700 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/PdlForvalterConsumer.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/PdlForvalterConsumer.java @@ -5,7 +5,7 @@ import no.nav.testnav.apps.importpersonservice.consumer.command.SendPersonTilPdlCommand; import no.nav.testnav.apps.importpersonservice.consumer.request.OppdaterPersonRequest; import no.nav.testnav.apps.importpersonservice.domain.PersonList; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import org.springframework.stereotype.Component; diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/command/SendPersonTilPdlCommand.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/command/SendPersonTilPdlCommand.java index 49ecf8b6767..fe18c72cd70 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/command/SendPersonTilPdlCommand.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/command/SendPersonTilPdlCommand.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/NavnDTO.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/NavnDTO.java index 16a9401a19d..8f31e215e4a 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/NavnDTO.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/NavnDTO.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import lombok.Value; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; @Value @AllArgsConstructor diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/PersonDTO.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/PersonDTO.java index d14f942a7b3..b02f59b69e9 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/PersonDTO.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/consumer/dto/PersonDTO.java @@ -3,13 +3,12 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.Value; +import no.nav.testnav.apps.importpersonservice.domain.Person; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.util.Collections; import java.util.List; -import no.nav.testnav.apps.importpersonservice.domain.Person; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; - @Value @AllArgsConstructor @NoArgsConstructor(force = true) diff --git a/apps/import-person-service/src/main/resources/application.yml b/apps/import-person-service/src/main/resources/application.yml index fab6f60de38..bb93cdbb296 100644 --- a/apps/import-person-service/src/main/resources/application.yml +++ b/apps/import-person-service/src/main/resources/application.yml @@ -40,6 +40,9 @@ management: endpoint: prometheus.enabled: true heapdump.enabled: true + health: + elasticsearch: + enabled: false prometheus: metrics: export: diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml index eadb8d1832e..4ba7921c11f 100644 --- a/apps/oppsummeringsdokument-service/config.yml +++ b/apps/oppsummeringsdokument-service/config.yml @@ -37,7 +37,6 @@ spec: outbound: external: - host: aareg-synt-services-proxy.dev-fss-pub.nais.io - - host: elastic-dolly-testdata-gjeter-nav-dev.aivencloud.com - host: opensearch-dolly-testdata-gjeter-nav-dev.aivencloud.com openSearch: instance: testdata-gjeter diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 6cc2c7280c1..6745e8695c6 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -65,6 +65,7 @@ dependencies { implementation 'no.nav.testnav.libs:database' implementation 'no.nav.testnav.libs:data-transfer-objects' + implementation 'no.nav.testnav.libs:data-transfer-search-objects' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-security' diff --git a/apps/pdl-forvalter/settings.gradle b/apps/pdl-forvalter/settings.gradle index bb0fa0400a9..b19c64ffbba 100644 --- a/apps/pdl-forvalter/settings.gradle +++ b/apps/pdl-forvalter/settings.gradle @@ -7,6 +7,7 @@ rootProject.name = 'pdl-forvalter' includeBuild '../../libs/security-core' includeBuild '../../libs/database' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/data-transfer-search-objects' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/AdresseServiceConsumer.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/AdresseServiceConsumer.java index f9edefbbe0e..4edede67b23 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/AdresseServiceConsumer.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/AdresseServiceConsumer.java @@ -4,8 +4,8 @@ import no.nav.pdl.forvalter.config.Consumers; import no.nav.pdl.forvalter.consumer.command.MatrikkeladresseServiceCommand; import no.nav.pdl.forvalter.consumer.command.VegadresseServiceCommand; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; import org.springframework.stereotype.Service; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/PdlTestdataConsumer.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/PdlTestdataConsumer.java index c4a508f72de..771e35e0456 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/PdlTestdataConsumer.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/PdlTestdataConsumer.java @@ -11,10 +11,10 @@ import no.nav.pdl.forvalter.dto.ArtifactValue; import no.nav.pdl.forvalter.dto.OpprettIdent; import no.nav.pdl.forvalter.dto.OrdreRequest; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregistermetadataDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PdlStatus; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregistermetadataDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PdlStatus; import no.nav.testnav.libs.securitycore.domain.AccessToken; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; @@ -29,7 +29,7 @@ import static java.util.Objects.isNull; import static no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility.getIdenttype; import static no.nav.pdl.forvalter.utils.PdlTestDataUrls.getBestillingUrl; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SLETTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SLETTING; @Slf4j @Service 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 e5080e778c9..2cbea6cd19c 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 @@ -33,7 +33,7 @@ public class MatrikkeladresseServiceCommand implements Callable> private static final String ADRESSER_VEG_URL = "/api/v1/adresser/veg"; private final WebClient webClient; - private final no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO query; + private final no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO query; private final String matrikkelId; private final String token; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/EksistensController.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/EksistensController.java index b8aba6387e5..43cd745b4b5 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/EksistensController.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/EksistensController.java @@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.pdl.forvalter.service.EksistensService; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/IdentitetController.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/IdentitetController.java index bbb40a5bafc..2ab7f81195b 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/IdentitetController.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/IdentitetController.java @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import no.nav.pdl.forvalter.dto.Paginering; import no.nav.pdl.forvalter.service.IdentitetService; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonIDDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonIDDTO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PutMapping; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/PersonController.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/PersonController.java index 7d7201efe44..a3668aa113b 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/PersonController.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/controller/PersonController.java @@ -11,36 +11,36 @@ import no.nav.pdl.forvalter.service.MetadataTidspunkterService; import no.nav.pdl.forvalter.service.PdlOrdreService; import no.nav.pdl.forvalter.service.PersonService; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DeltBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedfoedtBarnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TelefonnummerDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DeltBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedfoedtBarnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TelefonnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/JSONUserType.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/JSONUserType.java index 8e6e6f7ecd7..f6ebb53bd93 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/JSONUserType.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/JSONUserType.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.extern.slf4j.Slf4j; import no.nav.pdl.forvalter.exception.InternalServerException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.usertype.UserType; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbPerson.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbPerson.java index 29addf5a534..10b34e6b2e1 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbPerson.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbPerson.java @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import no.nav.pdl.forvalter.database.JSONUserType; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbRelasjon.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbRelasjon.java index ed892175e04..ede0ed0f60c 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbRelasjon.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/database/model/DbRelasjon.java @@ -14,7 +14,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/ArtifactValue.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/ArtifactValue.java index bfad68acd10..97581385101 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/ArtifactValue.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/ArtifactValue.java @@ -2,8 +2,8 @@ import lombok.Builder; import lombok.Data; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact; @Data @Builder diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/FolkeregisterPersonstatus.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/FolkeregisterPersonstatus.java index 7df85dcbd3a..6e4224a467b 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/FolkeregisterPersonstatus.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/FolkeregisterPersonstatus.java @@ -5,8 +5,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; @Data @SuperBuilder diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentDTO.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentDTO.java index 4a0d9b18950..61206efffb1 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentDTO.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentDTO.java @@ -5,7 +5,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; @Data @SuperBuilder diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentpoolStatusDTO.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentpoolStatusDTO.java index 5e0caaca480..a89992f7f78 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentpoolStatusDTO.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/IdentpoolStatusDTO.java @@ -4,8 +4,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; import java.time.LocalDate; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettIdent.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettIdent.java index f5c6a58903e..e69bcced7ca 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettIdent.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettIdent.java @@ -5,7 +5,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.util.ArrayList; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettRequest.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettRequest.java index 668e0b9257f..021939fed1b 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettRequest.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/OpprettRequest.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import no.nav.pdl.forvalter.database.model.DbPerson; import no.nav.pdl.forvalter.database.model.DbRelasjon; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; @Data @Builder diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/Ordre.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/Ordre.java index 9d4854f118c..3dcc6702ed6 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/Ordre.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/Ordre.java @@ -4,7 +4,7 @@ import java.util.function.Function; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; import no.nav.testnav.libs.securitycore.domain.AccessToken; @FunctionalInterface diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlDelete.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlDelete.java index 99556b4024a..03d3c2cad21 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlDelete.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlDelete.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; @Data @SuperBuilder diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlFalskIdentitet.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlFalskIdentitet.java index 7747e67ad2d..33778ddddaf 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlFalskIdentitet.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlFalskIdentitet.java @@ -7,9 +7,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlKontaktadresse.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlKontaktadresse.java index ed3ec809a9f..2ccffe9b55e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlKontaktadresse.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlKontaktadresse.java @@ -9,9 +9,9 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import java.io.Serializable; import java.util.ArrayList; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlNavn.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlNavn.java index 62c1b465224..39e4a21fcfe 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlNavn.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlNavn.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.io.Serializable; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlOpprettPerson.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlOpprettPerson.java index 20ae83ca4da..7d2153a9922 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlOpprettPerson.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlOpprettPerson.java @@ -5,7 +5,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.util.ArrayList; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlSivilstand.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlSivilstand.java index 0832e2ffccd..22e1147c9c1 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlSivilstand.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlSivilstand.java @@ -5,7 +5,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.time.LocalDateTime; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlTilrettelagtKommunikasjon.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlTilrettelagtKommunikasjon.java index 534bcb46e04..468767dddd8 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlTilrettelagtKommunikasjon.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlTilrettelagtKommunikasjon.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.io.Serializable; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlVergemaal.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlVergemaal.java index 7ce084cd6ca..3499c0e3731 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlVergemaal.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PdlVergemaal.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; import java.io.Serializable; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PersonUtenIdentifikatorRequest.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PersonUtenIdentifikatorRequest.java index 5858060b0c8..182c19161df 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PersonUtenIdentifikatorRequest.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/dto/PersonUtenIdentifikatorRequest.java @@ -5,8 +5,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; @Getter @Setter diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FalskIdentitetMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FalskIdentitetMappingStrategy.java index bc57a437ff1..c781d928699 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FalskIdentitetMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FalskIdentitetMappingStrategy.java @@ -5,7 +5,7 @@ import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.dto.PdlFalskIdentitet; import no.nav.pdl.forvalter.dto.PdlFalskIdentitet.IdentifiserendeInformasjon; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; import org.springframework.stereotype.Component; import static java.util.Objects.nonNull; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FolkeregisterPersonstatusMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FolkeregisterPersonstatusMappingStrategy.java index 7f73d44228c..a10dab6e4f7 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FolkeregisterPersonstatusMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/FolkeregisterPersonstatusMappingStrategy.java @@ -4,7 +4,7 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.dto.FolkeregisterPersonstatus; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; import org.springframework.stereotype.Component; import static java.util.Objects.nonNull; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/IdentPoolMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/IdentPoolMappingStrategy.java index 2359ea8579f..00d9d12904c 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/IdentPoolMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/IdentPoolMappingStrategy.java @@ -4,11 +4,11 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.dto.HentIdenterRequest; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; import org.springframework.stereotype.Component; import java.time.LocalDate; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktInformasjonForDoedsboMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktInformasjonForDoedsboMappingStrategy.java index f37d2c3300e..7aef86b468d 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktInformasjonForDoedsboMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/KontaktInformasjonForDoedsboMappingStrategy.java @@ -7,8 +7,8 @@ import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.testnav.libs.dto.adresseservice.v1.VegadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktinformasjonForDoedsboAdresse; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktinformasjonForDoedsboAdresse; import org.springframework.stereotype.Component; import java.util.List; 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 2cf6f98a6ec..e11934a2e29 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 @@ -5,8 +5,8 @@ import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.dto.PdlKontaktadresse; import no.nav.pdl.forvalter.dto.PdlKontaktadresse.VegadresseForPost; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; import org.springframework.stereotype.Component; @Component diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/PersonMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/PersonMappingStrategy.java index 2d302bd6e06..75c442ff75e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/PersonMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/PersonMappingStrategy.java @@ -4,7 +4,7 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.database.model.DbRelasjon; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO; import org.springframework.stereotype.Component; import static java.util.Objects.nonNull; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/TilrettelagtKommunikasjonMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/TilrettelagtKommunikasjonMappingStrategy.java index 0c546bcb65d..21bd62705bd 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/TilrettelagtKommunikasjonMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/TilrettelagtKommunikasjonMappingStrategy.java @@ -4,7 +4,7 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.dto.PdlTilrettelagtKommunikasjon; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; import org.springframework.stereotype.Component; @Component diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VegadresseMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VegadresseMappingStrategy.java index 44285c0d879..d710fded51b 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VegadresseMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VegadresseMappingStrategy.java @@ -4,7 +4,7 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; import no.nav.pdl.forvalter.dto.PdlKontaktadresse.VegadresseForPost; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.springframework.stereotype.Component; @Component diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VergemaalMappingStrategy.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VergemaalMappingStrategy.java index 7d1cb897d72..0a149396586 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VergemaalMappingStrategy.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/mapper/VergemaalMappingStrategy.java @@ -10,10 +10,10 @@ import no.nav.pdl.forvalter.dto.PdlVergemaal.Omfang; import no.nav.pdl.forvalter.dto.PdlVergemaal.Personnavn; import no.nav.pdl.forvalter.dto.PdlVergemaal.VergemaalType; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalMandattype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalSakstype; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalMandattype; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalSakstype; import org.springframework.stereotype.Component; import static java.util.Objects.isNull; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdresseService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdresseService.java index eeadbc059c8..399b65f1d98 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdresseService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdresseService.java @@ -4,10 +4,10 @@ import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; import no.nav.testnav.libs.dto.generernavnservice.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.apache.commons.lang3.StringUtils; import java.time.LocalDateTime; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdressebeskyttelseService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdressebeskyttelseService.java index 42537c4c4b5..d0b6f7e248e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdressebeskyttelseService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/AdressebeskyttelseService.java @@ -2,19 +2,19 @@ import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import java.util.List; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.service.EnkelAdresseService.getStrengtFortroligKontaktadresse; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.FORTROLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG_UTLAND; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG_UTLAND; +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.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactDeleteService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactDeleteService.java index 59ae8a31f20..b4f139e5a67 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactDeleteService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactDeleteService.java @@ -5,8 +5,8 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.exception.NotFoundException; import no.nav.pdl.forvalter.utils.DeleteRelasjonerUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,11 +14,11 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.EKTEFELLE_PARTNER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FALSK_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.KONTAKT_FOR_DOEDSBO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.EKTEFELLE_PARTNER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FALSK_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.KONTAKT_FOR_DOEDSBO; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Service diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeService.java index 9938d7506d8..5fa36e317a5 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeService.java @@ -3,10 +3,10 @@ import lombok.RequiredArgsConstructor; import no.nav.pdl.forvalter.database.model.DbRelasjon; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregistermetadataDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregistermetadataDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,14 +14,14 @@ import java.util.Objects; import static java.util.Objects.isNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.DOED; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FORSVUNNET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.IKKE_BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.INAKTIV; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.MIDLERTIDIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.DOED; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FORSVUNNET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.IKKE_BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.INAKTIV; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.MIDLERTIDIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; @Service @RequiredArgsConstructor diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java index 09f745e684c..2f5ac38a759 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java @@ -5,34 +5,34 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.exception.NotFoundException; import no.nav.pdl.forvalter.utils.DeleteRelasjonerUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DeltBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedfoedtBarnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TelefonnummerDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DeltBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedfoedtBarnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TelefonnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,13 +42,13 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.EKTEFELLE_PARTNER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FALSK_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FULLMEKTIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.KONTAKT_FOR_DOEDSBO; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.VERGE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.EKTEFELLE_PARTNER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FALSK_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FULLMEKTIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.KONTAKT_FOR_DOEDSBO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.VERGE; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Service diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BiValidation.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BiValidation.java index c0115bd9965..35e5d8bf3ef 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BiValidation.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BiValidation.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; @FunctionalInterface public interface BiValidation { diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BostedAdresseService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BostedAdresseService.java index cb0a0390c13..103aaca157c 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BostedAdresseService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BostedAdresseService.java @@ -4,14 +4,14 @@ import no.nav.pdl.forvalter.consumer.AdresseServiceConsumer; import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -22,8 +22,8 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility.getIdenttype; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.logging.log4j.util.Strings.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonService.java index 8d8cfd5a97f..ef3fb4c876d 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonService.java @@ -8,17 +8,17 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.dto.HentIdenterRequest; import no.nav.pdl.forvalter.dto.IdentDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregistermetadataDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregistermetadataDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; @@ -28,7 +28,7 @@ import static java.lang.System.currentTimeMillis; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master.FREG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master.FREG; @Slf4j @Service diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonUtenIdentifikatorService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonUtenIdentifikatorService.java index f5f8912fd57..34b3776d948 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonUtenIdentifikatorService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/CreatePersonUtenIdentifikatorService.java @@ -5,19 +5,19 @@ import ma.glasnost.orika.MapperFacade; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; import no.nav.pdl.forvalter.dto.PersonUtenIdentifikatorRequest; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonnavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonnavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; import org.springframework.stereotype.Service; import java.security.SecureRandom; import java.time.LocalDateTime; import static java.util.Objects.isNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeltBostedService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeltBostedService.java index 944aad6ecb2..d54451b0bbb 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeltBostedService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeltBostedService.java @@ -5,12 +5,12 @@ import no.nav.pdl.forvalter.consumer.AdresseServiceConsumer; import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.utils.DatoFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DeltBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UkjentBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DeltBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UkjentBostedDTO; import org.springframework.stereotype.Service; import static java.util.Objects.isNull; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeployService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeployService.java index 8c2deff2bcc..5fe399c2e11 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeployService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DeployService.java @@ -6,9 +6,9 @@ import no.nav.pdl.forvalter.dto.ArtifactValue; import no.nav.pdl.forvalter.dto.Ordre; import no.nav.pdl.forvalter.dto.OrdreRequest; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedfoedtBarnService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedfoedtBarnService.java index 8968b998f77..45ea773031e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedfoedtBarnService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/DoedfoedtBarnService.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedfoedtBarnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedfoedtBarnDTO; import org.springframework.stereotype.Service; import java.util.List; 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 acee557409e..d31dd8e5b70 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 @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EksistensService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EksistensService.java index 846d924dc9b..9dae6258e82 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EksistensService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EksistensService.java @@ -7,7 +7,7 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.dto.IdentpoolLedigDTO; import no.nav.pdl.forvalter.utils.IdentValidCheck; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EnkelAdresseService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EnkelAdresseService.java index e013eb9ce1e..fb707e69b64 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EnkelAdresseService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/EnkelAdresseService.java @@ -3,14 +3,14 @@ import lombok.RequiredArgsConstructor; import ma.glasnost.orika.MapperFacade; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO.PostboksadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO.PostboksadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; import org.springframework.stereotype.Service; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master.FREG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master.PDL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master.FREG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master.PDL; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FalskIdentitetService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FalskIdentitetService.java index c298d1cc03a..72fc129b268 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FalskIdentitetService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FalskIdentitetService.java @@ -7,14 +7,14 @@ import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; import no.nav.pdl.forvalter.utils.KjoennFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.springframework.stereotype.Service; import java.time.LocalDateTime; 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 450a8e56038..43690af7a2c 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 @@ -4,11 +4,11 @@ import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; import no.nav.pdl.forvalter.utils.DatoFraIdentUtility; import no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import java.util.List; @@ -16,7 +16,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.ArtifactUtils.NORGE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +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; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java index 533f6498b88..cabff32ecff 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java @@ -2,30 +2,30 @@ import lombok.RequiredArgsConstructor; import no.nav.pdl.forvalter.utils.DatoFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; import org.springframework.stereotype.Service; import java.util.List; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility.getIdenttype; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.DOED; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FOEDSELSREGISTRERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.IKKE_BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.INAKTIV; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.MIDLERTIDIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.DNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.DOED; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FOEDSELSREGISTRERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.IKKE_BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.INAKTIV; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.MIDLERTIDIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.DNR; +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.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonService.java index cbf5c2c5bcb..ff51fddf7c5 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonService.java @@ -9,16 +9,16 @@ import no.nav.pdl.forvalter.exception.NotFoundException; import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; import no.nav.pdl.forvalter.utils.KjoennFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.springframework.stereotype.Service; import java.security.SecureRandom; @@ -32,10 +32,10 @@ import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.consumer.command.VegadresseServiceCommand.defaultAdresse; import static no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility.isSyntetisk; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_FORELDER; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java index a98fc1a8d92..b1301bb5650 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java @@ -12,17 +12,17 @@ import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; import no.nav.pdl.forvalter.utils.KjoennFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonnavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonnavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; import org.springframework.stereotype.Service; import java.security.SecureRandom; @@ -37,12 +37,12 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility.isSyntetisk; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FAR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.MEDMOR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.MOR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FAR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.MEDMOR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.MOR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; import static org.apache.commons.lang3.BooleanUtils.isFalse; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.BooleanUtils.isTrue; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FullmaktService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FullmaktService.java index 899697dc404..c85c04a197f 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FullmaktService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FullmaktService.java @@ -4,11 +4,11 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdentitetService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdentitetService.java index 0723b1c2db7..93ffa4f82c0 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdentitetService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdentitetService.java @@ -7,7 +7,7 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.dto.Paginering; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonIDDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonIDDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdenttypeService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdenttypeService.java index df49521805b..db04ad92139 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdenttypeService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/IdenttypeService.java @@ -10,12 +10,12 @@ import no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility; import no.nav.pdl.forvalter.utils.KjoennFraIdentUtility; import no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.IdentRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO.NyttNavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.IdentRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO.NyttNavnDTO; import org.springframework.stereotype.Service; import java.security.SecureRandom; @@ -24,15 +24,15 @@ import java.util.Random; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.DNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.NPID; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.UKJENT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.GAMMEL_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.NY_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.DNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.NPID; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.UKJENT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.GAMMEL_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.NY_IDENTITET; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/InnflyttingService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/InnflyttingService.java index c9323ecad62..2cd2f3a79f6 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/InnflyttingService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/InnflyttingService.java @@ -3,12 +3,12 @@ import lombok.RequiredArgsConstructor; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +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.VegadresseDTO; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -18,7 +18,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.ArtifactUtils.hasLandkode; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KjoennService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KjoennService.java index 5bb5e735b57..ef6f4ea55e0 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KjoennService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KjoennService.java @@ -2,9 +2,9 @@ import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.KjoennFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import java.util.List; 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 fb7a7973092..163f8390bf4 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 @@ -5,15 +5,15 @@ import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -23,8 +23,8 @@ import static java.time.LocalDateTime.now; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.logging.log4j.util.Strings.isBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboService.java index aacfc1f5b5f..770af2584e7 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboService.java @@ -8,16 +8,16 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.testnav.libs.dto.generernavnservice.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktinformasjonForDoedsboAdresse; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktpersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.OrganisasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.PersonNavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktinformasjonForDoedsboAdresse; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktpersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.OrganisasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.PersonNavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MergeService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MergeService.java index 58507ed4a02..f118ee3984e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MergeService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MergeService.java @@ -4,9 +4,9 @@ import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MapperFacade; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregistermetadataDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregistermetadataDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import java.lang.reflect.InvocationTargetException; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java index 8695478e220..6b5f5158f6e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java @@ -5,25 +5,25 @@ import no.nav.pdl.forvalter.database.model.DbRelasjon; import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.utils.DatoFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DeltBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregistermetadataDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DeltBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregistermetadataDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/NavnService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/NavnService.java index ca2b2855bf0..a1e6fd7507e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/NavnService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/NavnService.java @@ -4,10 +4,10 @@ import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.DatoFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import java.time.LocalDate; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdService.java index 8c6d52a6ef7..e1031e905a7 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdService.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdsadresseService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdsadresseService.java index b11aac55062..7ab2650b79f 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdsadresseService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/OppholdsadresseService.java @@ -5,15 +5,15 @@ import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -22,8 +22,8 @@ import java.util.stream.Stream; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.logging.log4j.util.Strings.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlArtifactService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlArtifactService.java index ab06a53699b..9fcd9b6ede7 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlArtifactService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlArtifactService.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlOrdreService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlOrdreService.java index 36e50bf5565..178930a8e53 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlOrdreService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PdlOrdreService.java @@ -19,17 +19,17 @@ import no.nav.pdl.forvalter.dto.PdlVergemaal; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.exception.NotFoundException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OrdreResponseDTO.PersonHendelserDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OrdreResponseDTO.PersonHendelserDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; @@ -47,35 +47,35 @@ import static java.lang.String.format; import static java.util.Collections.emptyList; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_ADRESSEBESKYTTELSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_BOSTEDADRESSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_DELTBOSTED; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_DOEDFOEDT_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_DOEDSFALL; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FALSK_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FOEDSEL; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FOLKEREGISTER_PERSONSTATUS; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FORELDREANSVAR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FORELDRE_BARN_RELASJON; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FULLMAKT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_INNFLYTTING; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_KJOENN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTADRESSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTINFORMASJON_FOR_DODESDBO; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_NAVN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLD; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLDSADRESSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_OPPRETT_PERSON; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SIKKERHETSTILTAK_URL; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SIVILSTAND; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SLETTING; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_STATSBORGERSKAP; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_TELEFONUMMER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_TILRETTELAGT_KOMMUNIKASJON; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_UTENLANDS_IDENTIFIKASJON_NUMMER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_UTFLYTTING; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_VERGEMAAL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_ADRESSEBESKYTTELSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_BOSTEDADRESSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_DELTBOSTED; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_DOEDFOEDT_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_DOEDSFALL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FALSK_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FOEDSEL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FOLKEREGISTER_PERSONSTATUS; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FORELDREANSVAR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FORELDRE_BARN_RELASJON; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FULLMAKT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_INNFLYTTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_KJOENN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTADRESSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTINFORMASJON_FOR_DODESDBO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_NAVN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLD; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLDSADRESSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_OPPRETT_PERSON; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SIKKERHETSTILTAK_URL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SIVILSTAND; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SLETTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_STATSBORGERSKAP; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_TELEFONUMMER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_TILRETTELAGT_KOMMUNIKASJON; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_UTENLANDS_IDENTIFIKASJON_NUMMER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_UTFLYTTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_VERGEMAAL; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; @Slf4j diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonArtifactService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonArtifactService.java index 13fc68e48be..db1c2f26e23 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonArtifactService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonArtifactService.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import lombok.RequiredArgsConstructor; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; @Service diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonService.java index dcaa65d321a..e8c26f4248d 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/PersonService.java @@ -16,19 +16,19 @@ import no.nav.pdl.forvalter.dto.Paginering; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.exception.NotFoundException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.StatsborgerskapDTO; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -50,7 +50,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.IdenttypeFraIdentUtility.getIdenttype; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonService.java index 716b8c419e1..e86beac02b6 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonService.java @@ -6,7 +6,7 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.database.repository.RelasjonRepository; import no.nav.pdl.forvalter.exception.InternalServerException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonerAlderService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonerAlderService.java index ea69a848e31..39b2beacf5e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonerAlderService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/RelasjonerAlderService.java @@ -2,10 +2,10 @@ import lombok.RequiredArgsConstructor; import no.nav.pdl.forvalter.utils.DatoFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; import org.springframework.stereotype.Service; import java.security.SecureRandom; 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 e8db05f838e..4aff9c96ddc 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 @@ -2,9 +2,9 @@ import lombok.RequiredArgsConstructor; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; import org.springframework.stereotype.Service; import java.util.List; 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 6b74530c7d3..8f99be6810e 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 @@ -8,14 +8,14 @@ import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; import no.nav.pdl.forvalter.utils.KjoennFraIdentUtility; import no.nav.pdl.forvalter.utils.KjoennUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -28,8 +28,8 @@ import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.consumer.command.VegadresseServiceCommand.defaultAdresse; import static no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility.isSyntetisk; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO.Sivilstand.SAMBOER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO.Sivilstand.UGIFT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand.SAMBOER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand.UGIFT; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; 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 ad07b021a8d..1eaf08112ae 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,10 +5,10 @@ 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.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +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; import org.springframework.stereotype.Service; import java.util.List; @@ -17,7 +17,7 @@ import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.ArtifactUtils.NORGE; import static no.nav.pdl.forvalter.utils.ArtifactUtils.hasLandkode; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; +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; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SwopIdentsService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SwopIdentsService.java index 344727c47b5..0c7d47760f8 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SwopIdentsService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/SwopIdentsService.java @@ -8,11 +8,11 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.database.repository.RelasjonRepository; import no.nav.pdl.forvalter.utils.FoedselsdatoUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO.Sivilstand; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.List; import static no.nav.pdl.forvalter.service.EnkelAdresseService.getStrengtFortroligKontaktadresse; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master.FREG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master.FREG; @Service @RequiredArgsConstructor diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java index 87dd012b78c..8fa8879afff 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TelefonnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.TelefonnummerDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonService.java index 49132b8fff8..2e8fa3c13e2 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonService.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UnhookEksternePersonerService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UnhookEksternePersonerService.java index 65735978087..68f64c7086d 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UnhookEksternePersonerService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UnhookEksternePersonerService.java @@ -4,13 +4,13 @@ import no.nav.pdl.forvalter.database.model.DbPerson; import no.nav.pdl.forvalter.database.model.DbRelasjon; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -20,12 +20,12 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.AVDOEDD_FOR_KONTAKT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FULLMAKTSGIVER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.VERGE_MOTTAKER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.AVDOEDD_FOR_KONTAKT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FULLMAKTSGIVER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.VERGE_MOTTAKER; @Service @RequiredArgsConstructor diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerService.java index 4f789b1e670..1a587760d24 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerService.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtflyttingService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtflyttingService.java index a3cb50c1cbf..e80394e5518 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtflyttingService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/UtflyttingService.java @@ -3,13 +3,13 @@ import lombok.RequiredArgsConstructor; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; import no.nav.pdl.forvalter.exception.InvalidRequestException; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -19,7 +19,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static no.nav.pdl.forvalter.utils.ArtifactUtils.hasLandkode; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ValidateArtifactsService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ValidateArtifactsService.java index c58d703f5d8..6a714af11a9 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ValidateArtifactsService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ValidateArtifactsService.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.service; import lombok.RequiredArgsConstructor; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/Validation.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/Validation.java index 4b68d092a42..8f88485c436 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/Validation.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/Validation.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; @FunctionalInterface public interface Validation { diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/VergemaalService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/VergemaalService.java index fa3d62bbed6..48cd2b03c3e 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/VergemaalService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/VergemaalService.java @@ -4,11 +4,11 @@ import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.pdl.forvalter.exception.InvalidRequestException; import no.nav.pdl.forvalter.utils.SyntetiskFraIdentUtility; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtility.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtility.java index 3f4c190fd47..75b86ec3e07 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtility.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtility.java @@ -3,9 +3,9 @@ import lombok.experimental.UtilityClass; import no.nav.pdl.forvalter.database.model.DbPerson; import no.nav.pdl.forvalter.database.model.DbRelasjon; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import java.util.ArrayList; import java.util.Arrays; @@ -14,21 +14,21 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.AVDOEDD_FOR_KONTAKT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.EKTEFELLE_PARTNER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FALSK_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FULLMAKTSGIVER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.FULLMEKTIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.GAMMEL_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.KONTAKT_FOR_DOEDSBO; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.NY_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.RIKTIG_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.VERGE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType.VERGE_MOTTAKER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.AVDOEDD_FOR_KONTAKT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.EKTEFELLE_PARTNER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FALSK_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FAMILIERELASJON_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FORELDREANSVAR_FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FULLMAKTSGIVER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.FULLMEKTIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.GAMMEL_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.KONTAKT_FOR_DOEDSBO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.NY_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.RIKTIG_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.VERGE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType.VERGE_MOTTAKER; @UtilityClass public class DeleteRelasjonerUtility { diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/FoedselsdatoUtility.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/FoedselsdatoUtility.java index fc0aff2ea65..d6ffff5d5de 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/FoedselsdatoUtility.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/FoedselsdatoUtility.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.utils; import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/IdenttypeFraIdentUtility.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/IdenttypeFraIdentUtility.java index 905e5524ab0..4521762a6e6 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/IdenttypeFraIdentUtility.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/IdenttypeFraIdentUtility.java @@ -1,12 +1,12 @@ package no.nav.pdl.forvalter.utils; import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; import static java.lang.Integer.parseInt; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.DNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.NPID; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.DNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.NPID; @UtilityClass public class IdenttypeFraIdentUtility { diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennFraIdentUtility.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennFraIdentUtility.java index 80bac3dfcce..2fbf9a49abe 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennFraIdentUtility.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennFraIdentUtility.java @@ -1,11 +1,11 @@ package no.nav.pdl.forvalter.utils; import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; import static java.lang.Integer.parseInt; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; @UtilityClass public class KjoennFraIdentUtility { diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennUtility.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennUtility.java index 1efcc1b05ce..00906846e90 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennUtility.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/KjoennUtility.java @@ -1,15 +1,15 @@ package no.nav.pdl.forvalter.utils; import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn; import java.security.SecureRandom; import java.util.Random; import static java.util.Objects.isNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.UKJENT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.UKJENT; @UtilityClass public class KjoennUtility { 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 index 3d25c80c10a..97051ba1c15 100644 --- 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 @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.utils; import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +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; diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/PdlTestDataUrls.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/PdlTestDataUrls.java index 695fea161a2..77a0993465d 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/PdlTestDataUrls.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/PdlTestDataUrls.java @@ -1,39 +1,39 @@ package no.nav.pdl.forvalter.utils; import lombok.experimental.UtilityClass; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact; +import no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact; import java.util.EnumMap; import java.util.Map; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_ADRESSEBESKYTTELSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_BOSTEDADRESSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_DELTBOSTED; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_DOEDFOEDT_BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_DOEDSFALL; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FALSK_IDENTITET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FOEDSEL; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FOLKEREGISTER_PERSONSTATUS; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FORELDREANSVAR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FORELDRE_BARN_RELASJON; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_FULLMAKT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_INNFLYTTING; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_KJOENN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTADRESSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTINFORMASJON_FOR_DODESDBO; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_NAVN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLD; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLDSADRESSE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_OPPRETT_PERSON; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SIKKERHETSTILTAK_URL; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SIVILSTAND; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_SLETTING; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_STATSBORGERSKAP; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_TELEFONUMMER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_TILRETTELAGT_KOMMUNIKASJON; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_UTENLANDS_IDENTIFIKASJON_NUMMER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_UTFLYTTING; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.PdlArtifact.PDL_VERGEMAAL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_ADRESSEBESKYTTELSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_BOSTEDADRESSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_DELTBOSTED; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_DOEDFOEDT_BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_DOEDSFALL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FALSK_IDENTITET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FOEDSEL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FOLKEREGISTER_PERSONSTATUS; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FORELDREANSVAR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FORELDRE_BARN_RELASJON; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_FULLMAKT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_INNFLYTTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_KJOENN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTADRESSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_KONTAKTINFORMASJON_FOR_DODESDBO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_NAVN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLD; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_OPPHOLDSADRESSE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_OPPRETT_PERSON; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SIKKERHETSTILTAK_URL; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SIVILSTAND; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_SLETTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_STATSBORGERSKAP; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_TELEFONUMMER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_TILRETTELAGT_KOMMUNIKASJON; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_UTENLANDS_IDENTIFIKASJON_NUMMER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_UTFLYTTING; +import static no.nav.testnav.libs.data.pdlforvalter.v1.PdlArtifact.PDL_VERGEMAAL; @UtilityClass public class PdlTestDataUrls { diff --git a/apps/pdl-forvalter/src/main/resources/application.yaml b/apps/pdl-forvalter/src/main/resources/application.yaml index 3f4ffb99031..552ef633914 100644 --- a/apps/pdl-forvalter/src/main/resources/application.yaml +++ b/apps/pdl-forvalter/src/main/resources/application.yaml @@ -54,6 +54,9 @@ management: endpoint: prometheus.enabled: true heapdump.enabled: true + health: + elasticsearch: + enabled: false prometheus: metrics: export: diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/AdressebeskyttelseServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/AdressebeskyttelseServiceTest.java index fd90d5aad9a..add09e4fe91 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/AdressebeskyttelseServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/AdressebeskyttelseServiceTest.java @@ -1,11 +1,11 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -14,8 +14,8 @@ import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG_UTLAND; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG_UTLAND; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeServiceTest.java index 5df1b0369bd..46a54252857 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ArtifactGjeldendeServiceTest.java @@ -3,10 +3,10 @@ import no.nav.pdl.forvalter.database.model.DbPerson; import no.nav.pdl.forvalter.database.model.DbRelasjon; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -16,9 +16,9 @@ import java.util.List; import java.util.Optional; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.OPPHOERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/BostedAdresseServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/BostedAdresseServiceTest.java index 43869ca93e9..2f9aa3589c8 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/BostedAdresseServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/BostedAdresseServiceTest.java @@ -2,14 +2,14 @@ import ma.glasnost.orika.MapperFacade; import no.nav.pdl.forvalter.consumer.AdresseServiceConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DbVersjonDTO.Master; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UkjentBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DbVersjonDTO.Master; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UkjentBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedfoedtBarnServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedfoedtBarnServiceTest.java index 9e755c70cb0..c7c69753c39 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedfoedtBarnServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedfoedtBarnServiceTest.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedfoedtBarnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedfoedtBarnDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedsfallServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedsfallServiceTest.java index 0917c9ba2e2..6f550d1d804 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedsfallServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/DoedsfallServiceTest.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FalskIdentitetServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FalskIdentitetServiceTest.java index c674d42bf77..fcfacde6b52 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FalskIdentitetServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FalskIdentitetServiceTest.java @@ -2,7 +2,7 @@ import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FalskIdentitetDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FalskIdentitetDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FoedselServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FoedselServiceTest.java index c91de53ea7c..dd59550da97 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FoedselServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FoedselServiceTest.java @@ -1,14 +1,14 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UkjentBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UkjentBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusServiceTest.java index 67f4a1577e6..987bb420c15 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusServiceTest.java @@ -1,14 +1,14 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DoedsfallDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DoedsfallDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -17,13 +17,13 @@ import java.time.LocalDateTime; import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.DOED; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FOEDSELSREGISTRERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FORSVUNNET; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.IKKE_BOSATT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.MIDLERTIDIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.DOED; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FOEDSELSREGISTRERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FORSVUNNET; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.IKKE_BOSATT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.MIDLERTIDIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.UTFLYTTET; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonServiceTest.java index a2640f95f40..7bb65ba569c 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForelderBarnRelasjonServiceTest.java @@ -1,11 +1,11 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.DeltBostedDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.DeltBostedDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -16,10 +16,10 @@ import java.time.LocalDateTime; import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.BARN; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FAR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FORELDER; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.MOR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.BARN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FAR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.FORELDER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle.MOR; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForeldreansvarServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForeldreansvarServiceTest.java index e1b5d2e3749..7d2c61eb0c2 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForeldreansvarServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/ForeldreansvarServiceTest.java @@ -3,11 +3,11 @@ import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.testnav.libs.dto.generernavnservice.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonnavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelatertBiPersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonnavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelatertBiPersonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FullmaktServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FullmaktServiceTest.java index 761f4220219..fcab9431273 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FullmaktServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/FullmaktServiceTest.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/IdenttypeServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/IdenttypeServiceTest.java index 6a707986fb3..7ef6c9558be 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/IdenttypeServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/IdenttypeServiceTest.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.IdentRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype; +import no.nav.testnav.libs.data.pdlforvalter.v1.IdentRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.Identtype; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/InnflyttingServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/InnflyttingServiceTest.java index 5ec31b2a7ee..acb0ebf5a23 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/InnflyttingServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/InnflyttingServiceTest.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.InnflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KjoennServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KjoennServiceTest.java index 6e396e9be21..93d2cefe4a2 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KjoennServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KjoennServiceTest.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -9,8 +9,8 @@ import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.KVINNE; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO.Kjoenn.MANN; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktAdresseServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktAdresseServiceTest.java index 59ce7f9aa32..5d4280d53e3 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktAdresseServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktAdresseServiceTest.java @@ -2,11 +2,11 @@ import ma.glasnost.orika.MapperFacade; import no.nav.pdl.forvalter.consumer.AdresseServiceConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktadresseDTO.PostboksadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktadresseDTO.PostboksadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboServiceTest.java index 1c2812385f5..78458b0be59 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/KontaktinformasjonForDoedsboServiceTest.java @@ -4,8 +4,8 @@ import no.nav.pdl.forvalter.consumer.OrganisasjonForvalterConsumer; import no.nav.pdl.forvalter.database.repository.PersonRepository; import no.nav.testnav.libs.dto.generernavnservice.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.OrganisasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.OrganisasjonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -18,9 +18,9 @@ import java.util.Map; import static java.lang.String.format; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktpersonDTO; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.PdlSkifteform.OFFENTLIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.PersonNavnDTO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.KontaktpersonDTO; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.PdlSkifteform.OFFENTLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO.PersonNavnDTO; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/NavnServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/NavnServiceTest.java index 454ca3a9be5..d8a74822821 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/NavnServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/NavnServiceTest.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.consumer.GenererNavnServiceConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.NavnDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.NavnDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdServiceTest.java index 4c0c1bbb409..d89c0e1209b 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdServiceTest.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -10,8 +10,8 @@ import java.time.LocalDate; import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO.OppholdType.MIDLERTIDIG; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdDTO.OppholdType.OPPLYSNING_MANGLER; +import static no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO.OppholdType.MIDLERTIDIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.OppholdDTO.OppholdType.OPPLYSNING_MANGLER; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdsadresseServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdsadresseServiceTest.java index c1c02faf823..244503bc851 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdsadresseServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/OppholdsadresseServiceTest.java @@ -2,12 +2,12 @@ import ma.glasnost.orika.MapperFacade; import no.nav.pdl.forvalter.consumer.AdresseServiceConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.OppholdsadresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskAdresseDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.OppholdsadresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskAdresseDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VegadresseDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; +import static no.nav.testnav.libs.data.pdlforvalter.v1.AdressebeskyttelseDTO.AdresseBeskyttelse.STRENGT_FORTROLIG; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/RelasjonerAlderServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/RelasjonerAlderServiceTest.java index 4b720fde5e0..312088f6881 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/RelasjonerAlderServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/RelasjonerAlderServiceTest.java @@ -1,11 +1,11 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FoedselDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonRequestDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SikkerhetstiltakServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SikkerhetstiltakServiceTest.java index 0c91136a8eb..ba6e77e6050 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SikkerhetstiltakServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SikkerhetstiltakServiceTest.java @@ -1,7 +1,7 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO.Tiltakstype; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO.Tiltakstype; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SivilstandServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SivilstandServiceTest.java index b805b18fad6..c4fd3be6125 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SivilstandServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/SivilstandServiceTest.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -13,8 +13,8 @@ import java.time.LocalDateTime; import java.util.List; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO.Sivilstand.GIFT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO.Sivilstand.SKILT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand.GIFT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO.Sivilstand.SKILT; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; 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 abd2f8cf458..31f046c5dd7 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,9 +1,9 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.InnflyttingDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.StatsborgerskapDTO; +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; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java index 7538e758edd..4feb0f2c0a2 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TelefonnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TelefonnummerDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonServiceTest.java index 6ef7f70c566..174ee653cc2 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TilrettelagtKommunikasjonServiceTest.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.TilrettelagtKommunikasjonDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerServiceTest.java index f9a18e2e9e9..b6804e9e7f9 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtenlandsidentifikasjonsnummerServiceTest.java @@ -1,6 +1,6 @@ package no.nav.pdl.forvalter.service; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtenlandskIdentifikasjonsnummerDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtflyttingServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtflyttingServiceTest.java index 7be7066c4cf..af61d61a735 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtflyttingServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/UtflyttingServiceTest.java @@ -1,8 +1,8 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.consumer.GeografiskeKodeverkConsumer; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.UtflyttingDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.UtflyttingDTO; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/VergemaalServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/VergemaalServiceTest.java index 932c0f9d1d9..5ffe59390eb 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/VergemaalServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/VergemaalServiceTest.java @@ -1,9 +1,9 @@ package no.nav.pdl.forvalter.service; import no.nav.pdl.forvalter.database.repository.PersonRepository; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalEmbete; -import no.nav.testnav.libs.dto.pdlforvalter.v1.VergemaalSakstype; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalEmbete; +import no.nav.testnav.libs.data.pdlforvalter.v1.VergemaalSakstype; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtilityTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtilityTest.java index ed054b70597..5a5e13db441 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtilityTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/utils/DeleteRelasjonerUtilityTest.java @@ -2,12 +2,12 @@ import no.nav.pdl.forvalter.database.model.DbPerson; import no.nav.pdl.forvalter.database.model.DbRelasjon; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; -import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO; -import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO.Rolle; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO.Ansvar; +import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; +import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/apps/person-service/src/main/resources/application.yml b/apps/person-service/src/main/resources/application.yml index 6c86b2dbdf7..687c887834d 100644 --- a/apps/person-service/src/main/resources/application.yml +++ b/apps/person-service/src/main/resources/application.yml @@ -5,6 +5,10 @@ spring: version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle name: testnav-person-service description: API for opprettelse av personer + management: + health: + elasticsearch: + enabled: false main: banner-mode: off security: diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 0c5ae6b0bc0..7602ff02437 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -72,7 +72,7 @@ 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:data-transfer-objects' + implementation 'no.nav.testnav.libs:data-transfer-search-objects' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/apps/tps-messaging-service/settings.gradle b/apps/tps-messaging-service/settings.gradle index c0cfe66b1cc..02c667cb74b 100644 --- a/apps/tps-messaging-service/settings.gradle +++ b/apps/tps-messaging-service/settings.gradle @@ -7,7 +7,7 @@ rootProject.name = 'tps-messaging-service' includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/data-transfer-search-objects' gradleEnterprise { diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java index 4032d4071d8..7b1242956d0 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TelefonnummerRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TelefonnummerRequest.java index 31495b73f81..5fab22ddb90 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TelefonnummerRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TelefonnummerRequest.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java index 334a1c058ca..abeb720d1bd 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java @@ -3,10 +3,10 @@ import ma.glasnost.orika.CustomMapper; import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.GateadresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.MidlertidigAdresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PostadresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.GateadresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.MidlertidigAdresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PostadresseDTO; import no.nav.tps.ctg.s610.domain.BoAdresseType; import no.nav.tps.ctg.s610.domain.PostAdresseType; import no.nav.tps.ctg.s610.domain.UtlandsAdresseType; @@ -18,8 +18,8 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.AdresseDTO.Adressetype.GATE; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.AdresseDTO.Adressetype.MATR; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO.Adressetype.GATE; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO.Adressetype.MATR; @Component public class AdresseMappingStrategy implements MappingStrategy { diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java index e50a9e35c8b..9f541362384 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java @@ -5,7 +5,7 @@ import ma.glasnost.orika.MappingContext; import no.nav.testnav.apps.tpsmessagingservice.dto.BankkontoNorskRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsSystemInfo; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; import no.nav.tps.ctg.s610.domain.BankkontoNorgeType; import org.springframework.stereotype.Component; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrUtlandMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrUtlandMappingStrategy.java index 735a4680b36..73eef50a094 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrUtlandMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrUtlandMappingStrategy.java @@ -5,7 +5,7 @@ import ma.glasnost.orika.MappingContext; import no.nav.testnav.apps.tpsmessagingservice.dto.BankkontoUtlandRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsSystemInfo; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; import no.nav.tps.ctg.s610.domain.KontoNrUtlandType; import org.springframework.stereotype.Component; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/S610PersonMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/S610PersonMappingStrategy.java index b3e35ee32d7..ac82501382a 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/S610PersonMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/S610PersonMappingStrategy.java @@ -4,18 +4,18 @@ import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.AdresseDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.GateadresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.MatrikkeladresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.MidlertidigAdresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PostadresseDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SikkerhetTiltakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SivilstandDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.StatsborgerskapDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.GateadresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.MatrikkeladresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.MidlertidigAdresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PostadresseDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SikkerhetTiltakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SivilstandDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; import no.nav.tps.ctg.s610.domain.EnkelBoAdresseType; import no.nav.tps.ctg.s610.domain.S610BrukerType; import no.nav.tps.ctg.s610.domain.S610PersonType; @@ -27,10 +27,10 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.GATE; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.PBOX; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.STED; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.UTAD; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.GATE; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.PBOX; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.STED; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.MidlertidigAdressetypeDTO.UTAD; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SikkerhetstiltakMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SikkerhetstiltakMappingStrategy.java index 6256f3e7b19..99de700856d 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SikkerhetstiltakMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SikkerhetstiltakMappingStrategy.java @@ -5,7 +5,7 @@ import ma.glasnost.orika.MappingContext; import no.nav.testnav.apps.tpsmessagingservice.dto.SikkerhetstiltakRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsSystemInfo; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SikkerhetTiltakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SikkerhetTiltakDTO; import no.nav.tps.ctg.s610.domain.TsikkerhetsTiltakS610; import org.springframework.stereotype.Component; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SivilstandMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SivilstandMappingStrategy.java index 0543d018b68..b2a1682a59c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SivilstandMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SivilstandMappingStrategy.java @@ -3,7 +3,7 @@ import ma.glasnost.orika.CustomMapper; import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SivilstandDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SivilstandDTO; import no.nav.tps.ctg.s610.domain.S610PersonType; import org.springframework.stereotype.Component; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SpraakMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SpraakMappingStrategy.java index 74bb75c1c0b..97ce9f8972b 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SpraakMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/SpraakMappingStrategy.java @@ -5,7 +5,7 @@ import ma.glasnost.orika.MappingContext; import no.nav.testnav.apps.tpsmessagingservice.dto.SpraakRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsSystemInfo; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; import org.springframework.stereotype.Component; import java.time.LocalDateTime; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/StatsborgerskapMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/StatsborgerskapMappingStrategy.java index cb60fd26a64..9aa4e9aab89 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/StatsborgerskapMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/StatsborgerskapMappingStrategy.java @@ -3,7 +3,7 @@ import ma.glasnost.orika.CustomMapper; import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.MappingContext; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.StatsborgerskapDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.StatsborgerskapDTO; import no.nav.tps.ctg.s610.domain.S610PersonType; import org.springframework.stereotype.Component; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/TelefonnummerMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/TelefonnummerMappingStrategy.java index 4db10cdf833..f8f47d8fd3c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/TelefonnummerMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/TelefonnummerMappingStrategy.java @@ -6,8 +6,8 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.KontaktopplysningerRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.TelefonnummerRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsSystemInfo; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO.TypeTelefon; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO.TypeTelefon; import no.nav.tps.ctg.s610.domain.TelefonType; import org.springframework.stereotype.Component; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/IdentController.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/IdentController.java index c20b8856558..ce4b681a9b9 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/IdentController.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/IdentController.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tpsmessagingservice.service.IdentService; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsIdentStatusDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsIdentStatusDTO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/PersonController.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/PersonController.java index fbf4db276d5..57f3d42bbfa 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/PersonController.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/provider/v1/PersonController.java @@ -9,13 +9,13 @@ import no.nav.testnav.apps.tpsmessagingservice.service.SikkerhetstiltakService; import no.nav.testnav.apps.tpsmessagingservice.service.SpraakService; import no.nav.testnav.apps.tpsmessagingservice.service.TelefonnummerService; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SikkerhetTiltakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SikkerhetTiltakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java index 4c86910caa9..05c38a36872 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java @@ -9,7 +9,7 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.BankkontoNorskRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.BankkontoNorskResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java index 374646b30c0..26b6ca28743 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java @@ -9,7 +9,7 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.BankkontoUtlandRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.BankkontoUtlandResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java index 40909f2bace..73c6c471d7b 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java @@ -9,7 +9,7 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.TpsServicerutineM201Response; import no.nav.testnav.apps.tpsmessagingservice.exception.BadRequestException; import no.nav.testnav.apps.tpsmessagingservice.utils.EndringsmeldingUtil; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsIdentStatusDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsIdentStatusDTO; import no.nav.tps.ctg.m201.domain.SRnavn; import no.nav.tps.ctg.m201.domain.TpsPersonData; import no.nav.tps.ctg.m201.domain.TpsServiceRutineType; 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 8731b1c645f..544bb512ede 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 @@ -17,9 +17,9 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.TpsServicerutineS610Response; import no.nav.testnav.apps.tpsmessagingservice.utils.EndringsmeldingUtil; import no.nav.testnav.apps.tpsmessagingservice.utils.ServiceRutineUtil; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.RelasjonDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.RelasjonDTO; import no.nav.tps.ctg.s610.domain.PersondataFraTpsS610Type; import no.nav.tps.ctg.s610.domain.RelasjonType; import no.nav.tps.ctg.s610.domain.S610PersonType; @@ -38,9 +38,9 @@ import static java.util.Collections.emptyList; import static java.util.Objects.nonNull; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.RelasjonDTO.ROLLE.FAR; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.RelasjonDTO.ROLLE.MOR; -import static no.nav.testnav.libs.dto.tpsmessagingservice.v1.RelasjonDTO.ROLLE.PARTNER; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.RelasjonDTO.ROLLE.FAR; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.RelasjonDTO.ROLLE.MOR; +import static no.nav.testnav.libs.data.tpsmessagingservice.v1.RelasjonDTO.ROLLE.PARTNER; import static org.apache.commons.lang3.StringUtils.isBlank; @Slf4j diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java index 9e84e40e555..230e9b6db06 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java @@ -9,7 +9,7 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.SikkerhetstiltakRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.SikkerhetstiltakResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SikkerhetTiltakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SikkerhetTiltakDTO; import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java index 7297615dd36..5a7fd206873 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java @@ -9,7 +9,7 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.SpraakRequest; import no.nav.testnav.apps.tpsmessagingservice.dto.SpraakResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/TelefonnummerService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/TelefonnummerService.java index a6c3d232d92..c08c7479df2 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/TelefonnummerService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/TelefonnummerService.java @@ -9,7 +9,7 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.KontaktopplysningerResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsSystemInfo; -import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO; +import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; diff --git a/apps/tps-messaging-service/src/main/resources/application.yaml b/apps/tps-messaging-service/src/main/resources/application.yaml index 4380c057b3e..4e145094f38 100644 --- a/apps/tps-messaging-service/src/main/resources/application.yaml +++ b/apps/tps-messaging-service/src/main/resources/application.yaml @@ -58,6 +58,10 @@ management: heapdump.enabled: true health: show-details: always + management: + health: + elasticsearch: + enabled: false prometheus: metrics: export: diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index b4869a7a393..07e5a3003ae 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -61,7 +61,6 @@ dependencies { implementation 'org.apache.commons:commons-lang3' implementation 'org.springframework:spring-web' - implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' implementation 'org.projectlombok:lombok' diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregistermetadataDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregistermetadataDTO.java deleted file mode 100644 index 2232b0852bf..00000000000 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregistermetadataDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class FolkeregistermetadataDTO implements Serializable { - - private LocalDateTime ajourholdstidspunkt; - private Boolean gjeldende; - private LocalDateTime gyldighetstidspunkt; - private LocalDateTime opphoerstidspunkt; -} \ No newline at end of file diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlStatus.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlStatus.java deleted file mode 100644 index ef5ff62730a..00000000000 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; - -public enum PdlStatus { - OK, FEIL -} diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/StatsborgerskapDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/StatsborgerskapDTO.java deleted file mode 100644 index c7ad3c3eb49..00000000000 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/StatsborgerskapDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.time.LocalDateTime; - -@Data -@SuperBuilder -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -public class StatsborgerskapDTO extends DbVersjonDTO { - - private String landkode; - private LocalDateTime gyldigFraOgMed; - private LocalDateTime gyldigTilOgMed; - private LocalDateTime bekreftelsesdato; -} \ No newline at end of file diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle new file mode 100644 index 00000000000..c8efdca1868 --- /dev/null +++ b/libs/data-transfer-search-objects/build.gradle @@ -0,0 +1,101 @@ +plugins { + id "org.sonarqube" version "4.0.0.2929" + id 'java-library' + id 'maven-publish' + id 'io.spring.dependency-management' version "1.1.3" + id "jacoco" +} + +jacocoTestReport { + reports { + xml.required = true + } +} + +sonarqube { + properties { + property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/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.organization", "navikt" + property "sonar.project.monorepo.enabled", true + property "sonar.projectKey", "testnav-data-transfer-search-objects" + property "sonar.projectName", "testnav-data-transfer-search-objects" + property "sonar.sourceEncoding", "UTF-8" + } +} + +dependencyManagement { + applyMavenExclusions = false + imports { + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + } +} + +group = 'no.nav.testnav.libs' + +repositories { + mavenCentral() + maven { + name = "GitHubPackages" + url = uri('https://maven.pkg.github.com/navikt/maven-release') + credentials(PasswordCredentials) { + password System.getenv("NAV_TOKEN") + username 'token' + } + } + mavenLocal() +} + +dependencies { + implementation 'com.fasterxml.jackson.core:jackson-annotations' + implementation 'com.fasterxml.jackson.core:jackson-databind' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'jakarta.validation:jakarta.validation-api' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api' + implementation 'javax.xml.bind:jaxb-api:2.3.1' + implementation 'org.apache.commons:commons-lang3' + implementation 'org.springframework:spring-web' + + implementation 'org.springframework.data:spring-data-elasticsearch' + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' +} + +if (project.hasProperty("releaseVersion")) { + version = releaseVersion +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +publishing { + repositories { + maven { + name = "github" + url = uri('https://maven.pkg.github.com/navikt/testnorge') + credentials(PasswordCredentials) { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { + gpr(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} \ No newline at end of file diff --git a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.jar b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..e411586a54a --- /dev/null +++ b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +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/libs/data-transfer-search-objects/gradlew b/libs/data-transfer-search-objects/gradlew new file mode 100755 index 00000000000..3da45c161b0 --- /dev/null +++ b/libs/data-transfer-search-objects/gradlew @@ -0,0 +1,234 @@ +#!/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/libs/data-transfer-search-objects/gradlew.bat b/libs/data-transfer-search-objects/gradlew.bat new file mode 100644 index 00000000000..107acd32c4e --- /dev/null +++ b/libs/data-transfer-search-objects/gradlew.bat @@ -0,0 +1,89 @@ +@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/libs/data-transfer-search-objects/gradlewUpdate.sh b/libs/data-transfer-search-objects/gradlewUpdate.sh new file mode 100755 index 00000000000..e5ee6361152 --- /dev/null +++ b/libs/data-transfer-search-objects/gradlewUpdate.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +gradle wrapper \ No newline at end of file diff --git a/libs/data-transfer-search-objects/settings.gradle b/libs/data-transfer-search-objects/settings.gradle new file mode 100644 index 00000000000..75801b776d7 --- /dev/null +++ b/libs/data-transfer-search-objects/settings.gradle @@ -0,0 +1,13 @@ +plugins { + id "com.gradle.enterprise" version "3.12.3" +} + +rootProject.name = 'data-transfer-search-objects' + + +gradleEnterprise { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + } +} diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java similarity index 82% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java index 0f792ffc804..38364bb2a51 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/arbeidsplassencv/v1/ArbeidsplassenCVDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.arbeidsplassencv.v1; +package no.nav.testnav.libs.data.arbeidsplassencv.v1; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -36,6 +39,7 @@ public class ArbeidsplassenCVDTO { private String sammendrag; private Jobboensker jobboensker; private Boolean sistEndretAvNav; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sistEndret; public List getArbeidserfaring() { @@ -121,7 +125,9 @@ public static class Arbeidserfaring extends CVFelles { private String conceptId; private String location; private String description; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fromDate; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime toDate; private Boolean ongoing; private String styrkkode; @@ -140,7 +146,9 @@ public static class Utdanning extends CVFelles { private String nuskode; private Boolean hasAuthorization; private Yrkesskole vocationalCollege; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startDate; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime endDate; private String description; private Boolean ongoing; @@ -165,7 +173,9 @@ public static class AnnenGodkjenning extends CVFelles { private String alternativeName; private String conceptId; private String issuer; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fromDate; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime toDate; } @@ -177,7 +187,9 @@ public static class AnnenGodkjenning extends CVFelles { public static class Foererkort extends CVFelles { private String type; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime acquiredDate; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime expiryDate; } @@ -190,7 +202,9 @@ public static class AnnenErfaring extends CVFelles { private String description; private String role; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fromDate; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime toDate; private Boolean ongoing; } @@ -206,6 +220,7 @@ public static class Kurs extends CVFelles { private String issuer; private Long duration; private Tidsenhet durationUnit; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime date; } @@ -247,7 +262,9 @@ public static class OffentligeGodkjenning extends CVFelles { private String title; private String conceptId; private String issuer; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime fromDate; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime toDate; } @@ -385,6 +402,7 @@ public static class Location { @NoArgsConstructor public abstract static class CVFelles { private String uuid; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime updatedAt; } } diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/BankkontonrNorskDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/BankkontonrNorskDTO.java similarity index 57% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/BankkontonrNorskDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/BankkontonrNorskDTO.java index e4104cb4294..eb6e137fa84 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/BankkontonrNorskDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/BankkontonrNorskDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.With; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -19,6 +22,7 @@ public class BankkontonrNorskDTO { private String kontonummer; @Schema(description = "Datofeltet benyttes til lesning kun") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime kontoRegdato; private Boolean tilfeldigKontonummer; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/BankkontonrUtlandDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/BankkontonrUtlandDTO.java similarity index 62% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/BankkontonrUtlandDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/BankkontonrUtlandDTO.java index d485d9cb9d3..950edbfe26a 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/BankkontonrUtlandDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/BankkontonrUtlandDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.With; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -26,5 +29,6 @@ public class BankkontonrUtlandDTO { private String landkode; private Boolean tilfeldigKontonummer; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime kontoRegdato; } diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/HentKontoRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/HentKontoRequestDTO.java similarity index 80% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/HentKontoRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/HentKontoRequestDTO.java index 21e2133588b..452c831380d 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/HentKontoRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/HentKontoRequestDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/HentKontoResponseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/HentKontoResponseDTO.java similarity index 84% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/HentKontoResponseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/HentKontoResponseDTO.java index 9d3c749393e..5a3640064e6 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/HentKontoResponseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/HentKontoResponseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/KontoDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/KontoDTO.java similarity index 90% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/KontoDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/KontoDTO.java index 7741ceb6b44..dcca2efa1e1 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/KontoDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/KontoDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/KontoregisterResponseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/KontoregisterResponseDTO.java similarity index 87% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/KontoregisterResponseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/KontoregisterResponseDTO.java index 1fc5d7000de..9d3e91f3b90 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/KontoregisterResponseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/KontoregisterResponseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/OppdaterKontoRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/OppdaterKontoRequestDTO.java similarity index 87% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/OppdaterKontoRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/OppdaterKontoRequestDTO.java index d9692e4bd49..535867b1fd4 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/OppdaterKontoRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/OppdaterKontoRequestDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/OppdaterKontoResponseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/OppdaterKontoResponseDTO.java similarity index 87% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/OppdaterKontoResponseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/OppdaterKontoResponseDTO.java index bcb0683dec6..1b4f24bf134 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/OppdaterKontoResponseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/OppdaterKontoResponseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/SlettKontoRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/SlettKontoRequestDTO.java similarity index 86% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/SlettKontoRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/SlettKontoRequestDTO.java index 8c481638c9e..97dba99b093 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/SlettKontoRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/SlettKontoRequestDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/UtenlandskKontoDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/UtenlandskKontoDTO.java similarity index 90% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/UtenlandskKontoDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/UtenlandskKontoDTO.java index 0cae23dbcf2..09ac952d409 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/kontoregisterservice/v1/UtenlandskKontoDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/kontoregister/v1/UtenlandskKontoDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.kontoregisterservice.v1; +package no.nav.testnav.libs.data.kontoregister.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AdresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AdresseDTO.java similarity index 69% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AdresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AdresseDTO.java index 8f0f840e5cf..1bd1739c308 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AdresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AdresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,7 +8,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.deserialization.OppholdAnnetStedEnumDeserializer; +import no.nav.testnav.libs.data.pdlforvalter.v1.deserialization.OppholdAnnetStedEnumDeserializer; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -21,7 +24,9 @@ public abstract class AdresseDTO extends DbVersjonDTO { private String adresseIdentifikatorFraMatrikkelen; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; @Schema(description = "For å sette coAdresseNavn, benytt opprettCoAdresseNavn") diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AdressebeskyttelseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AdressebeskyttelseDTO.java similarity index 92% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AdressebeskyttelseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AdressebeskyttelseDTO.java index 890744467c3..4c7e6582d90 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AdressebeskyttelseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AdressebeskyttelseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AvailibilityResponseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AvailibilityResponseDTO.java similarity index 85% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AvailibilityResponseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AvailibilityResponseDTO.java index d6687d12342..af799671254 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/AvailibilityResponseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/AvailibilityResponseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/BestillingRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/BestillingRequestDTO.java similarity index 59% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/BestillingRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/BestillingRequestDTO.java index 109a674838e..4c018076290 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/BestillingRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/BestillingRequestDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -18,7 +21,9 @@ public class BestillingRequestDTO { private Identtype identtype; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtEtter; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtFoer; private Integer alder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/BostedadresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/BostedadresseDTO.java similarity index 76% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/BostedadresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/BostedadresseDTO.java index 6609294f25b..8df4ca13c51 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/BostedadresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/BostedadresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -18,6 +21,7 @@ @AllArgsConstructor public class BostedadresseDTO extends AdresseDTO { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime angittFlyttedato; private VegadresseDTO vegadresse; private UkjentBostedDTO ukjentBosted; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DbVersjonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DbVersjonDTO.java similarity index 96% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DbVersjonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DbVersjonDTO.java index fb083d1e950..af2fc523418 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DbVersjonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DbVersjonDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DeltBostedDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DeltBostedDTO.java similarity index 64% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DeltBostedDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DeltBostedDTO.java index 356f3a7583a..5d4edcec381 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DeltBostedDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DeltBostedDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -18,7 +21,9 @@ public class DeltBostedDTO extends DbVersjonDTO { private String adresseIdentifikatorFraMatrikkelen; private String coAdressenavn; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sluttdatoForKontrakt; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime startdatoForKontrakt; private VegadresseDTO vegadresse; private UkjentBostedDTO ukjentBosted; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DoedfoedtBarnDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DoedfoedtBarnDTO.java similarity index 50% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DoedfoedtBarnDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DoedfoedtBarnDTO.java index fa1e470a404..9605bc271c6 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DoedfoedtBarnDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DoedfoedtBarnDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -15,5 +18,6 @@ @AllArgsConstructor public class DoedfoedtBarnDTO extends DbVersjonDTO { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime dato; } \ No newline at end of file diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DoedsfallDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DoedsfallDTO.java similarity index 50% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DoedsfallDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DoedsfallDTO.java index 786a8cdfcb7..c696a3833d8 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/DoedsfallDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/DoedsfallDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -15,5 +18,6 @@ @AllArgsConstructor public class DoedsfallDTO extends DbVersjonDTO { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime doedsdato; } diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FalskIdentitetDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FalskIdentitetDTO.java similarity index 84% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FalskIdentitetDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FalskIdentitetDTO.java index e4fec9ef4ee..0b4f1295a48 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FalskIdentitetDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FalskIdentitetDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,6 +8,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -30,7 +33,9 @@ public class FalskIdentitetDTO extends DbVersjonDTO { "nyFalskIdentitet er satt vil ny person oppreettes og bli satt til rettIdentitetVedIdentifikasjonsnummer.") private Boolean erFalsk; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; private PersonRequestDTO nyFalskIdentitetPerson; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FoedselDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FoedselDTO.java similarity index 57% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FoedselDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FoedselDTO.java index 70080fac05c..6f5da8a6ae0 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FoedselDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FoedselDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -19,5 +22,6 @@ public class FoedselDTO extends DbVersjonDTO { private String foedeland; private String foedested; private Integer foedselsaar; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedselsdato; } diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java similarity index 59% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java index 9abe0f8c268..c77ed5da827 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregisterPersonstatusDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -28,6 +31,8 @@ public enum FolkeregisterPersonstatus { } private FolkeregisterPersonstatus status; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; } diff --git a/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregistermetadataDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregistermetadataDTO.java new file mode 100644 index 00000000000..1280a05df13 --- /dev/null +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FolkeregistermetadataDTO.java @@ -0,0 +1,27 @@ +package no.nav.testnav.libs.data.pdlforvalter.v1; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FolkeregistermetadataDTO implements Serializable { + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime ajourholdstidspunkt; + private Boolean gjeldende; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime gyldighetstidspunkt; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime opphoerstidspunkt; +} \ No newline at end of file diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/ForelderBarnRelasjonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/ForelderBarnRelasjonDTO.java similarity index 97% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/ForelderBarnRelasjonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/ForelderBarnRelasjonDTO.java index 1d59f655bac..c9169715f26 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/ForelderBarnRelasjonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/ForelderBarnRelasjonDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/ForeldreansvarDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/ForeldreansvarDTO.java similarity index 71% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/ForeldreansvarDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/ForeldreansvarDTO.java index 4556a4c3f6d..19d9f4b05af 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/ForeldreansvarDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/ForeldreansvarDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -23,7 +26,9 @@ public class ForeldreansvarDTO extends DbVersjonDTO { private String ansvarlig; private PersonRequestDTO nyAnsvarlig; private RelatertBiPersonDTO ansvarligUtenIdentifikator; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; private Boolean eksisterendePerson; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FullPersonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FullPersonDTO.java similarity index 64% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FullPersonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FullPersonDTO.java index 8339457e806..81259d6f5f7 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FullPersonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FullPersonDTO.java @@ -1,9 +1,12 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.ArrayList; @@ -20,6 +23,8 @@ public class FullPersonDTO { private Long id; private PersonDTO person; private List relasjoner; + + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sistOppdatert; public List getRelasjoner() { @@ -37,6 +42,7 @@ public static class RelasjonDTO { private Long id; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sistOppdatert; private RelasjonType relasjonType; private PersonDTO relatertPerson; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FullmaktDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FullmaktDTO.java similarity index 65% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FullmaktDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FullmaktDTO.java index 99149f91370..43315d65756 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/FullmaktDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/FullmaktDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; import java.util.List; @@ -22,7 +25,9 @@ public class FullmaktDTO extends DbVersjonDTO { private PersonRequestDTO nyFullmektig; private String motpartsPersonident; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; private List omraader; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/IdentRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/IdentRequestDTO.java similarity index 68% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/IdentRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/IdentRequestDTO.java index 38f71efe50f..5ea7bc2fea3 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/IdentRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/IdentRequestDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -7,6 +7,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -21,7 +24,9 @@ public class IdentRequestDTO extends DbVersjonDTO { // All fields are optional private Identtype identtype; private KjoennDTO.Kjoenn kjoenn; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtEtter; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtFoer; private Integer alder; private Boolean syntetisk; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/Identtype.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/Identtype.java similarity index 51% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/Identtype.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/Identtype.java index 2e2a6b00dbc..d4710d582db 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/Identtype.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/Identtype.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; public enum Identtype { FNR, diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/InnflyttingDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/InnflyttingDTO.java similarity index 56% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/InnflyttingDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/InnflyttingDTO.java index 32038722f66..f39980aec0a 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/InnflyttingDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/InnflyttingDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -17,5 +20,6 @@ public class InnflyttingDTO extends DbVersjonDTO { private String fraflyttingsland; private String fraflyttingsstedIUtlandet; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime innflyttingsdato; } \ No newline at end of file diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KjoennDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KjoennDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KjoennDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KjoennDTO.java index 84808206c0d..871ced4cc42 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KjoennDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KjoennDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KontaktadresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KontaktadresseDTO.java similarity index 98% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KontaktadresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KontaktadresseDTO.java index 28a3bc94591..6a02f1d5db1 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KontaktadresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KontaktadresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java similarity index 86% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java index 280afa2b064..9b81a789964 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/KontaktinformasjonForDoedsboDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,6 +8,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -29,6 +32,7 @@ public class KontaktinformasjonForDoedsboDTO extends DbVersjonDTO { @Schema( type = "LocalDateTime", description = "Dato for utstedelse") + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime attestutstedelsesdato; private KontaktinformasjonForDoedsboAdresse adresse; @@ -78,6 +82,7 @@ public static class KontaktpersonDTO implements Serializable { private String identifikasjonsnummer; private PersonRequestDTO nyKontaktperson; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedselsdato; private PersonNavnDTO navn; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/MatrikkeladresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/MatrikkeladresseDTO.java similarity index 90% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/MatrikkeladresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/MatrikkeladresseDTO.java index f18498b9b37..3880a162234 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/MatrikkeladresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/MatrikkeladresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/NavnDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/NavnDTO.java similarity index 57% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/NavnDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/NavnDTO.java index 0da9c15e1d8..ab8528c31d0 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/NavnDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/NavnDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -20,5 +23,6 @@ public class NavnDTO extends DbVersjonDTO { private String mellomnavn; private Boolean hasMellomnavn; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; } diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OppholdDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OppholdDTO.java similarity index 51% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OppholdDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OppholdDTO.java index b2f3ea4a551..de3bb00c0ed 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OppholdDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OppholdDTO.java @@ -1,10 +1,13 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -15,7 +18,9 @@ @AllArgsConstructor public class OppholdDTO extends DbVersjonDTO { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime oppholdFra; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime oppholdTil; private OppholdType type; public enum OppholdType {MIDLERTIDIG, PERMANENT, OPPLYSNING_MANGLER} diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OppholdsadresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OppholdsadresseDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OppholdsadresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OppholdsadresseDTO.java index cfb7afe99d3..3c43e6b6390 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OppholdsadresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OppholdsadresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import no.nav.testnav.libs.dto.pdlforvalter.v1.deserialization.OppholdAnnetStedEnumDeserializer; +import no.nav.testnav.libs.data.pdlforvalter.v1.deserialization.OppholdAnnetStedEnumDeserializer; import static java.util.Objects.nonNull; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OrdreRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OrdreRequestDTO.java similarity index 83% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OrdreRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OrdreRequestDTO.java index 05958521b93..cd84562923e 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OrdreRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OrdreRequestDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OrdreResponseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OrdreResponseDTO.java similarity index 96% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OrdreResponseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OrdreResponseDTO.java index f6756bb7bf1..c5da094bcd9 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/OrdreResponseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/OrdreResponseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlArtifact.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlArtifact.java similarity index 94% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlArtifact.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlArtifact.java index f8bb9588720..a0c1c7c46e8 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PdlArtifact.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlArtifact.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; public enum PdlArtifact { PDL_ADRESSEBESKYTTELSE, diff --git a/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlStatus.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlStatus.java new file mode 100644 index 00000000000..28c07ad306c --- /dev/null +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PdlStatus.java @@ -0,0 +1,5 @@ +package no.nav.testnav.libs.data.pdlforvalter.v1; + +public enum PdlStatus { + OK, FEIL +} diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonDTO.java similarity index 94% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonDTO.java index 297c1640f52..883ad314be1 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -6,7 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus; +import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus; import java.io.Serializable; import java.util.ArrayList; @@ -15,10 +15,10 @@ import static java.lang.Integer.parseInt; import static java.util.Objects.isNull; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FOEDSELSREGISTRERT; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.DNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.FNR; -import static no.nav.testnav.libs.dto.pdlforvalter.v1.Identtype.NPID; +import static no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus.FOEDSELSREGISTRERT; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.DNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.FNR; +import static no.nav.testnav.libs.data.pdlforvalter.v1.Identtype.NPID; @Data @Builder diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonIDDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonIDDTO.java similarity index 86% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonIDDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonIDDTO.java index 27c4d1c2f86..dad9cd07cf0 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonIDDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonIDDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonRequestDTO.java similarity index 64% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonRequestDTO.java index a4ffd0f522d..572055131b1 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonRequestDTO.java @@ -1,9 +1,12 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -17,7 +20,9 @@ public class PersonRequestDTO implements Serializable { // All fields are optional private Identtype identtype; private KjoennDTO.Kjoenn kjoenn; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtEtter; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedtFoer; private Integer alder; private Boolean syntetisk; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonUpdateRequestDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonUpdateRequestDTO.java similarity index 82% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonUpdateRequestDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonUpdateRequestDTO.java index 902f80b3f5b..ca71388d9e7 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonUpdateRequestDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonUpdateRequestDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonnavnDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonnavnDTO.java similarity index 87% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonnavnDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonnavnDTO.java index acf5a5a4186..5161364aa21 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonnavnDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/PersonnavnDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/RelasjonType.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/RelasjonType.java similarity index 87% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/RelasjonType.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/RelasjonType.java index 19942f4bf42..58ab116882a 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/RelasjonType.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/RelasjonType.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; public enum RelasjonType { diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/RelatertBiPersonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/RelatertBiPersonDTO.java similarity index 54% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/RelatertBiPersonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/RelatertBiPersonDTO.java index faf826d61e4..a3b16794c22 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/RelatertBiPersonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/RelatertBiPersonDTO.java @@ -1,9 +1,12 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -14,6 +17,7 @@ @AllArgsConstructor public class RelatertBiPersonDTO implements Serializable { + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime foedselsdato; private KjoennDTO.Kjoenn kjoenn; private PersonnavnDTO navn; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/SikkerhetstiltakDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/SikkerhetstiltakDTO.java similarity index 71% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/SikkerhetstiltakDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/SikkerhetstiltakDTO.java index 67de152710e..f3501fe1aaf 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/SikkerhetstiltakDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/SikkerhetstiltakDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,6 +7,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.io.Serializable; import java.time.LocalDateTime; @@ -24,8 +27,10 @@ public class SikkerhetstiltakDTO extends DbVersjonDTO { private String beskrivelse; private Kontaktperson kontaktperson; @Schema + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; @Schema + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; public enum Tiltakstype {FYUS, TFUS, FTUS, DIUS, TOAN} diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/SivilstandDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/SivilstandDTO.java similarity index 81% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/SivilstandDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/SivilstandDTO.java index 1bfae39c062..9181ff8bdd1 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/SivilstandDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/SivilstandDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -33,8 +36,10 @@ public enum Sivilstand { SAMBOER } + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime bekreftelsesdato; private String relatertVedSivilstand; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime sivilstandsdato; private Sivilstand type; diff --git a/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/StatsborgerskapDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/StatsborgerskapDTO.java new file mode 100644 index 00000000000..15d325b2b00 --- /dev/null +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/StatsborgerskapDTO.java @@ -0,0 +1,28 @@ +package no.nav.testnav.libs.data.pdlforvalter.v1; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.time.LocalDateTime; + +@Data +@SuperBuilder +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class StatsborgerskapDTO extends DbVersjonDTO { + + private String landkode; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime gyldigTilOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") + private LocalDateTime bekreftelsesdato; +} \ No newline at end of file diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/TelefonnummerDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/TelefonnummerDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/TelefonnummerDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/TelefonnummerDTO.java index 925509275b6..5fdc490dd11 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/TelefonnummerDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/TelefonnummerDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java similarity index 93% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java index bc30a687adb..d9ce55475e7 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/TilrettelagtKommunikasjonDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UkjentBostedDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UkjentBostedDTO.java similarity index 85% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UkjentBostedDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UkjentBostedDTO.java index 2c8d6f2587c..6ea75fe0416 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UkjentBostedDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UkjentBostedDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtenlandskAdresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtenlandskAdresseDTO.java similarity index 96% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtenlandskAdresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtenlandskAdresseDTO.java index ca6b4183847..078b1e2c20a 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtenlandskAdresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtenlandskAdresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java similarity index 93% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java index 3618e136445..91bfa312e0b 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtenlandskIdentifikasjonsnummerDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtflyttingDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtflyttingDTO.java similarity index 65% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtflyttingDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtflyttingDTO.java index a32e549f550..122df4d9493 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/UtflyttingDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/UtflyttingDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -20,6 +23,7 @@ public class UtflyttingDTO extends DbVersjonDTO { private String tilflyttingsland; private String tilflyttingsstedIUtlandet; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime utflyttingsdato; @JsonIgnore diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VegadresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VegadresseDTO.java similarity index 91% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VegadresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VegadresseDTO.java index 9c0a6b4b236..d29e445e032 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VegadresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VegadresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalDTO.java similarity index 66% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalDTO.java index 4eaa94c0fdd..2424936959e 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; import java.time.LocalDateTime; @@ -20,7 +23,9 @@ public class VergemaalDTO extends DbVersjonDTO { private VergemaalEmbete vergemaalEmbete; private VergemaalSakstype sakType; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigFraOgMed; + @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss") private LocalDateTime gyldigTilOgMed; private PersonRequestDTO nyVergeIdent; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalEmbete.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalEmbete.java similarity index 93% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalEmbete.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalEmbete.java index 01aa02c7f80..35a39ce1b2e 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalEmbete.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalEmbete.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; public enum VergemaalEmbete { diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalMandattype.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalMandattype.java similarity index 92% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalMandattype.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalMandattype.java index 586ccd1da58..22500c07f30 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalMandattype.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalMandattype.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; public enum VergemaalMandattype { diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalSakstype.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalSakstype.java similarity index 92% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalSakstype.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalSakstype.java index dac5106608e..04db1cbe2e3 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/VergemaalSakstype.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/VergemaalSakstype.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1; +package no.nav.testnav.libs.data.pdlforvalter.v1; public enum VergemaalSakstype { diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java similarity index 86% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java index fd484da5316..8fe2b41fed0 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/pdlforvalter/v1/deserialization/OppholdAnnetStedEnumDeserializer.java @@ -1,10 +1,10 @@ -package no.nav.testnav.libs.dto.pdlforvalter.v1.deserialization; +package no.nav.testnav.libs.data.pdlforvalter.v1.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.TextNode; -import no.nav.testnav.libs.dto.pdlforvalter.v1.AdresseDTO.OppholdAnnetSted; +import no.nav.testnav.libs.data.pdlforvalter.v1.AdresseDTO.OppholdAnnetSted; import org.apache.commons.lang3.StringUtils; import java.io.IOException; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/AdresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/AdresseDTO.java similarity index 94% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/AdresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/AdresseDTO.java index 5e21bdfceae..9e941f3622e 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/AdresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/AdresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/AdresseUtlandDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/AdresseUtlandDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/AdresseUtlandDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/AdresseUtlandDTO.java index efe7044b864..7e50ab114cc 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/AdresseUtlandDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/AdresseUtlandDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/GateadresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/GateadresseDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/GateadresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/GateadresseDTO.java index 5aecb60376f..d9ce3d70123 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/GateadresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/GateadresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/InnvandretUtvandretDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/InnvandretUtvandretDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/InnvandretUtvandretDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/InnvandretUtvandretDTO.java index 216c49d75fc..53ceb1d34d2 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/InnvandretUtvandretDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/InnvandretUtvandretDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MatrikkeladresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MatrikkeladresseDTO.java similarity index 90% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MatrikkeladresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MatrikkeladresseDTO.java index f4f734344b6..360c6e67fb0 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MatrikkeladresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MatrikkeladresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MidlertidigAdresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MidlertidigAdresseDTO.java similarity index 97% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MidlertidigAdresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MidlertidigAdresseDTO.java index beec9e8c473..d204e61bef8 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MidlertidigAdresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MidlertidigAdresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java similarity index 58% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java index d2aa3d8fac4..99d3655e8d6 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/MidlertidigAdressetypeDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; public enum MidlertidigAdressetypeDTO { diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PersonDTO.java similarity index 91% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PersonDTO.java index 26a08bc6e30..bfad5551584 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PersonDTO.java @@ -1,12 +1,12 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO; -import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; +import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PersonMiljoeDTO.java similarity index 91% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PersonMiljoeDTO.java index bd94df76d02..c93117f13ca 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PersonMiljoeDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PostadresseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PostadresseDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PostadresseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PostadresseDTO.java index b150999b2b6..6da38b2ff77 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PostadresseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/PostadresseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/RelasjonDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/RelasjonDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/RelasjonDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/RelasjonDTO.java index 436fa5b14e2..b426bbf46c3 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/RelasjonDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/RelasjonDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SikkerhetTiltakDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SikkerhetTiltakDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SikkerhetTiltakDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SikkerhetTiltakDTO.java index 2e17e30494a..4c79aa97f26 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SikkerhetTiltakDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SikkerhetTiltakDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SivilstandDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SivilstandDTO.java similarity index 87% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SivilstandDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SivilstandDTO.java index 8e92ec9c658..0710b1d6918 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SivilstandDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SivilstandDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SpraakDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SpraakDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SpraakDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SpraakDTO.java index 86fc2b84ba1..afd206dbcf1 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/SpraakDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/SpraakDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.xml.bind.annotation.XmlType; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/StatsborgerskapDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/StatsborgerskapDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/StatsborgerskapDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/StatsborgerskapDTO.java index 9757f7b2a67..f0d4affcdac 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/StatsborgerskapDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/StatsborgerskapDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TelefonTypeNummerDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TelefonTypeNummerDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TelefonTypeNummerDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TelefonTypeNummerDTO.java index 46a823c5407..6fc9ff2133a 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TelefonTypeNummerDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TelefonTypeNummerDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TpsIdentStatusDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TpsIdentStatusDTO.java similarity index 89% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TpsIdentStatusDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TpsIdentStatusDTO.java index d76ec814c54..ee3336d1b0d 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TpsIdentStatusDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TpsIdentStatusDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TpsMeldingResponseDTO.java b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TpsMeldingResponseDTO.java similarity index 88% rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TpsMeldingResponseDTO.java rename to libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TpsMeldingResponseDTO.java index 7b9c0d95d37..9924c8cc368 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/TpsMeldingResponseDTO.java +++ b/libs/data-transfer-search-objects/src/main/java/no/nav/testnav/libs/data/tpsmessagingservice/v1/TpsMeldingResponseDTO.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.dto.tpsmessagingservice.v1; +package no.nav.testnav.libs.data.tpsmessagingservice.v1; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/settings.gradle b/settings.gradle index 4bd87bd6328..2bcf524ddf1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -50,6 +50,7 @@ includeBuild './proxies/arbeidsplassencv-proxy' includeBuild './libs/security-token-service' includeBuild './libs/data-transfer-objects' +includeBuild './libs/data-transfer-search-objects' includeBuild './libs/reactive-proxy' includeBuild './libs/reactive-core' includeBuild './libs/servlet-core'