SSCS-12031 - Add 'Hearing date issued' column to case list for all us…

…er types (#577) * SSCS-12031 - Hearing date issued setting on update / create hearing * SSCS-12031 - Update common build * SSCS-12031 - Update common build * SSCS-12031 - Update tests and checkstyle * SSCS-12031 - Update test * SSCS-12031 - Update import * Update build.gradle * SSCS-12031 - Updates to hearing date issued, use string. * Fix imports * Fix imports * Fix coverage * SSCS-12031 - Update date * SSCS-12031 - small update where issued date is already present. * Update * Update build.gradle --------- Co-authored-by: DGordonV1 <david.gordon@hmcts.net>
hmcts · Mar 19, 2024 · ff4fe4a · ff4fe4a
1 parent b81dc2c
commit ff4fe4a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -339,8 +339,7 @@ dependencies {
   implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.10'
   implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.10'
 
-  implementation group: 'com.github.hmcts', name: 'sscs-common', version: '5.3.6'
-
+  implementation group: 'com.github.hmcts', name: 'sscs-common', version: '5.3.9'
   implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
 
   implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.15.2'

diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/HearingUpdateService.java b/src/main/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/HearingUpdateService.java
@@ -153,10 +153,24 @@ public void setWorkBasketFields(String hearingId, @Valid SscsCaseData sscsCaseDa
         if (isCaseListed(listAssistCaseStatus)) {
             LocalDate hearingDate = getHearingDate(hearingId, sscsCaseData);
             workBasketFields.setHearingDate(hearingDate);
+
+            if (isNull(workBasketFields.getHearingDateIssued())) {
+                LocalDateTime hearingDateIssuedTime = LocalDateTime.now();
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+                String hearingDateIssued = hearingDateIssuedTime.format(formatter);
+                log.debug(
+                    "Setting workBasketField hearingDateIssued {} for case id reference {}",
+                    hearingDateIssued,
+                    sscsCaseData.getCcdCaseId()
+                );
+                workBasketFields.setHearingDateIssued(hearingDateIssued);
+            }
+
             String epimsId = getHearingEpimsId(hearingId, sscsCaseData);
             workBasketFields.setHearingEpimsId(epimsId);
         } else {
             workBasketFields.setHearingDate(null);
+            workBasketFields.setHearingDateIssued(null);
             workBasketFields.setHearingEpimsId(null);
         }
     }

diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/HearingUpdateServiceTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/HearingUpdateServiceTest.java
@@ -59,6 +59,7 @@ class HearingUpdateServiceTest {
     private static final String VENUE_NAME = "VenueName";
     private static final String JUDGE_ID = "1";
     private static final List<String> PANEL_IDS = List.of("2", "3");
+    private static final String HEARING_TIME_STR = "10:00:00";
 
     private VenueDetails venueDetails;
     private SscsCaseData caseData;
@@ -321,6 +322,7 @@ void testSetWorkBasketFields() {
                 .value(HearingDetails.builder()
                     .hearingId(String.valueOf(HEARING_ID))
                     .start(zoneUtcStartDateTime)
+                    .time(HEARING_TIME_STR)
                     .epimsId(EPIMS_ID)
                     .build())
                 .build()));
@@ -339,13 +341,14 @@ void testSetWorkBasketFieldsEpims() {
                 .value(HearingDetails.builder()
                     .hearingId(String.valueOf(HEARING_ID))
                     .epimsId(EPIMS_ID)
+                    .start(zoneUtcStartDateTime)
+                    .time(HEARING_TIME_STR)
                     .build())
                 .build()));
 
         hearingUpdateService.setWorkBasketFields(String.valueOf(HEARING_ID), caseData, LISTED);
 
         assertThat(caseData.getWorkBasketFields().getHearingEpimsId()).isEqualTo(EPIMS_ID);
-        assertThat(caseData.getWorkBasketFields().getHearingDate()).isNull();
     }
 
 
@@ -357,6 +360,7 @@ void testSetWorkBasketFieldsStartDate() {
                 .value(HearingDetails.builder()
                     .hearingId(String.valueOf(HEARING_ID))
                     .start(zoneUtcStartDateTime)
+                    .time(HEARING_TIME_STR)
                     .build())
                 .build()));
 
@@ -383,6 +387,27 @@ void testSetWorkBasketFieldsInvalidStatus() {
         assertThat(caseData.getWorkBasketFields().getHearingEpimsId()).isNull();
     }
 
+    @DisplayName("When a HmcStatus with a listing and the hearing has a valid start date, setWorkBasketFields updates hearing date issued to the correct date")
+    @Test
+    void testSetWorkBasketFieldsForHearingDateIssued() {
+        caseData.setHearings(Lists.newArrayList(
+            Hearing.builder()
+                .value(HearingDetails.builder()
+                           .hearingId(String.valueOf(HEARING_ID))
+                           .start(zoneUtcStartDateTime)
+                           .time(HEARING_TIME_STR)
+                           .epimsId(EPIMS_ID)
+                           .build())
+                .build()));
+
+        hearingUpdateService.setWorkBasketFields(String.valueOf(HEARING_ID), caseData, LISTED);
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        String expectedHearingDateIssued = zoneUtcStartDateTime.format(formatter);
+
+        assertThat(caseData.getWorkBasketFields().getHearingDateIssued()).isEqualTo(expectedHearingDateIssued);
+    }
+
     @DisplayName("When a hearing with a valid start is given, getHearingDate returns the correct date")
     @Test
     void testGetHearingDate() {