DIAC-1115 Supporting bail number validation when marking appeal as detained

Author: tonymort

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

@@ -4,6 +4,7 @@
 import static uk.gov.hmcts.reform.iacaseapi.domain.entities.AsylumCaseFieldDefinition.*;
 
 import java.util.Optional;
+import java.util.Set;
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.iacaseapi.domain.entities.AsylumCase;
 import uk.gov.hmcts.reform.iacaseapi.domain.entities.ccd.Event;
@@ -17,6 +18,9 @@
 @Service
 public class BailApplicationNumberHandler implements PreSubmitCallbackHandler<AsylumCase> {
 
+    private static final Set<String> DETENTION_FACILITY_PAGE_IDS = Set.of(
+          "hasPendingBailApplications", "markAppealAsDetained_appellantBailApplication");
+
     @Override
     public DispatchPriority getDispatchPriority() {
         return DispatchPriority.EARLIEST;
@@ -34,7 +38,7 @@ public boolean canHandle(
                || callback.getEvent() == Event.EDIT_APPEAL
                || callback.getEvent() == Event.EDIT_APPEAL_AFTER_SUBMIT
                || callback.getEvent() == Event.MARK_APPEAL_AS_DETAINED)
-               && callback.getPageId().equals(HAS_PENDING_BAIL_APPLICATIONS.value());
+               && DETENTION_FACILITY_PAGE_IDS.contains(callback.getPageId());
     }
 
     public PreSubmitCallbackResponse<AsylumCase> handle(

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

@@ -28,9 +28,9 @@ public boolean canHandle(
         requireNonNull(callback, "callback must not be null");
 
         return callbackStage == PreSubmitCallbackStage.ABOUT_TO_SUBMIT
-               && (callback.getEvent() == Event.START_APPEAL
-               || callback.getEvent() == Event.EDIT_APPEAL
-               || callback.getEvent() == Event.MARK_APPEAL_AS_DETAINED);
+                && (callback.getEvent() == Event.START_APPEAL
+                || callback.getEvent() == Event.EDIT_APPEAL
+                || callback.getEvent() == Event.MARK_APPEAL_AS_DETAINED);
     }
 
     @Override
@@ -60,7 +60,8 @@ public PreSubmitCallbackResponse<AsylumCase> handle(
             }
         }
 
-        if (callback.getEvent().equals(Event.MARK_APPEAL_AS_DETAINED)) {
+        Optional<YesOrNo> isAcceleratedDetainedAppeal = asylumCase.read(IS_ACCELERATED_DETAINED_APPEAL, YesOrNo.class);
+        if (callback.getEvent().equals(Event.MARK_APPEAL_AS_DETAINED) && isAcceleratedDetainedAppeal.isPresent()) {
             asylumCase.write(DETENTION_STATUS, DetentionStatus.DETAINED);
         }
 

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

@@ -6,6 +6,8 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static uk.gov.hmcts.reform.iacaseapi.domain.entities.AsylumCaseFieldDefinition.IS_ACCELERATED_DETAINED_APPEAL;
+import static uk.gov.hmcts.reform.iacaseapi.domain.entities.ccd.field.YesOrNo.*;
 
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -42,8 +44,8 @@ void should_write_detention_status_to_accelerated() {
         when(callback.getCaseDetails()).thenReturn(caseDetails);
         when(caseDetails.getCaseData()).thenReturn(asylumCase);
         when(callback.getEvent()).thenReturn(Event.START_APPEAL);
-        when(asylumCase.read(AsylumCaseFieldDefinition.APPELLANT_IN_DETENTION, YesOrNo.class)).thenReturn(Optional.of(YesOrNo.YES));
-        when(asylumCase.read(AsylumCaseFieldDefinition.IS_ACCELERATED_DETAINED_APPEAL, YesOrNo.class)).thenReturn(Optional.of(YesOrNo.YES));
+        when(asylumCase.read(AsylumCaseFieldDefinition.APPELLANT_IN_DETENTION, YesOrNo.class)).thenReturn(Optional.of(YES));
+        when(asylumCase.read(AsylumCaseFieldDefinition.IS_ACCELERATED_DETAINED_APPEAL, YesOrNo.class)).thenReturn(Optional.of(YES));
 
         detentionStatusHandler.handle(PreSubmitCallbackStage.ABOUT_TO_SUBMIT, callback);
 
@@ -57,8 +59,8 @@ void should_write_detention_status_to_detained() {
         when(callback.getCaseDetails()).thenReturn(caseDetails);
         when(caseDetails.getCaseData()).thenReturn(asylumCase);
         when(callback.getEvent()).thenReturn(Event.START_APPEAL);
-        when(asylumCase.read(AsylumCaseFieldDefinition.APPELLANT_IN_DETENTION, YesOrNo.class)).thenReturn(Optional.of(YesOrNo.YES));
-        when(asylumCase.read(AsylumCaseFieldDefinition.IS_ACCELERATED_DETAINED_APPEAL, YesOrNo.class)).thenReturn(Optional.of(YesOrNo.NO));
+        when(asylumCase.read(AsylumCaseFieldDefinition.APPELLANT_IN_DETENTION, YesOrNo.class)).thenReturn(Optional.of(YES));
+        when(asylumCase.read(AsylumCaseFieldDefinition.IS_ACCELERATED_DETAINED_APPEAL, YesOrNo.class)).thenReturn(Optional.of(NO));
 
         detentionStatusHandler.handle(PreSubmitCallbackStage.ABOUT_TO_SUBMIT, callback);
 
@@ -72,6 +74,7 @@ void should_mark_appeal_as_detained() {
         when(callback.getCaseDetails()).thenReturn(caseDetails);
         when(caseDetails.getCaseData()).thenReturn(asylumCase);
         when(callback.getEvent()).thenReturn(Event.MARK_APPEAL_AS_DETAINED);
+        when(asylumCase.read(IS_ACCELERATED_DETAINED_APPEAL, YesOrNo.class)).thenReturn(Optional.of(YES));
 
         detentionStatusHandler.handle(PreSubmitCallbackStage.ABOUT_TO_SUBMIT, callback);