Refactor identer query handling and streamline tag processing logic #deploy-test-dolly-search-service

Author: krharum

apps/dolly-search-service/src/main/java/no/nav/testnav/dollysearchservice/service/TagsService.java

@@ -4,7 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.dollysearchservice.consumer.PdlProxyConsumer;
-import no.nav.testnav.dollysearchservice.dto.TagsOpprettingResponse;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -38,10 +37,6 @@ public Mono<String> setDollyTagAlleTestnorgeIdenter() {
                     return l1;
                 })
                 .doOnNext(tags -> log.info("Identer som mangler Dolly-tags: {}", String.join(", ", tags)))
-                .filter(tags -> !tags.isEmpty())
-                .flatMap(pdlProxyConsumer::setTags)
-                .filter(response -> response.getStatus().is2xxSuccessful())
-                .map(TagsOpprettingResponse::getIdenter)
                 .map(resultat -> "Følgende identer mangler DOLLY-tag: %s".formatted(String.join(", ", resultat)))
                 .switchIfEmpty(Mono.just("Fant ingen personer som mangler Dolly-tag"));
     }
@@ -53,4 +48,4 @@ private static List<String> filterTags(Map<String, List<String>> tags) {
                 .map(Map.Entry::getKey)
                 .toList();
     }
-}
+}

apps/dolly-search-service/src/main/java/no/nav/testnav/dollysearchservice/utils/OpenSearchIdenterQueryUtils.java

@@ -62,8 +62,8 @@ private static void addNameQuery(BoolQueryBuilder queryBuilder, IdentSearch sear
                         queryBuilder.must(QueryBuilders.nestedQuery(
                                 "hentPerson.navn",
                                 QueryBuilders.boolQuery()
-                                        .should(regexpQuery(PERSON_FORNAVN, ".*" + values.get(0) + ".*"))
-                                        .should(regexpQuery(PERSON_ETTERNAVN, ".*" + values.get(0) + ".*"))
+                                        .should(regexpQuery(PERSON_FORNAVN, ".*" + values.getFirst() + ".*"))
+                                        .should(regexpQuery(PERSON_ETTERNAVN, ".*" + values.getFirst() + ".*"))
                                         .minimumShouldMatch(1),
                                 ScoreMode.Avg));
 
@@ -85,13 +85,8 @@ private static void addNameQuery(BoolQueryBuilder queryBuilder, IdentSearch sear
 
     public static void addIdenterQuery(BoolQueryBuilder queryBuilder, Set<String> identer) {
 
-        var now = System.currentTimeMillis();
-        var arr = new String[identer.size()];
-
         queryBuilder
-                .must(nestedTermsQuery(HENT_IDENTER, "ident", identer.toArray(arr)));
-
-        log.info("Konvertering av liste til array tok {} ms", System.currentTimeMillis() - now);
+                .must(nestedTermsQuery(HENT_IDENTER, "ident", identer.toArray(String[]::new)));
     }
 
     private static void addIdentQuery(BoolQueryBuilder queryBuilder, IdentSearch search) {