-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature/add legacy search functionality and mapping strategies
- Loading branch information
Showing
10 changed files
with
733 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
.../src/main/java/no/nav/testnav/dollysearchservice/mapper/LegacyRequestMappingStrategy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package no.nav.testnav.dollysearchservice.mapper; | ||
|
|
||
| import ma.glasnost.orika.CustomMapper; | ||
| import ma.glasnost.orika.MapperFactory; | ||
| import ma.glasnost.orika.MappingContext; | ||
| import no.nav.testnav.libs.data.dollysearchservice.v1.PersonRequest; | ||
| import no.nav.testnav.libs.data.dollysearchservice.v1.PersonSearch; | ||
| import no.nav.testnav.libs.data.pdlforvalter.v1.FolkeregisterPersonstatusDTO.FolkeregisterPersonstatus; | ||
| import no.nav.testnav.libs.data.pdlforvalter.v1.KjoennDTO; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import static java.util.Objects.nonNull; | ||
| import static org.apache.commons.lang3.StringUtils.isNotBlank; | ||
|
|
||
| @Component | ||
| public class LegacyRequestMappingStrategy implements MappingStrategy { | ||
|
|
||
| @Override | ||
| public void register(MapperFactory factory) { | ||
|
|
||
| factory.classMap(PersonSearch.class, PersonRequest.class) | ||
| .customize(new CustomMapper<PersonSearch, PersonRequest>() { | ||
| @Override | ||
| public void mapAtoB(PersonSearch personSearch, PersonRequest personRequest, MappingContext context) { | ||
|
|
||
| Optional.ofNullable(personSearch.getAlder()) | ||
| .ifPresent(alder -> { | ||
| personRequest.setAlderFom(nonNull(alder.getFra()) ? | ||
| alder.getFra().intValue() : null); | ||
| personRequest.setAlderTom(nonNull(alder.getTil()) ? | ||
| alder.getTil().intValue() : null); | ||
| }); | ||
|
|
||
| Optional.ofNullable(personSearch.getPersonstatus()) | ||
| .ifPresent(personstatus -> | ||
| personRequest.setPersonStatus(FolkeregisterPersonstatus.valueOf(personstatus.getStatus()))); | ||
|
|
||
| Optional.ofNullable(personSearch.getKjoenn()) | ||
| .ifPresent(kjoenn -> personRequest.setKjoenn(KjoennDTO.Kjoenn.valueOf(kjoenn))); | ||
|
|
||
| Optional.ofNullable(personSearch.getNasjonalitet()) | ||
| .ifPresent(nasjonalitet -> personRequest.setStatsborgerskap(nasjonalitet.getStatsborgerskap())); | ||
|
|
||
| Optional.ofNullable(personSearch.getAdresser()) | ||
| .ifPresent(adresser -> { | ||
| personRequest.setAdresse(PersonRequest.AdresseRequest.builder() | ||
| .harUtenlandsadresse(isNotBlank(adresser.getHarUtenlandskAdresse())) | ||
| .harKontaktadresse(isNotBlank(adresser.getHarKontaktadresse())) | ||
| .harOppholdsadresse(isNotBlank(adresser.getHarOppholdsadresse())) | ||
| .build()); | ||
| }); | ||
| } | ||
| }).register(); | ||
| } | ||
| } |
181 changes: 181 additions & 0 deletions
181
...src/main/java/no/nav/testnav/dollysearchservice/mapper/LegacyResponseMappingStrategy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| package no.nav.testnav.dollysearchservice.mapper; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import lombok.RequiredArgsConstructor; | ||
| import ma.glasnost.orika.CustomMapper; | ||
| import ma.glasnost.orika.MapperFactory; | ||
| import ma.glasnost.orika.MappingContext; | ||
| import no.nav.testnav.dollysearchservice.dto.Person; | ||
| import no.nav.testnav.libs.data.dollysearchservice.v1.PersonDTO; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import static java.util.Objects.nonNull; | ||
| import static org.apache.commons.lang3.BooleanUtils.isFalse; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class LegacyResponseMappingStrategy implements MappingStrategy { | ||
|
|
||
| private final ObjectMapper objectMapper; | ||
|
|
||
| @Override | ||
| public void register(MapperFactory factory) { | ||
| factory.classMap(JsonNode.class, PersonDTO.class) | ||
| .customize(new CustomMapper<>() { | ||
|
|
||
| @Override | ||
| public void mapAtoB(JsonNode response, PersonDTO personDTO, MappingContext context) { | ||
|
|
||
| var person = objectMapper.convertValue(response, Person.class); | ||
| personDTO.setTags(person.getTags()); | ||
| mapIdent(personDTO, person); | ||
| mapAktoerId(personDTO, person); | ||
| mapNavn(personDTO, person); | ||
| mapFoedselsdato(personDTO, person); | ||
| mapKjoenn(personDTO, person); | ||
| mapStatsborgerskap(personDTO, person); | ||
| mapSivilstand(personDTO, person); | ||
| mapPersonstatus(personDTO, person); | ||
| mapDoedsdato(personDTO, person); | ||
| mapInnflyttingTilNorge(personDTO, person); | ||
| mapUtflyttingFraNorge(personDTO, person); | ||
| mapForelderBarnRelasjoner(personDTO, person); | ||
| } | ||
| }) | ||
| .register(); | ||
| } | ||
|
|
||
| private static void mapIdent(PersonDTO personDTO, Person person) { | ||
|
|
||
| personDTO.setIdent(person.getHentIdenter().getIdenter().stream() | ||
| .filter(identer -> "FOLKEREGISTERIDENT".equals(identer.getGruppe()) && | ||
| isFalse(identer.getHistorisk())) | ||
| .map(Person.Identer::getIdent) | ||
| .findFirst().orElse(null)); | ||
| } | ||
|
|
||
| private static void mapAktoerId(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentIdenter().getIdenter().stream() | ||
| .filter(identer -> "AKTORID".equals(identer.getGruppe()) && | ||
| isFalse(identer.getHistorisk())) | ||
| .map(Person.Identer::getIdent) | ||
| .findFirst() | ||
| .ifPresent(personDTO::setAktorId); | ||
| } | ||
|
|
||
| private static void mapNavn(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getNavn().stream() | ||
| .findFirst() | ||
| .ifPresent(navn -> { | ||
| personDTO.setFornavn(navn.getFornavn()); | ||
| personDTO.setMellomnavn(navn.getMellomnavn()); | ||
| personDTO.setEtternavn(navn.getEtternavn()); | ||
| }); | ||
| } | ||
|
|
||
| private static void mapFoedselsdato(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getFoedselsdato().stream() | ||
| .findFirst() | ||
| .ifPresent(foedselsdato -> | ||
| personDTO.setFoedselsdato(PersonDTO.FoedselsdatoDTO.builder() | ||
| .foedselsdato(foedselsdato.getFoedselsdato()) | ||
| .build())); | ||
| } | ||
|
|
||
| private static void mapKjoenn(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getKjoenn().stream() | ||
| .findFirst() | ||
| .ifPresent(kjoenn -> | ||
| personDTO.setKjoenn(kjoenn.getKjoenn().name())); | ||
| } | ||
|
|
||
| private static void mapStatsborgerskap(PersonDTO personDTO, Person person) { | ||
|
|
||
| if (nonNull(person.getHentPerson().getStatsborgerskap())) { | ||
| personDTO.setStatsborgerskap(PersonDTO.StatsborgerskapDTO.builder() | ||
| .land(person.getHentPerson().getStatsborgerskap().stream() | ||
| .map(Person.Statsborgerskap::getLand) | ||
| .distinct() | ||
| .toList()) | ||
| .build()); | ||
| } | ||
| } | ||
|
|
||
| private static void mapSivilstand(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getSivilstand().stream() | ||
| .findFirst() | ||
| .ifPresent(sivilstand -> | ||
| personDTO.setSivilstand(PersonDTO.SivilstandDTO.builder() | ||
| .type(sivilstand.getType().name()) | ||
| .relatertVedSivilstand(sivilstand.getRelatertVedSivilstand()) | ||
| .build())); | ||
| } | ||
|
|
||
| private static void mapPersonstatus(PersonDTO personDTO, Person person) { | ||
|
|
||
| if (nonNull(person.getHentPerson().getFolkeregisterpersonstatus())) { | ||
| personDTO.setFolkeregisterpersonstatus(person.getHentPerson().getFolkeregisterpersonstatus().stream() | ||
| .map(personstatus -> PersonDTO.FolkeregisterpersonstatusDTO.builder() | ||
| .status(personstatus.getStatus().name()) | ||
| .gyldighetstidspunkt(personstatus.getFolkeregistermetadata().getGyldighetstidspunkt()) | ||
| .build()) | ||
| .toList()); | ||
| } | ||
| } | ||
|
|
||
| private void mapDoedsdato(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getDoedsfall().stream() | ||
| .filter(doedsfall -> nonNull(doedsfall.getDoedsdato())) | ||
| .findFirst() | ||
| .ifPresent(doedsfall -> personDTO.setDoedsfall(PersonDTO.DoedsfallDTO.builder() | ||
| .doedsdato(doedsfall.getDoedsdato()) | ||
| .build())); | ||
| } | ||
|
|
||
| private void mapInnflyttingTilNorge(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getInnflyttingTilNorge().stream() | ||
| .findFirst() | ||
| .ifPresent(innflyttingTilNorge -> personDTO.setInnfyttingTilNorge(PersonDTO.InnflyttingTilNorgeDTO.builder() | ||
| .fraflyttingsland(innflyttingTilNorge.getFraflyttingsland()) | ||
| .fraflyttingsstedIUtlandet(innflyttingTilNorge.getFraflyttingsstedIUtlandet()) | ||
| .build())); | ||
| } | ||
|
|
||
| private void mapUtflyttingFraNorge(PersonDTO personDTO, Person person) { | ||
|
|
||
| person.getHentPerson().getUtflyttingFraNorge().stream() | ||
| .findFirst() | ||
| .ifPresent(utflyttingFraNorge -> personDTO.setUtfyttingFraNorge(PersonDTO.UtfyttingFraNorgeDTO.builder() | ||
| .tilflyttingsland(utflyttingFraNorge.getTilflyttingsland()) | ||
| .tilflyttingsstedIUtlandet(utflyttingFraNorge.getTilflyttingsstedIUtlandet()) | ||
| .utflyttingsdato(utflyttingFraNorge.getUtflyttingsdato()) | ||
| .build())); | ||
| } | ||
|
|
||
| private void mapForelderBarnRelasjoner(PersonDTO personDTO, Person person) { | ||
|
|
||
| if (nonNull(person.getHentPerson().getForelderBarnRelasjon())) { | ||
| personDTO.setForelderBarnRelasjoner(PersonDTO.ForelderBarnRelasjonDTO.builder() | ||
| .barn(person.getHentPerson().getForelderBarnRelasjon().stream() | ||
| .filter(Person.ForelderBarnRelasjon::isBarn) | ||
| .map(Person.ForelderBarnRelasjon::getRelatertPersonsIdent) | ||
| .toList()) | ||
| .foreldre(person.getHentPerson().getForelderBarnRelasjon().stream() | ||
| .filter(Person.ForelderBarnRelasjon::isForelder) | ||
| .map(forelderBarnRelasjon -> PersonDTO.ForelderDTO.builder() | ||
| .ident(forelderBarnRelasjon.getRelatertPersonsIdent()) | ||
| .rolle(forelderBarnRelasjon.getRelatertPersonsRolle().name()) | ||
| .build()) | ||
| .toList()) | ||
| .build()); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.