Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rajeshthuraiyur merged 2 commits into from
Jun 5, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f8d78
DIAC-1115 Supporting bail number validation when marking appeal as de…
tonymort Jun 3, 2025
80b95b5
Bumping chart version/ fixing aliases
hmcts-jenkins-d-to-i[bot] Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/ia-case-api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: ia-case-api
home: https://github.com/hmcts/ia-case-api
version: 0.0.64
version: 0.0.65
description: Immigration & Asylum Case API
maintainers:
- name: HMCTS Immigration & Asylum Team
Expand Down
6 changes: 5 additions & 1 deletion ...uk/gov/hmcts/reform/iacaseapi/domain/handlers/presubmit/BailApplicationNumberHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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(
Expand Down
9 changes: 5 additions & 4 deletions .../java/uk/gov/hmcts/reform/iacaseapi/domain/handlers/presubmit/DetentionStatusHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}

Expand Down
11 changes: 7 additions & 4 deletions ...a/uk/gov/hmcts/reform/iacaseapi/domain/handlers/presubmit/DetentionStatusHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand Down