fix: adding filter to remove dupped values

bcgov · Feb 14, 2023 · a0f3ee5 · a0f3ee5
1 parent bd3e0a0
commit a0f3ee5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/app/dto/orgbook/OrgBookNameDto.java b/backend/src/main/java/ca/bc/gov/app/dto/orgbook/OrgBookNameDto.java
@@ -2,26 +2,16 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
 
-@Schema(name = "NamedResult")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record OrgBookNameDto(
-    @Schema(
-        name = "value",
-        title = "Name of the entity being searched",
-        example = "U3 POWER CORP",
-        requiredMode = Schema.RequiredMode.REQUIRED
-    )
-    String value,
 
-    @Schema(
-        name = "topic_source_id",
-        title = "The incorporation ID",
-        example = "BC0772006",
-        requiredMode = Schema.RequiredMode.REQUIRED
-    )
+    String value,
+    @JsonProperty("sub_type")
+    String subType,
     @JsonProperty("topic_source_id")
-    String topicSourceId
+    String topicSourceId,
+    List<String>names
 ) {
 }
diff --git a/backend/src/main/java/ca/bc/gov/app/service/orgbook/OrgBookApiService.java b/backend/src/main/java/ca/bc/gov/app/service/orgbook/OrgBookApiService.java
@@ -32,14 +32,20 @@ public Flux<ClientNameCodeDto> findByClientName(String clientName) {
                 uriBuilder
                     .path("/v3/search/autocomplete")
                     .queryParam("q", CoreUtil.encodeString(clientName))
+                    .queryParam("inactive", "false")
+                    .queryParam("revoked", "false")
                     .build(new HashMap<>())
             )
             .accept(MediaType.APPLICATION_JSON)
             .exchangeToMono(
                 clientResponse -> clientResponse.bodyToMono(OrgBookResultListResponse.class)
             )
-            .flatMapMany(orgBookResultListResponse -> Flux.fromIterable(orgBookResultListResponse.results()))
-            .map(orgBookNameDto -> new ClientNameCodeDto(orgBookNameDto.topicSourceId(),orgBookNameDto.value()))
+            .log()
+            .flatMapMany(
+                orgBookResultListResponse -> Flux.fromIterable(orgBookResultListResponse.results()))
+            .filter(orgBookNameDto -> orgBookNameDto.subType().equalsIgnoreCase("entity_name"))
+            .map(orgBookNameDto -> new ClientNameCodeDto(orgBookNameDto.topicSourceId(),
+                orgBookNameDto.value()))
             .doOnNext(content -> log.info("OrgBook Name Lookup {} -> {}", clientName, content));
 
   }