DIAC-1130 Updating tabs to show detention removal status (#2603)

Author: tonymort

config/owasp/suppressions.xml

@@ -9,5 +9,6 @@
         <cve>CVE-2025-48976</cve>
         <cve>CVE-2025-48988</cve>
         <cve>CVE-2025-46701</cve>
+        <cve>CVE-2024-47554</cve>
     </suppress>
 </suppressions>

src/main/java/uk/gov/hmcts/reform/iacaseapi/domain/entities/AsylumCaseFieldDefinition.java

@@ -1600,7 +1600,7 @@ public enum AsylumCaseFieldDefinition {
     SCHEDULE_OF_ISSUES_AGREEMENT(
         "scheduleOfIssuesAgreement", new TypeReference<YesOrNo>() {}),
 
-   SCHEDULE_OF_ISSUES_DISAGREEMENT_DESCRIPTION(
+    SCHEDULE_OF_ISSUES_DISAGREEMENT_DESCRIPTION(
         "scheduleOfIssuesDisagreementDescription", new TypeReference<String>(){}),
 
     ANONYMITY_ORDER(
@@ -2753,7 +2753,7 @@ public enum AsylumCaseFieldDefinition {
     OOC_ADDRESS_LINE_3(
         "oocAddressLine3", new TypeReference<String>(){}),
 
-   FEE_UPDATE_TRIBUNAL_ACTION(
+    FEE_UPDATE_TRIBUNAL_ACTION(
            "feeUpdateTribunalAction", new TypeReference<FeeTribunalAction>(){}),
 
     AUTOMATIC_REMISSION_REMINDER_LEGAL_REP(
@@ -2829,14 +2829,20 @@ public enum AsylumCaseFieldDefinition {
     GENERATE_LIST_CMR_TASK_REQUESTED(
             "generateListCmrTaskRequested", new TypeReference<YesOrNo>(){}),
 
-      DETENTION_BUILDING(
+    DETENTION_BUILDING(
           "detentionBuilding", new TypeReference<String>(){}),
 
     DETENTION_ADDRESS_LINES(
           "detentionAddressLines", new TypeReference<String>(){}),
 
     DETENTION_POSTCODE(
-          "detentionPostcode", new TypeReference<String>(){})
+          "detentionPostcode", new TypeReference<String>(){}),
+
+    DETENTION_REMOVAL_DATE("detentionRemovalDate",
+            new TypeReference<String>(){}),
+
+    DETENTION_REMOVAL_REASON("detentionRemovalReason",
+            new TypeReference<String>(){}),
     ;
 
     private final String value;

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

@@ -69,6 +69,8 @@ private void clearDetentionRelatedFields(AsylumCase asylumCase) {
         asylumCase.clear(REMOVAL_ORDER_OPTIONS);
         asylumCase.clear(REMOVAL_ORDER_DATE);
         asylumCase.clear(DETENTION_STATUS);
+        asylumCase.clear(DETENTION_REMOVAL_DATE);
+        asylumCase.clear(DETENTION_REMOVAL_REASON);
     }
 
 }

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

@@ -65,6 +65,8 @@ void should_remove_detained_status_for_a_non_ada_detained_case() {
         verify(asylumCase).clear(REMOVAL_ORDER_OPTIONS);
         verify(asylumCase).clear(REMOVAL_ORDER_DATE);
         verify(asylumCase).clear(DETENTION_STATUS);
+        verify(asylumCase).clear(DETENTION_REMOVAL_DATE);
+        verify(asylumCase).clear(DETENTION_REMOVAL_REASON);
     }
 
     @Test
@@ -92,6 +94,8 @@ void should_not_clear_detention_fields_for_a_non_detained_case() {
         verify(asylumCase, never()).clear(REMOVAL_ORDER_OPTIONS);
         verify(asylumCase, never()).clear(REMOVAL_ORDER_DATE);
         verify(asylumCase, never()).clear(DETENTION_STATUS);
+        verify(asylumCase, never()).clear(DETENTION_REMOVAL_DATE);
+        verify(asylumCase, never()).clear(DETENTION_REMOVAL_REASON);
     }
 
     @Test