Skip to content

DTSCCI-3642 Email incorrectly sent after a caseworker approves a claims discontinuance #7669

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

Closed
mounikahmcts wants to merge 2 commits into from
+25 −2
Closed

DTSCCI-3642 Email incorrectly sent after a caseworker approves a claims discontinuance #7669

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
0fdb06c
update
mounikahmcts Mar 27, 2026
c6b3374
Merge branch 'master' into DTSCCI-3642
mounikahmcts Mar 30, 2026
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
9 changes: 7 additions & 2 deletions ...tinueclaimparties/DiscontinueClaimPartiesValidationFailureAppSolOneEmailDTOGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ protected Map<String, String> addCustomProperties(Map<String, String> properties

@Override
public Boolean getShouldNotify(CaseData caseData) {
return Boolean.TRUE.equals(super.getShouldNotify(caseData))
&& !ConfirmOrderGivesPermission.YES.equals(caseData.getConfirmOrderGivesPermission());
if (!Boolean.TRUE.equals(super.getShouldNotify(caseData))) {
return false;
}

ConfirmOrderGivesPermission confirmOrderGivesPermission = caseData.getConfirmOrderGivesPermission();
return confirmOrderGivesPermission != null
&& !ConfirmOrderGivesPermission.YES.equals(confirmOrderGivesPermission);
}
}
18 changes: 18 additions & 0 deletions ...eclaimparties/DiscontinueClaimPartiesValidationFailureAppSolOneEmailDTOGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.mockito.MockedStatic;
import org.mockito.MockitoAnnotations;
import uk.gov.hmcts.reform.civil.enums.settlediscontinue.ConfirmOrderGivesPermission;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;
import uk.gov.hmcts.reform.civil.model.CaseData;
import uk.gov.hmcts.reform.civil.notify.NotificationsProperties;
import uk.gov.hmcts.reform.civil.service.OrganisationService;
Expand Down Expand Up @@ -97,4 +98,21 @@ void shouldNotifyReturnTrue_whenConfirmOrderGivesPermissionNotYes() {

assertThat(generator.getShouldNotify(caseData)).isTrue();
}

@Test
void shouldNotifyReturnFalse_whenConfirmOrderGivesPermissionIsNull() {
CaseData caseData = CaseData.builder().build();

assertThat(generator.getShouldNotify(caseData)).isFalse();
}

@Test
void shouldNotifyReturnFalse_whenApplicantIsLipEvenIfPermissionIsNo() {
CaseData caseData = CaseData.builder()
.applicant1Represented(YesOrNo.NO)
.confirmOrderGivesPermission(ConfirmOrderGivesPermission.NO)
.build();

assertThat(generator.getShouldNotify(caseData)).isFalse();
}
}
Loading