fix(FSADT1-1650): fixing order of query (#273)

Co-authored-by: Maria Martinez <maria.martinez@gov.bc.ca>

Author: paulushcgcj

src/main/java/ca/bc/gov/api/oracle/legacy/controller/ClientSearchController.java

@@ -126,11 +126,11 @@ public Flux<ClientPublicViewDto> searchClients(
    * @param acronym the acronym of the client to search for (optional).
    * @param number the unique number of the client to search for (optional).
    * @param serverResponse the {@link ServerHttpResponse} to include response headers.
-   * @return a reactive stream of {@link ClientPublicViewDto} objects representing matching 
-   * clients.
+   * @return a reactive stream of {@link ClientPublicViewDto} objects representing matching
+   *         clients.
    *
-   * @apiNote This method provides a paginated, fuzzy search for client details. Results 
-   * include a total record count in the response headers under {@code X-Total-Count}.
+   * @apiNote This method provides a paginated, fuzzy search for client details. Results
+   *          include a total record count in the response headers under {@code X-Total-Count}.
    */
   @GetMapping("/by")
   @Operation(
@@ -163,24 +163,28 @@ public Flux<ClientPublicViewDto> searchClients(
       }
   )
   public Flux<ClientPublicViewDto> searchByAcronymNameNumber(
-      @Parameter(description = "The one index page number, defaults to 0", example = "0")
+      @Parameter(description = "The one index page number, defaults to 0", 
+                 example = "0")
       @RequestParam(value = "page", required = false, defaultValue = "0")
       Integer page,
 
       @Parameter(description = "The amount of data to be returned per page, defaults to 10",
-          example = "10")
+                 example = "10")
       @RequestParam(value = "size", required = false, defaultValue = "10")
       Integer size,
 
-      @Parameter(description = "The name of the client you're searching", example = "Western Forest Products")
+      @Parameter(description = "The name of the client you're searching", 
+                 example = "Western Forest Products")
       @RequestParam(value = "name", required = false)
       String name,
 
-      @Parameter(description = "The acronym of the client you're searching", example = "WFPS")
+      @Parameter(description = "The acronym of the client you're searching", 
+                 example = "WFPS")
       @RequestParam(value = "acronym", required = false)
       String acronym,
 
-      @Parameter(description = "The number of the client you're searching", example = "00000001")
+      @Parameter(description = "The number of the client you're searching", 
+                 example = "00000001")
       @RequestParam(value = "number", required = false)
       String number,
 
@@ -190,7 +194,7 @@ public Flux<ClientPublicViewDto> searchByAcronymNameNumber(
     log.info("Searching for clients with name {}, acronym {}, number {}", name, acronym, number);
     return
         clientSearchService
-            .searchByAcronymNameNumber(name, acronym, number)
+            .searchByAcronymNameNumber(name, acronym, number, page, size)
             .flatMapMany(criteria -> clientSearchService.searchClientByQuery(criteria, page, size))
             .doOnNext(client -> log.info("Found client with id {}", client.getClientNumber()))
             .doOnNext(dto -> serverResponse.getHeaders()

src/main/java/ca/bc/gov/api/oracle/legacy/dto/SearchNumberScoreProjection.java

@@ -0,0 +1,6 @@
+package ca.bc.gov.api.oracle.legacy.dto;
+
+public interface SearchNumberScoreProjection {
+  String getClientNumber();
+  Integer getScore();
+}

src/main/java/ca/bc/gov/api/oracle/legacy/repository/ForestClientRepository.java

@@ -1,5 +1,6 @@
 package ca.bc.gov.api.oracle.legacy.repository;
 
+import ca.bc.gov.api.oracle.legacy.dto.SearchNumberScoreProjection;
 import ca.bc.gov.api.oracle.legacy.entity.ForestClientEntity;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.r2dbc.repository.Query;
@@ -30,16 +31,23 @@ Mono<Long> countByClientNumberContainingOrClientNameContaining(String clientNumb
 
 	@Query(value = """
     SELECT
-      CLIENT_NUMBER
+      CLIENT_NUMBER,
+      (
+        CASE WHEN CLIENT_ACRONYM = :acronym THEN 800 ELSE 0 END +
+        CASE WHEN CLIENT_NUMBER = :clientNumber THEN 1000 ELSE 0 END +
+        UTL_MATCH.JARO_WINKLER_SIMILARITY(TRIM(COALESCE(LEGAL_FIRST_NAME || ' ', '') || TRIM(COALESCE(LEGAL_MIDDLE_NAME || ' ', '')) || COALESCE(CLIENT_NAME, '')), :clientName)
+      ) AS score
     FROM THE.FOREST_CLIENT
     WHERE
-      UTL_MATCH.JARO_WINKLER_SIMILARITY(CLIENT_NAME, :clientName) >= 80
-      OR UTL_MATCH.JARO_WINKLER_SIMILARITY(LEGAL_FIRST_NAME, :clientName) >= 80
-      OR UTL_MATCH.JARO_WINKLER_SIMILARITY(LEGAL_MIDDLE_NAME, :clientName) >= 80
-      OR UTL_MATCH.JARO_WINKLER_SIMILARITY(TRIM(COALESCE(LEGAL_FIRST_NAME || ' ', '') || TRIM(COALESCE(LEGAL_MIDDLE_NAME || ' ', '')) || COALESCE(CLIENT_NAME, '')), :clientName) >= 80
+      UTL_MATCH.JARO_WINKLER_SIMILARITY(TRIM(COALESCE(LEGAL_FIRST_NAME || ' ', '') || TRIM(COALESCE(LEGAL_MIDDLE_NAME || ' ', '')) || COALESCE(CLIENT_NAME, '')), :clientName) >= 80
       OR CLIENT_ACRONYM = :acronym
       OR CLIENT_NUMBER = :clientNumber
-    ORDER BY CLIENT_NUMBER""")
-	Flux<String> searchNumberByNameAcronymNumber(String clientName, String acronym, String clientNumber);
-
+    ORDER BY score DESC
+    OFFSET :offset ROWS FETCH NEXT :size ROWS ONLY""")
+	Flux<SearchNumberScoreProjection> searchNumberByNameAcronymNumber(
+      String clientName,
+      String acronym,
+      String clientNumber,
+      long offset,
+      int size);
 }

src/main/java/ca/bc/gov/api/oracle/legacy/service/ClientSearchService.java

@@ -3,14 +3,17 @@
 import static org.springframework.data.relational.core.query.Criteria.where;
 
 import ca.bc.gov.api.oracle.legacy.dto.ClientPublicViewDto;
+import ca.bc.gov.api.oracle.legacy.dto.SearchNumberScoreProjection;
 import ca.bc.gov.api.oracle.legacy.entity.ForestClientEntity;
 import ca.bc.gov.api.oracle.legacy.repository.ForestClientRepository;
 import ca.bc.gov.api.oracle.legacy.util.ClientMapper;
+import java.time.Duration;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.data.relational.core.query.Criteria;
@@ -110,41 +113,49 @@ public Flux<ClientPublicViewDto> searchClientByQuery(
   }
 
   /**
-   * Constructs a search {@link Criteria} object based on the provided client name, acronym, or 
-   * number.
-   * This method normalizes input values for case-insensitive searches and validates the client 
-   * number.
+   * Constructs a search {@link Criteria} object based on the provided client name, acronym, or
+   * number. This method normalizes input values for case-insensitive searches and validates the
+   * client number.
    *
-   * @param name the name of the client to search for, or null if not specified.
+   * @param name    the name of the client to search for, or null if not specified.
    * @param acronym the acronym of the client to search for, or null if not specified.
-   * @param number the unique number of the client to search for, or null if not specified.
+   * @param number  the unique number of the client to search for, or null if not specified.
+   * @param size    the number of results to return.
    * @return a {@link Mono} emitting the constructed {@link Criteria} object for the search.
-   *
-   * @implNote Input values are transformed to uppercase for case-insensitivity. The client 
-   * number is validated using {@link #checkClientNumber(String)}. Repository results are 
-   * mapped to a search criteria object.
+   * @implNote Input values are transformed to uppercase for case-insensitivity. The client number
+   * is validated using {@link #checkClientNumber(String)}. Repository results are mapped to a
+   * search criteria object.
    */
-  public Mono<Criteria> searchByAcronymNameNumber(String name, String acronym, String number) {
+  public Mono<Criteria> searchByAcronymNameNumber(
+      String name,
+      String acronym,
+      String number,
+      int page,
+      int size) {
     log.info("Searching for clients with name {}, acronym {} or number {}", name, acronym, number);
 
     String searchName = StringUtils.isNotBlank(name) ? name.toUpperCase() : null;
     String searchAcronym = StringUtils.isNotBlank(acronym) ? acronym.toUpperCase() : null;
     String searchNumber = StringUtils.isNotBlank(number) ? checkClientNumber(number) : null;
+    Pageable pageRequest = PageRequest.of(page, size);
 
     return
-    forestClientRepository
-        .searchNumberByNameAcronymNumber(
-            searchName,
-            searchAcronym,
-            searchNumber
-        )
-        .collectList()
-        .map(this::searchById);
+        forestClientRepository
+            .searchNumberByNameAcronymNumber(
+                searchName,
+                searchAcronym,
+                searchNumber,
+                pageRequest.getOffset(),
+                pageRequest.getPageSize()
+            )
+            .map(SearchNumberScoreProjection::getClientNumber)
+            .collectList()
+            .map(this::searchById);
 
   }
 
   private String checkClientNumber(String clientNumber) {
-    if(StringUtils.isBlank(clientNumber)) {
+    if (StringUtils.isBlank(clientNumber)) {
       return clientNumber;
     }