Feature/refactor legacy data models and update mapping strategies for…

… improved clarity #deploy-test-dolly-search-service #deploy-dolly-search-service
navikt · Mar 6, 2025 · 0ddba9f · 0ddba9f
1 parent 9709da0
commit 0ddba9f
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 185 deletions.
diff --git a/...h-service/src/main/java/no/nav/testnav/dollysearchservice/dto/SearchInternalResponse.java b/...h-service/src/main/java/no/nav/testnav/dollysearchservice/dto/SearchInternalResponse.java
@@ -6,8 +6,11 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static java.util.Objects.isNull;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -21,4 +24,12 @@ public class SearchInternalResponse {
     private Integer seed;
     private List<JsonNode> personer;
     private String error;
+
+    public List<JsonNode> getPersoner() {
+
+        if (isNull(personer)) {
+            return new ArrayList<>();
+        }
+        return personer;
+    }
 }
diff --git a/.../src/main/java/no/nav/testnav/dollysearchservice/mapper/LegacyRequestMappingStrategy.java b/.../src/main/java/no/nav/testnav/dollysearchservice/mapper/LegacyRequestMappingStrategy.java
@@ -4,7 +4,7 @@
 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.dollysearchservice.v1.legacy.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;
@@ -13,7 +13,6 @@
 
 import static java.util.Objects.nonNull;
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 @Component
 public class LegacyRequestMappingStrategy implements MappingStrategy {
@@ -27,12 +26,10 @@ public void register(MapperFactory factory) {
                     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);
-                                        });
+                                .ifPresent(alder -> {
+                                    personRequest.setAlderFom(nonNull(alder.getFra()) ? alder.getFra() : null);
+                                    personRequest.setAlderTom(nonNull(alder.getTil()) ? alder.getTil() : null);
+                                });
 
                         Optional.ofNullable(personSearch.getPersonstatus())
                                 .ifPresent(personstatus ->
@@ -46,13 +43,17 @@ public void mapAtoB(PersonSearch personSearch, PersonRequest personRequest, Mapp
 
                         Optional.ofNullable(personSearch.getAdresser())
                                 .ifPresent(adresser ->
-                                    personRequest.setAdresse(PersonRequest.AdresseRequest.builder()
-                                                    .harUtenlandsadresse(isNotBlank(adresser.getHarUtenlandskAdresse()))
-                                                    .harKontaktadresse(isNotBlank(adresser.getHarKontaktadresse()))
-                                                    .harOppholdsadresse(isNotBlank(adresser.getHarOppholdsadresse()))
-                                            .build()));
+                                        personRequest.setAdresse(PersonRequest.AdresseRequest.builder()
+                                                .harUtenlandsadresse(isTrue(adresser.getHarUtenlandskAdresse()))
+                                                .harKontaktadresse(isTrue(adresser.getHarKontaktadresse()))
+                                                .harOppholdsadresse(isTrue(adresser.getHarOppholdsadresse()))
+                                                .build()));
 
                         personRequest.setErLevende(isTrue(personSearch.getKunLevende()));
+
+                        Optional.ofNullable(personSearch.getRelasjoner())
+                                .ifPresent(relasjoner ->
+                                        personRequest.setHarBarn(isTrue(relasjoner.getHarBarn())));
                     }
                 }).register();
     }

diff --git a/...src/main/java/no/nav/testnav/dollysearchservice/mapper/LegacyResponseMappingStrategy.java b/...src/main/java/no/nav/testnav/dollysearchservice/mapper/LegacyResponseMappingStrategy.java
@@ -7,7 +7,7 @@
 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 no.nav.testnav.libs.data.dollysearchservice.v1.legacy.PersonDTO;
 import org.springframework.stereotype.Component;
 
 import static java.util.Objects.nonNull;

diff --git a/...ch-service/src/main/java/no/nav/testnav/dollysearchservice/provider/LegacyController.java b/...ch-service/src/main/java/no/nav/testnav/dollysearchservice/provider/LegacyController.java
@@ -3,8 +3,8 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import no.nav.testnav.dollysearchservice.service.LegacyService;
-import no.nav.testnav.libs.data.dollysearchservice.v1.PersonDTO;
-import no.nav.testnav.libs.data.dollysearchservice.v1.PersonSearch;
+import no.nav.testnav.libs.data.dollysearchservice.v1.legacy.PersonDTO;
+import no.nav.testnav.libs.data.dollysearchservice.v1.legacy.PersonSearch;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

diff --git a/...search-service/src/main/java/no/nav/testnav/dollysearchservice/service/LegacyService.java b/...search-service/src/main/java/no/nav/testnav/dollysearchservice/service/LegacyService.java
@@ -5,9 +5,9 @@
 import no.nav.testnav.dollysearchservice.dto.SearchInternalResponse;
 import no.nav.testnav.dollysearchservice.dto.SearchRequest;
 import no.nav.testnav.dollysearchservice.utils.OpenSearchQueryBuilder;
-import no.nav.testnav.libs.data.dollysearchservice.v1.PersonDTO;
+import no.nav.testnav.libs.data.dollysearchservice.v1.legacy.PersonDTO;
 import no.nav.testnav.libs.data.dollysearchservice.v1.PersonRequest;
-import no.nav.testnav.libs.data.dollysearchservice.v1.PersonSearch;
+import no.nav.testnav.libs.data.dollysearchservice.v1.legacy.PersonSearch;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 
@@ -26,6 +26,9 @@ public class LegacyService {
     public Flux<PersonDTO> searchPersoner(PersonSearch personSearch) {
 
         var personRequest = SearchRequest.builder()
+                .seed(personSearch.getRandomSeed())
+                .side(personSearch.getPage())
+                .antall(personSearch.getPageSize())
                 .personRequest(mapperFacade.map(personSearch, PersonRequest.class))
                 .build();
 

diff --git a/...ch-objects/src/main/java/no/nav/testnav/libs/data/dollysearchservice/v1/PersonSearch.java b/...ch-objects/src/main/java/no/nav/testnav/libs/data/dollysearchservice/v1/PersonSearch.java
diff --git a/...data/dollysearchservice/v1/PersonDTO.java → ...llysearchservice/v1/legacy/PersonDTO.java b/...data/dollysearchservice/v1/PersonDTO.java → ...llysearchservice/v1/legacy/PersonDTO.java
@@ -1,4 +1,4 @@
-package no.nav.testnav.libs.data.dollysearchservice.v1;
+package no.nav.testnav.libs.data.dollysearchservice.v1.legacy;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...cts/src/main/java/no/nav/testnav/libs/data/dollysearchservice/v1/legacy/PersonSearch.java b/...cts/src/main/java/no/nav/testnav/libs/data/dollysearchservice/v1/legacy/PersonSearch.java
@@ -0,0 +1,72 @@
+package no.nav.testnav.libs.data.dollysearchservice.v1.legacy;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PersonSearch {
+
+    private Integer page;
+    private Integer pageSize;
+    private String kjoenn;
+    private Integer randomSeed;
+    private Boolean kunLevende;
+    private NasjonalitetSearch nasjonalitet;
+    private AlderSearch alder;
+    private RelasjonSearch relasjoner;
+    private PersonstatusSearch personstatus;
+    private AdresserSearch adresser;
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class AlderSearch {
+
+        private Integer fra;
+        private Integer til;
+    }
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class NasjonalitetSearch {
+
+        private String statsborgerskap;
+    }
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class PersonstatusSearch {
+
+        private String status;
+    }
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class AdresserSearch {
+
+        private Boolean harUtenlandskAdresse;
+        private Boolean harKontaktadresse;
+        private Boolean harOppholdsadresse;
+    }
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class RelasjonSearch {
+
+        private Boolean harBarn;
+    }
+}