Skip to content
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

Jump to bottom

DFR-2980-Mandatory-Postcode-Field #1756

Merged
merged 17 commits into from
Jul 22, 2024
Merged

DFR-2980-Mandatory-Postcode-Field #1756

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
02e7521
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jun 28, 2024
994e3b0
Merge branch 'master' into DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 3, 2024
fee83ad
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 3, 2024
c66209e
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 3, 2024
d974b36
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 3, 2024
7d47657
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 3, 2024
bd46f4b
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 3, 2024
6e5ae41
Merge branch 'master' into DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 11, 2024
33045d2
Merge branch 'master' into DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 15, 2024
82731ba
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 15, 2024
8863921
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 15, 2024
2cfb4bb
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 15, 2024
4c49815
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 15, 2024
d36b561
Merge branch 'master' into DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 22, 2024
b8a78c6
Merge branch 'master' into DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 22, 2024
c1b7732
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 22, 2024
05534ae
DFR-2980-Mandatory-Postcode-Field
dawudgovuk Jul 22, 2024
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
54 changes: 53 additions & 1 deletion ...mcts/reform/finrem/caseorchestration/handler/UpdateContactDetailsContestedMidHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package uk.gov.hmcts.reform.finrem.caseorchestration.handler;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType;
import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse;
Expand All @@ -9,14 +10,24 @@
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper;
import uk.gov.hmcts.reform.finrem.caseorchestration.service.InternationalPostalService;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

@Slf4j
@Service
public class UpdateContactDetailsContestedMidHandler extends FinremCallbackHandler {

private final InternationalPostalService postalService;

private static final String APPLICANT_POSTCODE_ERROR = "Postcode field is required for applicant address.";
private static final String RESPONDENT_POSTCODE_ERROR = "Postcode field is required for respondent address.";
private static final String APPLICANT_SOLICITOR_POSTCODE_ERROR = "Postcode field is required for applicant solicitor address.";
private static final String RESPONDENT_SOLICITOR_POSTCODE_ERROR = "Postcode field is required for respondent solicitor address.";

public UpdateContactDetailsContestedMidHandler(FinremCaseDetailsMapper finremCaseDetailsMapper,
InternationalPostalService postalService) {
super(finremCaseDetailsMapper);
Expand All @@ -38,7 +49,48 @@ public GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle(Finrem
caseDetails.getId());

FinremCaseData caseData = caseDetails.getData();
List<String> errors = new ArrayList<>();
errors.addAll(postalService.validate(caseData));
errors.addAll(validateCaseData(caseData));
return GenericAboutToStartOrSubmitCallbackResponse.<FinremCaseData>builder()
.data(caseData).errors(postalService.validate(caseData)).build();
.data(caseData).errors(errors).build();
}

private List<String> validateCaseData(FinremCaseData caseData) {

List<String> errors = new ArrayList<>();
ContactDetailsWrapper wrapper = caseData.getContactDetailsWrapper();

if (caseData.isApplicantRepresentedByASolicitor()
&& Optional.ofNullable(wrapper.getApplicantSolicitorAddress())
.map(address -> ObjectUtils.isEmpty(address.getPostCode()))
.orElse(false)) {
errors.add(APPLICANT_SOLICITOR_POSTCODE_ERROR);
return errors;
}

if (Optional.ofNullable(wrapper.getApplicantAddress())
.map(address -> ObjectUtils.isEmpty(address.getPostCode()))
.orElse(false)) {
errors.add(APPLICANT_POSTCODE_ERROR);
return errors;
}

if (caseData.isRespondentRepresentedByASolicitor()
&& Optional.ofNullable(wrapper.getRespondentSolicitorAddress())
.map(address -> ObjectUtils.isEmpty(address.getPostCode()))
.orElse(false)) {
errors.add(RESPONDENT_SOLICITOR_POSTCODE_ERROR);
return errors;
}

if (Optional.ofNullable(wrapper.getRespondentAddress())
.map(address -> ObjectUtils.isEmpty(address.getPostCode()))
.orElse(false)) {
errors.add(RESPONDENT_POSTCODE_ERROR);
return errors;
}

return errors;
}
}
197 changes: 195 additions & 2 deletions .../reform/finrem/caseorchestration/handler/UpdateContactDetailsContestedMidHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType;
import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Address;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo;
import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper;
import uk.gov.hmcts.reform.finrem.caseorchestration.service.InternationalPostalService;

import java.util.stream.Stream;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.verify;
import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.MID_EVENT;
import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.SUBMITTED;
Expand Down Expand Up @@ -62,7 +68,194 @@ private FinremCallbackRequest buildCallbackRequest() {
.builder()
.eventType(EventType.UPDATE_CONTACT_DETAILS)
.caseDetails(FinremCaseDetails.builder().id(123L).caseType(CONTESTED)
.data(FinremCaseData.builder().ccdCaseType(CONTESTED).build()).build())
.data(FinremCaseData.builder().ccdCaseType(CONTESTED).contactDetailsWrapper(new ContactDetailsWrapper()).build()).build())
dawudgovuk marked this conversation as resolved.
Show resolved Hide resolved
.build();
}
}

@Test
void givenContestedCase_WhenNotEmptyPostCode_thenHandlerWillShowNoErrorMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setRespondentAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.NO);
data.getContactDetailsWrapper().setContestedRespondentRepresented(YesOrNo.NO);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);
assertEquals(0, handle.getErrors().size());
}

dawudgovuk marked this conversation as resolved.
Show resolved Hide resolved

@Test
public void givenConsentedCase_WhenEmptyApplicantPostCode_thenHandlerWillShowMessage() {
dawudgovuk marked this conversation as resolved.
Show resolved Hide resolved

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("");
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.NO);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for applicant address."));
dawudgovuk marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
void givenConsentedCase_WhenNullApplicantPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode(null);
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.NO);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for applicant address."));
}

@Test
void givenConsentedCase_WhenEmptyRespondentPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
Address addressBlank = new Address();
addressBlank.setPostCode("");
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setRespondentAddress(addressBlank);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.NO);
data.getContactDetailsWrapper().setContestedRespondentRepresented(YesOrNo.NO);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for respondent address."));
}

@Test
void givenConsentedCase_WhenNullRespondentPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
Address addressBlank = new Address();
addressBlank.setPostCode(null);
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setRespondentAddress(addressBlank);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.NO);
data.getContactDetailsWrapper().setContestedRespondentRepresented(YesOrNo.NO);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for respondent address."));
}

@Test
void givenConsentedCase_WhenEmptyApplicantSolicitorPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
Address addressBlank = new Address();
addressBlank.setPostCode("");
dawudgovuk marked this conversation as resolved.
Show resolved Hide resolved
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.YES);
data.getContactDetailsWrapper().setApplicantSolicitorAddress(addressBlank);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for applicant solicitor address."));
}

@Test
void givenConsentedCase_WhenEmptyRespondentSolicitorPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
Address addressBlank = new Address();
addressBlank.setPostCode("");
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setRespondentAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.YES);
data.getContactDetailsWrapper().setContestedRespondentRepresented(YesOrNo.YES);
data.getContactDetailsWrapper().setRespondentSolicitorAddress(addressBlank);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for respondent solicitor address."));
}

@Test
void givenConsentedCase_WhenNullApplicantSolicitorPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
Address addressBlank = new Address();
addressBlank.setPostCode(null);
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.YES);
data.getContactDetailsWrapper().setApplicantSolicitorAddress(addressBlank);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for applicant solicitor address."));
}

@Test
void givenConsentedCase_WhenNullRespondentSolicitorPostCode_thenHandlerWillShowMessage() {

FinremCallbackRequest finremCallbackRequest = buildCallbackRequest();
FinremCaseDetails caseDetails = finremCallbackRequest.getCaseDetails();
FinremCaseData data = caseDetails.getData();

Address address = new Address();
address.setPostCode("AB1 1AB");
Address addressBlank = new Address();
addressBlank.setPostCode(null);
data.getContactDetailsWrapper().setApplicantAddress(address);
data.getContactDetailsWrapper().setRespondentAddress(address);
data.getContactDetailsWrapper().setApplicantRepresented(YesOrNo.YES);
data.getContactDetailsWrapper().setContestedRespondentRepresented(YesOrNo.YES);
data.getContactDetailsWrapper().setRespondentSolicitorAddress(addressBlank);

GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle = handler.handle(finremCallbackRequest, AUTH_TOKEN);

assertEquals(1, handle.getErrors().size());
assertTrue(handle.getErrors().contains("Postcode field is required for respondent solicitor address."));
}
}