fix(ccsph2n): court-calendar courtscheduler search — de-duplicate per day & exclude drafts [SPRDT-1164]

listing-common/src/main/java/uk/gov/moj/cpp/listing/common/service/CourtSchedulerServiceAdapter.java

@@ -58,6 +58,7 @@ public class CourtSchedulerServiceAdapter {
     public static final String COURT_SESSION = "courtSession";
     public static final String BUSINESS_TYPE = "businessType";
     public static final String JURISDICTION = "jurisdiction";
+    public static final String STATUS = "status";
     public static final String PANEL_ADULT_YOUTH = "ADULT,YOUTH";
     private static final String PANEL = "panel";
     public static final String HEARING_ID = "hearingId";
@@ -438,6 +439,7 @@ public HearingIdsResponse getCourtSchedulerHearings(final String ouCode,
                                                         final String endDate, final Optional<Instant> exactHearingStartDateTime,
                                                         final Optional<String> businessTypeOptional,
                                                         final Optional<String> jurisdiction,
+                                                        final String status,
                                                         final String panel, final Integer pageSize, final Integer pageNumber
     ) {
         final Map<String, String> queryParams = new HashMap<>();
@@ -452,6 +454,11 @@ public HearingIdsResponse getCourtSchedulerHearings(final String ouCode,
         businessTypeOptional.ifPresent(businessType -> queryParams.put(BUSINESS_TYPE, businessType));
         jurisdiction.ifPresent(j -> queryParams.put(JURISDICTION, j));
         exactHearingStartDateTime.ifPresent(s -> queryParams.put(EXACT_HEARING_START_DATETIME, s.toString()));
+        // Draft (unallocated) court-schedule sessions are excluded at source when status="FINAL" is
+        // supplied; a null status leaves the courtscheduler result unfiltered (returns ALL).
+        if (status != null) {
+            queryParams.put(STATUS, status);
+        }
 
         final Response hearingsResponse = getCourtSchedulerHearingIds(queryParams);
 

listing-common/src/test/java/uk/gov/moj/cpp/listing/common/service/CourtSchedulerServiceAdapterTest.java

@@ -8,6 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static uk.gov.moj.cpp.listing.common.utils.FileUtil.givenPayload;
 
@@ -19,6 +20,7 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.IntStream;
@@ -31,6 +33,7 @@
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
@@ -216,13 +219,63 @@ void shouldGetHearingIds() {
         when(response.getEntity()).thenReturn(hearingIdsResponse);
         when(hearingSlotsService.getCourtSchedulerHearingIds(anyMap())).thenReturn(response);
 
-        final HearingIdsResponse finalResp = courtSchedulerServiceAdapter.getCourtSchedulerHearings(courtCentreId, courtSessionOptional, courtRoomId, startDate, endDate, Optional.of(Instant.now()), businessTypeOptional, Optional.of("MAGISTRATES"), "ADULT,YOUTH", pageSize, pageNumber);
+        final HearingIdsResponse finalResp = courtSchedulerServiceAdapter.getCourtSchedulerHearings(courtCentreId, courtSessionOptional, courtRoomId, startDate, endDate, Optional.of(Instant.now()), businessTypeOptional, Optional.of("MAGISTRATES"), "FINAL", "ADULT,YOUTH", pageSize, pageNumber);
 
         assertThat(finalResp.getUuids().size(), is(4));
         assertThat(finalResp.getPageCount(), is(1L));
         assertThat(finalResp.getResults(), is(4L));
     }
 
+    @Test
+    void getCourtSchedulerHearingsShouldAddStatusFinalToQueryParamsWhenStatusIsFinal() {
+        final String courtCentreId = UUID.randomUUID().toString();
+        final Optional<String> courtSessionOptional = Optional.of("AD");
+        final String courtRoomId = UUID.randomUUID().toString();
+        final String startDate = LocalDate.now().toString();
+        final String endDate = LocalDate.now().plusDays(7).toString();
+        final Optional<String> businessTypeOptional = Optional.of("BA123");
+        final Integer pageSize = 50;
+        final Integer pageNumber = 1;
+
+        final JsonObject hearingIdsResponse = givenPayload("/mock-data/azure.rotasl.getHearingIds.stub-data.json");
+
+        when(response.getStatus()).thenReturn(HttpStatus.SC_OK);
+        when(response.getEntity()).thenReturn(hearingIdsResponse);
+        when(hearingSlotsService.getCourtSchedulerHearingIds(anyMap())).thenReturn(response);
+
+        courtSchedulerServiceAdapter.getCourtSchedulerHearings(courtCentreId, courtSessionOptional, courtRoomId, startDate, endDate, Optional.of(Instant.now()), businessTypeOptional, Optional.of("MAGISTRATES"), "FINAL", "ADULT,YOUTH", pageSize, pageNumber);
+
+        final ArgumentCaptor<Map<String, String>> queryParamsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(hearingSlotsService).getCourtSchedulerHearingIds(queryParamsCaptor.capture());
+
+        assertThat(queryParamsCaptor.getValue().get("status"), is("FINAL"));
+    }
+
+    @Test
+    void getCourtSchedulerHearingsShouldOmitStatusFromQueryParamsWhenStatusIsNull() {
+        final String courtCentreId = UUID.randomUUID().toString();
+        final Optional<String> courtSessionOptional = Optional.of("AD");
+        final String courtRoomId = UUID.randomUUID().toString();
+        final String startDate = LocalDate.now().toString();
+        final String endDate = LocalDate.now().plusDays(7).toString();
+        final Optional<String> businessTypeOptional = Optional.of("BA123");
+        final Integer pageSize = 50;
+        final Integer pageNumber = 1;
+
+        final JsonObject hearingIdsResponse = givenPayload("/mock-data/azure.rotasl.getHearingIds.stub-data.json");
+
+        when(response.getStatus()).thenReturn(HttpStatus.SC_OK);
+        when(response.getEntity()).thenReturn(hearingIdsResponse);
+        when(hearingSlotsService.getCourtSchedulerHearingIds(anyMap())).thenReturn(response);
+
+        courtSchedulerServiceAdapter.getCourtSchedulerHearings(courtCentreId, courtSessionOptional, courtRoomId, startDate, endDate, Optional.of(Instant.now()), businessTypeOptional, Optional.of("MAGISTRATES"), null, "ADULT,YOUTH", pageSize, pageNumber);
+
+        final ArgumentCaptor<Map<String, String>> queryParamsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(hearingSlotsService).getCourtSchedulerHearingIds(queryParamsCaptor.capture());
+
+        assertFalse(queryParamsCaptor.getValue().containsKey("status"));
+    }
+
     @Test
     void shouldValidateSessionAvailability() {
         final JsonObject validateResponse = givenPayload("/mock-data/azure.rotasl.getHearingSlots.stub-data.json");