Rename PdlDataConsumer to PdlProxyConsumer and update references; enhance search functionality #deploy-dolly-search-service #deploy-test-dolly-search-service

Author: krharum

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

@@ -1,29 +1,35 @@
 package no.nav.testnav.dollysearchservice.consumer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.dollysearchservice.config.Consumers;
+import no.nav.testnav.dollysearchservice.consumer.command.OpenSearchCommand;
 import no.nav.testnav.dollysearchservice.consumer.command.TagsGetCommand;
 import no.nav.testnav.dollysearchservice.consumer.command.TagsPostCommand;
+import no.nav.testnav.dollysearchservice.dto.SearchRequest;
+import no.nav.testnav.dollysearchservice.dto.SearchResponse;
 import no.nav.testnav.dollysearchservice.dto.TagsOpprettingResponse;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
 import java.util.Map;
 
 import static no.nav.testnav.dollysearchservice.consumer.utils.JacksonExchangeStrategyUtil.getJacksonStrategy;
 
+@Slf4j
 @Service
-public class PdlDataConsumer {
+public class PdlProxyConsumer {
 
     private final WebClient webClient;
     private final TokenExchange tokenExchange;
     private final ServerProperties serverProperties;
 
-    public PdlDataConsumer(
+    public PdlProxyConsumer(
             TokenExchange tokenExchange,
             Consumers consumers,
             ObjectMapper objectMapper,
@@ -37,6 +43,17 @@ public PdlDataConsumer(
         this.tokenExchange = tokenExchange;
     }
 
+    public Flux<SearchResponse> search(SearchRequest request) {
+        return tokenExchange.exchange(serverProperties)
+                .flatMapMany(token ->
+                        new OpenSearchCommand(webClient, request.getQuery().indices()[0],
+                                token.getTokenValue(), request.getQuery().source().toString()).call())
+                .map(response -> {
+                    response.setRequest(request.getRequest());
+                    return response;
+                });
+    }
+
     public Mono<Map<String, List<String>>> getTags(List<String> identer) {
 
         return tokenExchange.exchange(serverProperties)
@@ -48,4 +65,4 @@ public Mono<TagsOpprettingResponse> setTags(List<String> identer) {
         return tokenExchange.exchange(serverProperties)
                 .flatMap(token -> new TagsPostCommand(webClient, identer, token.getTokenValue()).call());
     }
-}
+}

apps/dolly-search-service/src/main/java/no/nav/testnav/dollysearchservice/consumer/PdlDataConsumer.java apps/dolly-search-service/src/main/java/no/nav/testnav/dollysearchservice/consumer/PdlProxyConsumer.java

@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.dollysearchservice.consumer.OpenSearchConsumer;
+import no.nav.testnav.dollysearchservice.consumer.PdlProxyConsumer;
 import no.nav.testnav.dollysearchservice.dto.SearchInternalResponse;
 import no.nav.testnav.dollysearchservice.dto.SearchRequest;
 import org.opensearch.common.unit.TimeValue;
@@ -24,7 +24,7 @@
 @RequiredArgsConstructor
 public class OpenSearchQueryService {
 
-    private final OpenSearchConsumer openSearchConsumer;
+    private final PdlProxyConsumer pdlProxyConsumer;
     private final ObjectMapper objectMapper;
 
     @Value("${open.search.pdl-index}")
@@ -42,7 +42,7 @@ public Mono<SearchInternalResponse> execQuery(SearchRequest request, QueryBuilde
             request.setAntall(10);
         }
 
-        var personSoekResponse = Mono.from(openSearchConsumer.search(
+        var personSoekResponse = Mono.from(pdlProxyConsumer.search(
                         no.nav.testnav.dollysearchservice.dto.SearchRequest.builder()
                                 .query(
                                         new org.opensearch.action.search.SearchRequest()

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

@@ -3,7 +3,7 @@
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.dollysearchservice.consumer.PdlDataConsumer;
+import no.nav.testnav.dollysearchservice.consumer.PdlProxyConsumer;
 import no.nav.testnav.dollysearchservice.dto.TagsOpprettingResponse;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -21,26 +21,28 @@ public class TagsService {
     private static final int BOLK_SIZE = 500;
 
     private final BestillingQueryService bestillingQueryService;
-    private final PdlDataConsumer pdlDataConsumer;
+    private final PdlProxyConsumer pdlProxyConsumer;
 
     public Mono<String> setDollyTagAlleTestnorgeIdenter() {
 
         var identer = bestillingQueryService.execTestnorgeIdenterQuery();
+        log.info("Hentet alle testnorge identer: {}", identer.size());
         var bolker = Lists.partition(identer.stream().toList(), BOLK_SIZE);
+        log.info("Antall bolker: {}", bolker.size());
 
         return Flux.fromIterable(bolker)
-                .flatMap(pdlDataConsumer::getTags)
+                .flatMap(pdlProxyConsumer::getTags)
                 .map(TagsService::filterTags)
                 .reduce(new ArrayList<String>(), (l1, l2) -> {
                     l1.addAll(l2);
                     return l1;
                 })
                 .doOnNext(tags -> log.info("Identer som mangler Dolly-tags: {}", String.join(", ", tags)))
-                .filter(tags -> !tags.isEmpty())
-                .flatMap(pdlDataConsumer::setTags)
-                .filter(response -> response.getStatus().is2xxSuccessful())
-                .map(TagsOpprettingResponse::getIdenter)
-                .map(resultat -> "Lagt til DOLLY-tag på %s".formatted(String.join(", ", resultat)))
+//                .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"));
     }