DIAC 1896 - TEST

charts/ia-case-api/values.preview.template.yaml

@@ -520,7 +520,7 @@ ia-home-office-integration-api:
   enabled: true #set to true if testing against a local branch
   java:
     imagePullPolicy: Always
-    image: hmctspublic.azurecr.io/ia/home-office-integration-api:latest
+    image: hmctspublic.azurecr.io/ia/home-office-integration-api:pr-442
     releaseNameOverride: ${SERVICE_NAME}-home-office-integration-api
     ingressHost: ${SERVICE_NAME}-home-office-integration-api.preview.platform.hmcts.net
     devcpuRequests: 500m

src/main/java/uk/gov/hmcts/reform/iacaseapi/domain/handlers/presubmit/statutorytimeframe24weeks/UpdateStatutoryTimeframe24WeeksService.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.reform.iacaseapi.domain.handlers.presubmit.statutorytimeframe24weeks;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.iacaseapi.domain.DateProvider;
 import uk.gov.hmcts.reform.iacaseapi.domain.entities.AsylumCase;
@@ -21,9 +22,12 @@
 import static uk.gov.hmcts.reform.iacaseapi.domain.entities.AsylumCaseFieldDefinition.STATUTORY_TIMEFRAME_24_WEEKS;
 import static uk.gov.hmcts.reform.iacaseapi.domain.entities.AsylumCaseFieldDefinition.STATUTORY_TIMEFRAME_24_WEEKS_REASON;
 
+@Slf4j
 @Service
 public class UpdateStatutoryTimeframe24WeeksService {
 
+    public static final String HOME_OFFICE_INITIAL_DETERMINATION = "Home Office initial determination";
+
     private final Appender<StatutoryTimeframe24WeeksHistory> statutoryTimeframe24WeeksHistoryAppender;
     private final Appender<CaseNote> caseNoteAppender;
     private final DateProvider dateProvider;
@@ -49,7 +53,8 @@ public AsylumCase updateAsylumCase(AsylumCase asylumCase, YesOrNo statutoryTimef
         Optional<StatutoryTimeframe24Weeks> maybeExistingStatutoryTimeframe24Weeks =
             asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS);
 
-        if (maybeExistingStatutoryTimeframe24Weeks.isPresent() && maybeExistingStatutoryTimeframe24Weeks.get().getCurrentStatusAutoGenerated() == statutoryTimeframe24WeeksStatus) {
+        if (maybeExistingStatutoryTimeframe24Weeks.isPresent() && maybeExistingStatutoryTimeframe24Weeks.get().getCurrentStatusAutoGenerated() == statutoryTimeframe24WeeksStatus 
+            && !statutoryTimeframe24WeeksReason.contains(HOME_OFFICE_INITIAL_DETERMINATION)) {
             throw new IllegalStateException("The current status is already set to " + statutoryTimeframe24WeeksStatus);
         }
 
@@ -58,16 +63,20 @@ public AsylumCase updateAsylumCase(AsylumCase asylumCase, YesOrNo statutoryTimef
         StatutoryTimeframe24Weeks updatedStatutoryTimeframe24Weeks =
             buildNewStatutoryTimeframe24Weeks(statutoryTimeframe24WeeksStatus, statutoryTimeframe24WeeksReason, userDetails, maybeExistingStatutoryTimeframe24Weeks);
 
-        asylumCase.write(STATUTORY_TIMEFRAME_24_WEEKS, updatedStatutoryTimeframe24Weeks);
+        if (!statutoryTimeframe24WeeksReason.contains(HOME_OFFICE_INITIAL_DETERMINATION)) {
+            log.info("Writing STATUTORY_TIMEFRAME_24_WEEKS with status: {}", statutoryTimeframe24WeeksStatus);
+            asylumCase.write(STATUTORY_TIMEFRAME_24_WEEKS, updatedStatutoryTimeframe24Weeks);
+            asylumCase.clear(STATUTORY_TIMEFRAME_24_WEEKS_REASON);
+        } else {
+            log.info("Skipping write of STATUTORY_TIMEFRAME_24_WEEKS for '{}'", HOME_OFFICE_INITIAL_DETERMINATION);
+        }
 
         Optional<List<IdValue<CaseNote>>> maybeExistingCaseNotes = asylumCase.read(CASE_NOTES);
         List<IdValue<CaseNote>> allCaseNotes = caseNoteAppender.append(
             buildNewCaseNote(statutoryTimeframe24WeeksStatus, statutoryTimeframe24WeeksReason, userDetails), maybeExistingCaseNotes.orElse(Collections.emptyList()));
 
         asylumCase.write(CASE_NOTES, allCaseNotes);
 
-        asylumCase.clear(STATUTORY_TIMEFRAME_24_WEEKS_REASON);
-
         return asylumCase;
     }
 

src/main/resources/application.yaml

@@ -1312,6 +1312,7 @@ security:
       - "UpdateNextHearingInfo"
       - "removeCaseManagerBulk"
       - "hearingCancelled"
+      - "addStatutoryTimeframe24Weeks"
     caseworker-ia-internal:
       - "revokeCaseAccess"
       - "removeCaseManagerBulk"

src/test/java/uk/gov/hmcts/reform/iacaseapi/domain/handlers/presubmit/statutorytimeframe24weeks/UpdateStatutoryTimeframe24WeeksServiceTest.java

@@ -28,7 +28,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.anyList;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -201,4 +203,47 @@ void should_throw_when_statutory_timeframe_24_weeks_status_is_already_set_to_no(
             .hasMessage("The current status is already set to " + currentStatus)
             .isExactlyInstanceOf(IllegalStateException.class);
     }
+
+    @Test
+    void should_write_statutory_timeframe_when_reason_does_not_contain_home_office_initial_determination() {
+        when(asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS_REASON, String.class))
+            .thenReturn(Optional.of("Some other reason"));
+        when(asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS)).thenReturn(Optional.empty());
+
+        updateStatutoryTimeframe24WeeksService.updateAsylumCase(asylumCase, YesOrNo.YES);
+
+        verify(asylumCase, times(1)).write(eq(STATUTORY_TIMEFRAME_24_WEEKS), any());
+    }
+
+    @Test
+    void should_skip_write_statutory_timeframe_when_reason_contains_home_office_initial_determination() {
+        when(asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS_REASON, String.class))
+            .thenReturn(Optional.of("Home Office initial determination"));
+        when(asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS)).thenReturn(Optional.empty());
+
+        updateStatutoryTimeframe24WeeksService.updateAsylumCase(asylumCase, YesOrNo.YES);
+
+        verify(asylumCase, never()).write(eq(STATUTORY_TIMEFRAME_24_WEEKS), any());
+    }
+
+    @Test
+    void should_not_throw_when_status_matches_but_reason_contains_home_office_initial_determination() {
+        YesOrNo currentStatus = YesOrNo.YES;
+        StatutoryTimeframe24WeeksHistory statutoryTimeframe24WeeksHistory = 
+            new StatutoryTimeframe24WeeksHistory(currentStatus, "Home Office initial determination", 
+                forename + " " + surname, nowWithTime.toString());
+        List<IdValue<StatutoryTimeframe24WeeksHistory>> existingHistory = 
+            Arrays.asList(new IdValue<>("1", statutoryTimeframe24WeeksHistory));
+        StatutoryTimeframe24Weeks existingStatutoryTimeframe24Weeks = 
+            new StatutoryTimeframe24Weeks(currentStatus, existingHistory);
+
+        when(asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS)).thenReturn(Optional.of(existingStatutoryTimeframe24Weeks));
+        when(asylumCase.read(STATUTORY_TIMEFRAME_24_WEEKS_REASON, String.class))
+            .thenReturn(Optional.of("Home Office initial determination"));
+
+        // Should NOT throw even though status matches
+        updateStatutoryTimeframe24WeeksService.updateAsylumCase(asylumCase, currentStatus);
+
+        verify(asylumCase, never()).write(eq(STATUTORY_TIMEFRAME_24_WEEKS), any());
+    }
 }