Merge branch 'main' into renovate/node

Author: mamartinezmejia

legacy/src/main/java/ca/bc/gov/app/controller/ClientController.java

@@ -9,6 +9,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import java.util.List;
+import java.util.Optional;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
@@ -54,10 +55,15 @@ public Flux<HistoryLogDto> findHistoryLogsByClientNumber(
              clientNumber);
     return service
         .findHistoryLogsByClientNumber(clientNumber, PageRequest.of(page, size), sources)
-        .doOnNext(pair -> serverResponse.getHeaders()
-            .putIfAbsent("x-total-count", List.of(pair.getValue().toString()))
-        )
-        .map(Pair::getKey);
+        .switchOnFirst((signal, flux) -> {
+          if (signal.hasValue()) {
+            int total = Optional.ofNullable(signal.get()).map(Pair::getValue).orElse(0);
+            serverResponse.getHeaders().add("x-total-count", String.valueOf(total));
+          } else {
+            serverResponse.getHeaders().add("x-total-count", "0");
+          }
+          return flux.map(Pair::getKey);
+        });
   }
 
   @GetMapping("/{clientNumber}/related-clients")

legacy/src/test/java/ca/bc/gov/app/controller/ClientHistoryControllerIntegrationTest.java

@@ -25,6 +25,7 @@ public class ClientHistoryControllerIntegrationTest extends
   void shouldReturnHistoryLogsByClientNumber(
       String clientNumber,
       String expectedClientNumber,
+      boolean expectEmptyWithHeader,
       Class<RuntimeException> exception
   ) {
 
@@ -41,22 +42,37 @@ void shouldReturnHistoryLogsByClientNumber(
     if (StringUtils.isNotBlank(expectedClientNumber)) {
       response
         .expectStatus().isOk()
+        .expectHeader().exists("x-total-count")
+        .expectHeader().value("x-total-count",
+            count -> assertThat(Integer.parseInt(count)).isGreaterThan(0))
         .expectBodyList(HistoryLogDto.class)
         .value(logs -> assertThat(logs).isNotEmpty());
     }
 
+    if (expectEmptyWithHeader) {
+      response
+        .expectStatus().isOk()
+        .expectHeader().exists("x-total-count")
+        .expectHeader().valueEquals("x-total-count", "0")
+        .expectBodyList(HistoryLogDto.class)
+        .value(logs -> assertThat(logs).isEmpty());
+    }
+
     if (exception != null) {
       response.expectStatus().is4xxClientError();
     }
   }
 
   private static Stream<Arguments> byClientNumber() {
     return Stream.of(
-        // Valid case
-        Arguments.of("00000138", "00000138", null),
+        // Valid case: client with history logs
+        Arguments.of("00000138", "00000138", false, null),
+
+        // Valid case: client with no history logs — x-total-count must still be "0"
+        Arguments.of("99999999", null, true, null),
 
         // Invalid case: missing client number
-        Arguments.of(null, null, MissingRequiredParameterException.class));
+        Arguments.of(null, null, false, MissingRequiredParameterException.class));
   }
 
 }