From 2550a69b2cff2e66555610113dd66a8cbfac3c41 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:03:51 +0000 Subject: [PATCH 001/336] initial setup attempt --- .../judgeApproval/ApprovalHearing.java | 23 +++++++++++++++++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 7 ++++++ 2 files changed, 30 insertions(+) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java new file mode 100644 index 0000000000..0d9fdae6c2 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java @@ -0,0 +1,23 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeApproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder(toBuilder = true) +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class ApprovalHearing { + @JsonProperty("hearingType") + private String hearingType; + +// @JsonProperty("draftOrdersForApprovalCollection") +// private List draftOrdersForApprovalCollection; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 3007e8949b..11999f9b33 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -7,9 +7,11 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeApproval.ApprovalHearing; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; @@ -29,6 +31,11 @@ public class DraftOrdersWrapper implements HasCaseDocument { private String typeOfDraftOrder; private YesOrNo showUploadPartyQuestion; + private DynamicList selectedHearingForApproval; + + @JsonProperty("approvalHearing") + private ApprovalHearing approvalHearing; + @JsonProperty("uploadSuggestedDraftOrder") private UploadSuggestedDraftOrder uploadSuggestedDraftOrder; @JsonProperty("uploadAgreedDraftOrder") From c826b7a8372fd4fe43224efaef4295e390c3d23c Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:59:49 +0000 Subject: [PATCH 002/336] Add AboutToStartHandler for judge approve orders event --- ...ApproveDraftOrdersAboutToStartHandler.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java new file mode 100644 index 0000000000..00beed23df --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -0,0 +1,64 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.FinremCallbackHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioListElement; +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.draftorders.upload.suggested.UploadSuggestedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseAssignedRoleService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; + +import java.util.List; + +import static java.lang.String.format; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.UPLOAD_PARTY_APPLICANT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.UPLOAD_PARTY_RESPONDENT; + +@Slf4j +@Service +public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { + + private final CaseAssignedRoleService caseAssignedRoleService; + + private final HearingService hearingService; + + public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, CaseAssignedRoleService caseAssignedRoleService, + HearingService hearingService) { + super(finremCaseDetailsMapper); + this.caseAssignedRoleService = caseAssignedRoleService; + this.hearingService = hearingService; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return CallbackType.ABOUT_TO_START.equals(callbackType) + && CaseType.CONTESTED.equals(caseType) + && EventType.APPROVE_ORDERS.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested {} about to start callback for Case ID: {}", callbackRequest.getEventType(), + caseId); + + FinremCaseData finremCaseData = caseDetails.getData(); + DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + + + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(finremCaseData).build(); + } +} From 01ec3f11ff33138e242aff1d38d26b1cbf969950 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:00:02 +0000 Subject: [PATCH 003/336] Add event to EventType --- .../hmcts/reform/finrem/caseorchestration/model/EventType.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java index d0fd09fde8..c99c727b63 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java @@ -88,6 +88,7 @@ public enum EventType { REMOVE_CASE_DOCUMENT("FR_removeCaseDocument"), REMOVE_USER_CASE_ACCESS("FR_removeUserCaseAccess"), DRAFT_ORDERS("FR_draftOrders"), + APPROVE_ORDERS("FR_approveOrders"), @JsonEnumDefaultValue NONE(""); From efadc197e25e369e97805e0066d3971465008ae4 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:00:51 +0000 Subject: [PATCH 004/336] optimise imports --- .../ApproveDraftOrdersAboutToStartHandler.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 00beed23df..8c5d672edc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -9,21 +9,12 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioList; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioListElement; 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.draftorders.upload.suggested.UploadSuggestedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseAssignedRoleService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; -import java.util.List; - -import static java.lang.String.format; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.UPLOAD_PARTY_APPLICANT; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.UPLOAD_PARTY_RESPONDENT; - @Slf4j @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { From a62ffbaedea2c9342be55afcf4979eda81712863 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:01:22 +0000 Subject: [PATCH 005/336] remove dynamicList --- .../model/ccd/wrapper/DraftOrdersWrapper.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 11999f9b33..a4285dd447 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -7,7 +7,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -31,8 +30,6 @@ public class DraftOrdersWrapper implements HasCaseDocument { private String typeOfDraftOrder; private YesOrNo showUploadPartyQuestion; - private DynamicList selectedHearingForApproval; - @JsonProperty("approvalHearing") private ApprovalHearing approvalHearing; From b7fa5d0fee9323a82420e1e22d97884e12e34ae2 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 5 Nov 2024 15:27:48 +0000 Subject: [PATCH 006/336] lower case --- .../model/ccd/draftorders/judgeApproval/ApprovalHearing.java | 2 +- .../caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java index 0d9fdae6c2..9961991fe9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java @@ -1,4 +1,4 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeApproval; +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index a4285dd447..7a6495eaa8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -10,7 +10,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeApproval.ApprovalHearing; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ApprovalHearing; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; From b33b3e7b3e271104485d6116741bcdcdb1339090 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 6 Nov 2024 15:04:49 +0000 Subject: [PATCH 007/336] renaming package --- .../{judgeApproval => judgeapproval2}/ApprovalHearing.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/{judgeApproval => judgeapproval2}/ApprovalHearing.java (100%) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval2/ApprovalHearing.java similarity index 100% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeApproval/ApprovalHearing.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval2/ApprovalHearing.java From 593976c5be44aa3943e5c335189db7048b9a5c33 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 6 Nov 2024 15:05:12 +0000 Subject: [PATCH 008/336] package rename --- .../{judgeapproval2 => judgeapproval}/ApprovalHearing.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/{judgeapproval2 => judgeapproval}/ApprovalHearing.java (100%) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval2/ApprovalHearing.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ApprovalHearing.java similarity index 100% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval2/ApprovalHearing.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ApprovalHearing.java From 0ac73eacfebf32ba89ce4f4af9d33c28f02c5640 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:34:55 +0000 Subject: [PATCH 009/336] Create dynamicList for selecting a hearing to review --- ...ApproveDraftOrdersAboutToStartHandler.java | 62 +++++++++++++++---- .../model/ccd/wrapper/DraftOrdersWrapper.java | 6 +- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 8c5d672edc..b0fe96c2ac 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -9,25 +9,25 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; 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.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseAssignedRoleService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; @Slf4j @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { - private final CaseAssignedRoleService caseAssignedRoleService; - - private final HearingService hearingService; - - public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, CaseAssignedRoleService caseAssignedRoleService, - HearingService hearingService) { + public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper) { super(finremCaseDetailsMapper); - this.caseAssignedRoleService = caseAssignedRoleService; - this.hearingService = hearingService; } @Override @@ -42,14 +42,50 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem String userAuthorisation) { FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); String caseId = String.valueOf(caseDetails.getId()); - log.info("Invoking contested {} about to start callback for Case ID: {}", callbackRequest.getEventType(), - caseId); + log.info("Invoking contested {} about to start callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + List hearingOptions = new ArrayList<>(); + List hearingsForReview = new ArrayList<>(); + + //Check each hearing in draftOrdersReviewCollection + if (draftOrdersWrapper.getDraftOrdersReviewCollection() != null) { + for (DraftOrdersReviewCollection reviewCollection : draftOrdersWrapper.getDraftOrdersReviewCollection()) { + DraftOrdersReview draftOrdersReview = reviewCollection.getValue(); + + boolean isReviewableHearing = draftOrdersReview.getDraftOrderDocReviewCollection().stream() + .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED) || + draftOrdersReview.getPsaDocReviewCollection().stream() + .anyMatch(psa -> psa.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED); + + //Only add hearing if there is an order or PSA with TO_BE_REVIEWED + if (isReviewableHearing) { + hearingsForReview.add(draftOrdersReview); + } + } + + hearingsForReview.sort(Comparator.comparing(DraftOrdersReview::getHearingDate)); + + hearingOptions = hearingsForReview.stream() + .map(hearing -> DynamicListElement.builder() + .code(hearing.getHearingType() + "-" + hearing.getHearingDate()) + .label(hearing.getHearingType() + " on " + hearing.getHearingDate().toString() + " by " + hearing.getHearingJudge()) + .build()) + .toList(); + + } + + //Set the filtered hearings in the DynamicList + DynamicList hearingsReadyForReview = DynamicList.builder() + .value(null) + .listItems(hearingOptions) + .build(); + draftOrdersWrapper.setHearingsReadyForReview(hearingsReadyForReview); return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(finremCaseData).build(); + .data(finremCaseData) + .build(); } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 7a6495eaa8..6f4ff69fe6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -7,10 +7,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ApprovalHearing; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; @@ -30,8 +30,8 @@ public class DraftOrdersWrapper implements HasCaseDocument { private String typeOfDraftOrder; private YesOrNo showUploadPartyQuestion; - @JsonProperty("approvalHearing") - private ApprovalHearing approvalHearing; + @JsonProperty("hearingsReadyForReview") + private DynamicList hearingsReadyForReview; @JsonProperty("uploadSuggestedDraftOrder") private UploadSuggestedDraftOrder uploadSuggestedDraftOrder; From 3097807beb7bcffeb3791f26962fc2ea4b9f62dd Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 5 Nov 2024 17:40:58 +0000 Subject: [PATCH 010/336] =?UTF-8?q?Data=20structure=20for=20capturing=20ju?= =?UTF-8?q?dge=E2=80=99s=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApproveDraftOrdersMidEventHandler.java | 99 +++++++++++++++++++ .../judgeapproval/JudgeApproval.java | 30 ++++++ .../judgeapproval/JudgeDecision.java | 8 ++ .../judgeapproval/ReviewableDraftOrder.java | 35 +++++++ .../ReviewableDraftOrderCollection.java | 17 ++++ .../judgeapproval/ReviewablePsa.java | 28 ++++++ .../ReviewablePsaCollection.java | 17 ++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 4 + 8 files changed, 238 insertions(+) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java new file mode 100644 index 0000000000..a0d82064d4 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -0,0 +1,99 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.FinremCallbackHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsaCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; + +import java.util.List; + +@Slf4j +@Service +public class ApproveDraftOrdersMidEventHandler extends FinremCallbackHandler { + + public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetailsMapper) { + super(finremCaseDetailsMapper); + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return CallbackType.MID_EVENT.equals(callbackType) + && CaseType.CONTESTED.equals(caseType) + && EventType.APPROVE_ORDERS.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested {} mid event callback for Case ID: {}", callbackRequest.getEventType(), caseId); + + FinremCaseData finremCaseData = caseDetails.getData(); + DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + + // XXX + draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() + .reviewablePsaCollection(List.of( + ReviewablePsaCollection.builder() + .value(ReviewablePsa.builder() + .document( + CaseDocument.builder().documentFilename("PSA.pdf") + .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") + .build() + ) + .build()) + .build() + )) + .reviewableDraftOrderCollection(List.of( + ReviewableDraftOrderCollection.builder() + .value(ReviewableDraftOrder.builder() + .document( + CaseDocument.builder().documentFilename("DO_A.pdf") + .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") + .build() + ) + .attachments(List.of( + CaseDocumentCollection.builder().value( + CaseDocument.builder().documentFilename("Attachment-A.pdf") + .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") + .build()) + .build(), + CaseDocumentCollection.builder().value( + CaseDocument.builder().documentFilename("Attachment-B.pdf") + .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") + .build()) + .build() + )) + .build()) + .build(), + ReviewableDraftOrderCollection.builder() + .value(ReviewableDraftOrder.builder() + .document( + CaseDocument.builder().documentFilename("PSA_A.pdf") + .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") + .build() + ) + .build()) + .build() + )) + .build()); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java new file mode 100644 index 0000000000..bbd2b29e53 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -0,0 +1,30 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; + +import java.util.List; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder(toBuilder = true) +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class JudgeApproval { + + @JsonProperty("hearingDetails") + private DynamicList hearingDetails; + + @JsonProperty("reviewableDraftOrderCollection") + private List reviewableDraftOrderCollection; + + @JsonProperty("reviewablePsaCollection") + private List reviewablePsaCollection; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java new file mode 100644 index 0000000000..e0993b3b37 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java @@ -0,0 +1,8 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +public enum JudgeDecision { + REVIEW_LATER, + LEGAL_REP_NEEDS_TO_MAKE_CHANGE, + JUDGE_NEEDS_TO_MAKE_CHANGES, + READY_TO_BE_SEALED; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java new file mode 100644 index 0000000000..bcb2d63b48 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java @@ -0,0 +1,35 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; + +import java.util.List; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class ReviewableDraftOrder { + + @JsonProperty("document") + private CaseDocument document; + + @JsonProperty("judgeDecision") + private JudgeDecision judgeDecision; + + @JsonProperty("attachments") + private List attachments; + + @JsonProperty("isFinalOrder") + private YesOrNo isFinalOrder; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java new file mode 100644 index 0000000000..39754d6068 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java @@ -0,0 +1,17 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ReviewableDraftOrderCollection { + + private ReviewableDraftOrder value; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java new file mode 100644 index 0000000000..81b6b8f5c0 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java @@ -0,0 +1,28 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; + +import java.util.List; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class ReviewablePsa { + + @JsonProperty("document") + private CaseDocument document; + + @JsonProperty("judgeDecision") + private JudgeDecision judgeDecision; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java new file mode 100644 index 0000000000..cd3e17228e --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java @@ -0,0 +1,17 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ReviewablePsaCollection { + + private ReviewablePsa value; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 6f4ff69fe6..00c769c010 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -11,6 +11,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; @@ -46,6 +47,9 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("suggestedDraftOrderCollection") private List suggestedDraftOrderCollection; + @JsonProperty("judgeApproval") + private JudgeApproval judgeApproval; + public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); From 1556fdd418bcfb8280065aae7cda3cfb21a18169 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 6 Nov 2024 17:11:11 +0000 Subject: [PATCH 011/336] add TODO comment --- .../approvedraftorders/ApproveDraftOrdersMidEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index a0d82064d4..d44fb21b99 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -47,7 +47,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - // XXX + // TODO populate the following from draftOrdersWrapper.draftOrdersReviewCollection draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() .reviewablePsaCollection(List.of( ReviewablePsaCollection.builder() From b1e312575d438dd93013a6e5cfeb170a8fbf0710 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 6 Nov 2024 17:32:55 +0000 Subject: [PATCH 012/336] checkstyle --- .../ApproveDraftOrdersAboutToStartHandler.java | 6 +++--- .../model/ccd/draftorders/judgeapproval/ReviewablePsa.java | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index b0fe96c2ac..c844a053d7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -56,9 +56,9 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem DraftOrdersReview draftOrdersReview = reviewCollection.getValue(); boolean isReviewableHearing = draftOrdersReview.getDraftOrderDocReviewCollection().stream() - .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED) || - draftOrdersReview.getPsaDocReviewCollection().stream() - .anyMatch(psa -> psa.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED); + .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED) + || draftOrdersReview.getPsaDocReviewCollection().stream() + .anyMatch(psa -> psa.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED); //Only add hearing if there is an order or PSA with TO_BE_REVIEWED if (isReviewableHearing) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java index 81b6b8f5c0..4dde29e32e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java @@ -8,9 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; - -import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) @Data From eccc0b1bd34f52d93ea83f603ea738f16074df73 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 6 Nov 2024 17:34:00 +0000 Subject: [PATCH 013/336] remove a blank line. --- .../ApproveDraftOrdersAboutToStartHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index c844a053d7..d098a5ec06 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -74,7 +74,6 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .label(hearing.getHearingType() + " on " + hearing.getHearingDate().toString() + " by " + hearing.getHearingJudge()) .build()) .toList(); - } //Set the filtered hearings in the DynamicList From afb111228894cb46ddf7cdd438f213641dae1679 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 6 Nov 2024 17:35:40 +0000 Subject: [PATCH 014/336] Remove an unused property --- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index bbd2b29e53..f798960536 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -7,7 +7,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import java.util.List; @@ -19,9 +18,6 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class JudgeApproval { - @JsonProperty("hearingDetails") - private DynamicList hearingDetails; - @JsonProperty("reviewableDraftOrderCollection") private List reviewableDraftOrderCollection; From 79e858d578a6efc6a3107bd982a6ef0e73edf1ab Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 7 Nov 2024 11:35:05 +0000 Subject: [PATCH 015/336] Add comment for sorting --- .../ApproveDraftOrdersAboutToStartHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index d098a5ec06..fd59c3b444 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -66,6 +66,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem } } + //Sort the hearings by date hearingsForReview.sort(Comparator.comparing(DraftOrdersReview::getHearingDate)); hearingOptions = hearingsForReview.stream() From 3f7daf91ba9b0db61caa4880942aa0c278a4334b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 13:37:51 +0000 Subject: [PATCH 016/336] remove mocked data. --- .../ApproveDraftOrdersMidEventHandler.java | 85 +++++++++---------- .../model/ccd/wrapper/DraftOrdersWrapper.java | 6 +- 2 files changed, 44 insertions(+), 47 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index d44fb21b99..78850ef543 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -8,16 +8,18 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsaCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import java.util.List; @@ -37,6 +39,35 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType && EventType.APPROVE_ORDERS.equals(eventType); } + private List createReviewableDraftOrderCollection(DraftOrdersWrapper draftOrdersWrapper) { + return draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + .map(DraftOrdersReviewCollection::getValue) + .map(DraftOrdersReview::getDraftOrderDocReviewCollection) + .flatMap(List::stream) + .map(DraftOrderDocReviewCollection::getValue) + .map(a -> ReviewableDraftOrderCollection.builder() + .value(ReviewableDraftOrder.builder() + .document(a.getDraftOrderDocument()) + .attachments(a.getAttachments()) + .build()) + .build()) + .toList(); + } + + private List createReviewablePsaCollection(DraftOrdersWrapper draftOrdersWrapper) { + return draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + .map(DraftOrdersReviewCollection::getValue) + .map(DraftOrdersReview::getPsaDocReviewCollection) + .flatMap(List::stream) + .map(PsaDocReviewCollection::getValue) + .map(a -> ReviewablePsaCollection.builder() + .value(ReviewablePsa.builder() + .document(a.getPsaDocument()) + .build()) + .build()) + .toList(); + } + @Override public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, String userAuthorisation) { @@ -47,51 +78,13 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - // TODO populate the following from draftOrdersWrapper.draftOrdersReviewCollection + // TODO depending on the selected hearing + List reviewableDraftOrderCollection = createReviewableDraftOrderCollection(draftOrdersWrapper); + List reviewablePsaCollection = createReviewablePsaCollection(draftOrdersWrapper); + draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() - .reviewablePsaCollection(List.of( - ReviewablePsaCollection.builder() - .value(ReviewablePsa.builder() - .document( - CaseDocument.builder().documentFilename("PSA.pdf") - .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") - .build() - ) - .build()) - .build() - )) - .reviewableDraftOrderCollection(List.of( - ReviewableDraftOrderCollection.builder() - .value(ReviewableDraftOrder.builder() - .document( - CaseDocument.builder().documentFilename("DO_A.pdf") - .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") - .build() - ) - .attachments(List.of( - CaseDocumentCollection.builder().value( - CaseDocument.builder().documentFilename("Attachment-A.pdf") - .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") - .build()) - .build(), - CaseDocumentCollection.builder().value( - CaseDocument.builder().documentFilename("Attachment-B.pdf") - .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") - .build()) - .build() - )) - .build()) - .build(), - ReviewableDraftOrderCollection.builder() - .value(ReviewableDraftOrder.builder() - .document( - CaseDocument.builder().documentFilename("PSA_A.pdf") - .documentUrl("http://dm-store-aat.service.core-compute-aat.internal/documents/afd2faae-de15-4ab8-8d0c-d5d0fef41e62") - .build() - ) - .build()) - .build() - )) + .reviewablePsaCollection(reviewablePsaCollection) + .reviewableDraftOrderCollection(reviewableDraftOrderCollection) .build()); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 00c769c010..de71e121ad 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -58,9 +58,13 @@ public void appendAgreedDraftOrderCollection(List ne } public void appendDraftOrdersReviewCollection(List newDraftOrdersReviewCollection) { + getDraftOrdersReviewCollection().addAll(newDraftOrdersReviewCollection); + } + + public List getDraftOrdersReviewCollection() { if (draftOrdersReviewCollection == null) { draftOrdersReviewCollection = new ArrayList<>(); } - draftOrdersReviewCollection.addAll(newDraftOrdersReviewCollection); + return draftOrdersReviewCollection; } } From 665235d5725e3ebce648d759a6bea8349335c36f Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:48:44 +0000 Subject: [PATCH 017/336] no orders for review error message --- .../ApproveDraftOrdersAboutToStartHandler.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index fd59c3b444..527a3b2ce1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -1,6 +1,7 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; 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; @@ -40,6 +41,8 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType @Override public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, String userAuthorisation) { + List errors = new ArrayList<>(); + String error = "There are no outstanding draft orders or pension sharing annexes that are ready to review."; FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); String caseId = String.valueOf(caseDetails.getId()); log.info("Invoking contested {} about to start callback for Case ID: {}", callbackRequest.getEventType(), caseId); @@ -65,7 +68,10 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem hearingsForReview.add(draftOrdersReview); } } - + if (ObjectUtils.isEmpty(hearingsForReview)) { + errors.add(error); + } + //Sort the hearings by date hearingsForReview.sort(Comparator.comparing(DraftOrdersReview::getHearingDate)); @@ -75,6 +81,8 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .label(hearing.getHearingType() + " on " + hearing.getHearingDate().toString() + " by " + hearing.getHearingJudge()) .build()) .toList(); + } else { + errors.add(error); } //Set the filtered hearings in the DynamicList @@ -85,7 +93,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem draftOrdersWrapper.setHearingsReadyForReview(hearingsReadyForReview); return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(finremCaseData) - .build(); + .data(finremCaseData).errors(errors).build(); + } } From 6422a9bbfc7aa442b22434229539b7573986543d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 15:56:22 +0000 Subject: [PATCH 018/336] add utility methods --- .../draftorders/review/DraftOrdersReview.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java index 6b6e5d29b1..d426078f74 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java @@ -13,8 +13,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.Optional; @JsonIgnoreProperties(ignoreUnknown = true) @Builder @@ -34,6 +37,42 @@ public class DraftOrdersReview implements HasCaseDocument { @JsonProperty("psaDocReviewCollection") private List psaDocReviewCollection; + private static final String HEARING_ID_FORMAT = "\\$\\$"; + + public static Optional parseHearingDate(String hearingId) { + String[] parts = hearingId.split(HEARING_ID_FORMAT); + if (parts.length > 0 && !parts[0].isEmpty()) { + DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + return Optional.of(LocalDate.parse(parts[0], dateFormatter)); + } + return Optional.empty(); + } + + public static Optional parseHearingTime(String hearingId) { + String[] parts = hearingId.split(HEARING_ID_FORMAT); + if (parts.length > 1 && !parts[1].isEmpty()) { + return Optional.of(parts[1]); + } + return Optional.empty(); + } + + public static Optional parseHearingJudge(String hearingId) { + String[] parts = hearingId.split(HEARING_ID_FORMAT); + if (parts.length > 2 && !parts[2].isEmpty()) { + return Optional.of(parts[2]); + } + return Optional.empty(); + } + + public String getHearingId() { + DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String formattedDate = hearingDate != null ? hearingDate.format(dateFormatter) : "N/A"; + + return String.format("%s$$%s$$%s", formattedDate, + Objects.toString(hearingTime, "N/A"), + Objects.toString(hearingJudge, "N/A")); + } + @JsonIgnore public List getDraftOrderDocReviewCollection() { if (this.draftOrderDocReviewCollection == null) { From 14b504026e0812266c10136f8ae05b189e3b5960 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 15:58:46 +0000 Subject: [PATCH 019/336] Due to getDraftOrdersReviewCollection() changed to return empty list if null. --- .../ApproveDraftOrdersAboutToStartHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 527a3b2ce1..3cf69e12ab 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -54,7 +54,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem List hearingsForReview = new ArrayList<>(); //Check each hearing in draftOrdersReviewCollection - if (draftOrdersWrapper.getDraftOrdersReviewCollection() != null) { + if (!draftOrdersWrapper.getDraftOrdersReviewCollection().isEmpty()) { for (DraftOrdersReviewCollection reviewCollection : draftOrdersWrapper.getDraftOrdersReviewCollection()) { DraftOrdersReview draftOrdersReview = reviewCollection.getValue(); From 0127d8be8ed6e739c039ca5c2dd7523a731e921d Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:13:49 +0000 Subject: [PATCH 020/336] use ObjectUtils.isEmpty --- .../ApproveDraftOrdersAboutToStartHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 527a3b2ce1..4b3a2c2c7c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -54,7 +54,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem List hearingsForReview = new ArrayList<>(); //Check each hearing in draftOrdersReviewCollection - if (draftOrdersWrapper.getDraftOrdersReviewCollection() != null) { + if (!ObjectUtils.isEmpty(draftOrdersWrapper.getDraftOrdersReviewCollection())) { for (DraftOrdersReviewCollection reviewCollection : draftOrdersWrapper.getDraftOrdersReviewCollection()) { DraftOrdersReview draftOrdersReview = reviewCollection.getValue(); @@ -71,7 +71,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem if (ObjectUtils.isEmpty(hearingsForReview)) { errors.add(error); } - + //Sort the hearings by date hearingsForReview.sort(Comparator.comparing(DraftOrdersReview::getHearingDate)); From 62016f8711261f20a893e7c55e8bcd04c6cd313f Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:14:05 +0000 Subject: [PATCH 021/336] Add unit tests --- ...oveDraftOrdersAboutToStartHandlerTest.java | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java new file mode 100644 index 0000000000..f82463264a --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -0,0 +1,147 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; +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.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; + +import java.time.LocalDate; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.spy; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersAboutToStartHandlerTest { + + @InjectMocks + private ApproveDraftOrdersAboutToStartHandler handler; + + @Test + void canHandle() { + assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); + } + + @Test + void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { + FinremCaseData caseData = spy(new FinremCaseData()); + + DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(TO_BE_REVIEWED) + .build(); + DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) + .build(); + + DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); + DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); + + DraftOrdersReview review1 = DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 8, 6)) + .hearingType("Hearing Type 1") + .hearingJudge("Judge 1") + .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) + .build(); + + DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); + caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + assertThat(response).isNotNull(); + assertThat(response.getErrors()).isEmpty(); + + DynamicList hearingsReadyForReview = caseData.getDraftOrdersWrapper().getHearingsReadyForReview(); + assertThat(hearingsReadyForReview).isNotNull(); + Assertions.assertEquals(1, hearingsReadyForReview.getListItems().size()); + Assertions.assertEquals("Hearing Type 1 on 2024-08-06 by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); + } + + @Test + void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { + FinremCaseData caseData = spy(new FinremCaseData()); + PsaDocumentReview document1 = PsaDocumentReview.builder().orderStatus(TO_BE_REVIEWED) + .build(); + PsaDocReviewCollection psaCollectionItem1 = new PsaDocReviewCollection(document1); + + DraftOrdersReview review1 = DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 8, 6)) + .hearingType("Hearing Type 1") + .hearingJudge("Judge 1") + .psaDocReviewCollection(List.of(psaCollectionItem1)) + .build(); + + DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); + caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + assertThat(response).isNotNull(); + assertThat(response.getErrors()).isEmpty(); + + DynamicList hearingsReadyForReview = caseData.getDraftOrdersWrapper().getHearingsReadyForReview(); + assertThat(hearingsReadyForReview).isNotNull(); + Assertions.assertEquals(1, hearingsReadyForReview.getListItems().size()); + Assertions.assertEquals("Hearing Type 1 on 2024-08-06 by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); + } + + @Test + void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { + FinremCaseData caseData = spy(new FinremCaseData()); + + DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) + .build(); + DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED_BY_ADMIN) + .build(); + + DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); + DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); + + DraftOrdersReview review1 = DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 8, 6)) + .hearingType("Hearing Type 1") + .hearingJudge("Judge 1") + .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) + .build(); + + DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); + caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + Assertions.assertEquals(1, response.getErrors().size()); + assertThat(response.getErrors()).contains("There are no outstanding draft orders or pension sharing annexes that are ready to review."); + } + + @Test + void givenUserHasDraftOrders_whenHandle_thenReturnError() { + FinremCaseData caseData = spy(new FinremCaseData()); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + Assertions.assertEquals(1, response.getErrors().size()); + assertThat(response.getErrors()).contains("There are no outstanding draft orders or pension sharing annexes that are ready to review."); + } + +} From 0a027f435181c1adbb09ac6864682bab9897fd70 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 16:22:05 +0000 Subject: [PATCH 022/336] add JsonIgnore to a getter property --- .../model/ccd/draftorders/review/DraftOrdersReview.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java index d426078f74..da8fb9f971 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java @@ -64,6 +64,7 @@ public static Optional parseHearingJudge(String hearingId) { return Optional.empty(); } + @JsonIgnore public String getHearingId() { DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String formattedDate = hearingDate != null ? hearingDate.format(dateFormatter) : "N/A"; From 99f8f436923c222728cd144733f7cdb6d0d1d646 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 16:22:41 +0000 Subject: [PATCH 023/336] Making use getHearingId to identify the hearing selected. --- .../ApproveDraftOrdersAboutToStartHandler.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 3cf69e12ab..4af57087f4 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -19,9 +19,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Optional; + +import static java.lang.String.format; @Slf4j @Service @@ -76,9 +80,17 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem hearingsForReview.sort(Comparator.comparing(DraftOrdersReview::getHearingDate)); hearingOptions = hearingsForReview.stream() - .map(hearing -> DynamicListElement.builder() - .code(hearing.getHearingType() + "-" + hearing.getHearingDate()) - .label(hearing.getHearingType() + " on " + hearing.getHearingDate().toString() + " by " + hearing.getHearingJudge()) + .map(draftOrdersReview -> DynamicListElement.builder() + .code(draftOrdersReview.getHearingId()) + .label(format( + "%s on %s %s by %s", + Optional.ofNullable(draftOrdersReview.getHearingType()).orElse("N/A"), + Optional.ofNullable(draftOrdersReview.getHearingDate()) + .map(date -> date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + .orElse("N/A"), + Optional.ofNullable(draftOrdersReview.getHearingTime()).orElse("N/A"), + Optional.ofNullable(draftOrdersReview.getHearingJudge()).orElse("N/A") + )) .build()) .toList(); } else { From 366728c4daa1fbe0ec5581b378fd92b3369d4463 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 17:15:56 +0000 Subject: [PATCH 024/336] Fix test case --- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index f82463264a..5f8126ce81 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -57,6 +57,7 @@ void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { .hearingDate(LocalDate.of(2024, 8, 6)) .hearingType("Hearing Type 1") .hearingJudge("Judge 1") + .hearingTime("09:00 A.M.") .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) .build(); @@ -72,7 +73,7 @@ void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { DynamicList hearingsReadyForReview = caseData.getDraftOrdersWrapper().getHearingsReadyForReview(); assertThat(hearingsReadyForReview).isNotNull(); Assertions.assertEquals(1, hearingsReadyForReview.getListItems().size()); - Assertions.assertEquals("Hearing Type 1 on 2024-08-06 by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); + Assertions.assertEquals("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); } @Test @@ -86,6 +87,7 @@ void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { .hearingDate(LocalDate.of(2024, 8, 6)) .hearingType("Hearing Type 1") .hearingJudge("Judge 1") + .hearingTime("09:00 A.M.") .psaDocReviewCollection(List.of(psaCollectionItem1)) .build(); @@ -101,7 +103,7 @@ void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { DynamicList hearingsReadyForReview = caseData.getDraftOrdersWrapper().getHearingsReadyForReview(); assertThat(hearingsReadyForReview).isNotNull(); Assertions.assertEquals(1, hearingsReadyForReview.getListItems().size()); - Assertions.assertEquals("Hearing Type 1 on 2024-08-06 by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); + Assertions.assertEquals("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); } @Test From 0012a8e733cfed2e019bfc07b57dc7a9c8db67dc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 17:17:27 +0000 Subject: [PATCH 025/336] Add ApproveDraftOrdersMidEventHandlerTest --- ...ApproveDraftOrdersMidEventHandlerTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java new file mode 100644 index 0000000000..333420c79d --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java @@ -0,0 +1,24 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersMidEventHandlerTest { + + @InjectMocks + private ApproveDraftOrdersMidEventHandler handler; + + @Test + void canHandle() { + assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); + } + +} From 5b517bf6395ee0efb6deb176933cae050910f940 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 17:18:13 +0000 Subject: [PATCH 026/336] Show pending DOs/PSAs by selected hearing. --- .../ApproveDraftOrdersMidEventHandler.java | 4 ++-- .../model/ccd/wrapper/DraftOrdersWrapper.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 78850ef543..7ca8a42ba3 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -40,7 +40,7 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType } private List createReviewableDraftOrderCollection(DraftOrdersWrapper draftOrdersWrapper) { - return draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + return draftOrdersWrapper.getSelectedDraftOrdersReviewCollection().stream() .map(DraftOrdersReviewCollection::getValue) .map(DraftOrdersReview::getDraftOrderDocReviewCollection) .flatMap(List::stream) @@ -55,7 +55,7 @@ private List createReviewableDraftOrderCollectio } private List createReviewablePsaCollection(DraftOrdersWrapper draftOrdersWrapper) { - return draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + return draftOrdersWrapper.getSelectedDraftOrdersReviewCollection().stream() .map(DraftOrdersReviewCollection::getValue) .map(DraftOrdersReview::getPsaDocReviewCollection) .flatMap(List::stream) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index de71e121ad..dd8f78d054 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -67,4 +68,10 @@ public List getDraftOrdersReviewCollection() { } return draftOrdersReviewCollection; } + + @JsonIgnore + public List getSelectedDraftOrdersReviewCollection() { + return getDraftOrdersReviewCollection().stream().filter(a -> a.getValue().getHearingId().equals(hearingsReadyForReview.getValueCode())) + .toList(); + } } From f32b2b44250e3aea7fc9fb28bb86deb754296053 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 17:25:14 +0000 Subject: [PATCH 027/336] Remove comment --- .../approvedraftorders/ApproveDraftOrdersMidEventHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 7ca8a42ba3..3767fb2e22 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -78,7 +78,6 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - // TODO depending on the selected hearing List reviewableDraftOrderCollection = createReviewableDraftOrderCollection(draftOrdersWrapper); List reviewablePsaCollection = createReviewablePsaCollection(draftOrdersWrapper); From 198cf85af140a9e557269d775c7af81b77c52ea8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 17:27:49 +0000 Subject: [PATCH 028/336] make it as a static var --- .../ApproveDraftOrdersAboutToStartHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index bcd16ecdac..a948a854f5 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -31,6 +31,8 @@ @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { + private static final String ERROR_MESSAGE = "There are no outstanding draft orders or pension sharing annexes that are ready to review."; + public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper) { super(finremCaseDetailsMapper); } @@ -46,7 +48,6 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, String userAuthorisation) { List errors = new ArrayList<>(); - String error = "There are no outstanding draft orders or pension sharing annexes that are ready to review."; FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); String caseId = String.valueOf(caseDetails.getId()); log.info("Invoking contested {} about to start callback for Case ID: {}", callbackRequest.getEventType(), caseId); @@ -73,7 +74,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem } } if (ObjectUtils.isEmpty(hearingsForReview)) { - errors.add(error); + errors.add(ERROR_MESSAGE); } //Sort the hearings by date @@ -94,7 +95,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .build()) .toList(); } else { - errors.add(error); + errors.add(ERROR_MESSAGE); } //Set the filtered hearings in the DynamicList From 0fd0cabc7084526e9a1c7276f9f56db718e2930a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 7 Nov 2024 17:48:34 +0000 Subject: [PATCH 029/336] Remove unused methods --- .../draftorders/review/DraftOrdersReview.java | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java index da8fb9f971..110d88e957 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.Optional; @JsonIgnoreProperties(ignoreUnknown = true) @Builder @@ -37,33 +36,6 @@ public class DraftOrdersReview implements HasCaseDocument { @JsonProperty("psaDocReviewCollection") private List psaDocReviewCollection; - private static final String HEARING_ID_FORMAT = "\\$\\$"; - - public static Optional parseHearingDate(String hearingId) { - String[] parts = hearingId.split(HEARING_ID_FORMAT); - if (parts.length > 0 && !parts[0].isEmpty()) { - DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - return Optional.of(LocalDate.parse(parts[0], dateFormatter)); - } - return Optional.empty(); - } - - public static Optional parseHearingTime(String hearingId) { - String[] parts = hearingId.split(HEARING_ID_FORMAT); - if (parts.length > 1 && !parts[1].isEmpty()) { - return Optional.of(parts[1]); - } - return Optional.empty(); - } - - public static Optional parseHearingJudge(String hearingId) { - String[] parts = hearingId.split(HEARING_ID_FORMAT); - if (parts.length > 2 && !parts[2].isEmpty()) { - return Optional.of(parts[2]); - } - return Optional.empty(); - } - @JsonIgnore public String getHearingId() { DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); From d47036e8e1d0c15a3ae51edb0f427dd3eb77e815 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 8 Nov 2024 17:20:11 +0000 Subject: [PATCH 030/336] unit tests --- .../draftorders/review/DraftOrdersReview.java | 3 +- .../model/ccd/wrapper/DraftOrdersWrapper.java | 11 +- ...ApproveDraftOrdersMidEventHandlerTest.java | 286 ++++++++++++++++++ 3 files changed, 298 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java index 110d88e957..d32ddf13ac 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java @@ -41,8 +41,9 @@ public String getHearingId() { DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String formattedDate = hearingDate != null ? hearingDate.format(dateFormatter) : "N/A"; - return String.format("%s$$%s$$%s", formattedDate, + return String.format("%s$$%s$$%s$$%s", formattedDate, Objects.toString(hearingTime, "N/A"), + Objects.toString(hearingType, "N/A"), Objects.toString(hearingJudge, "N/A")); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index dd8f78d054..c168b9d6b2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -51,6 +51,14 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("judgeApproval") private JudgeApproval judgeApproval; + @JsonIgnore + public JudgeApproval getJudgeApproval() { + if (judgeApproval == null) { + this.judgeApproval = new JudgeApproval(); + } + return judgeApproval; + } + public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); @@ -71,7 +79,8 @@ public List getDraftOrdersReviewCollection() { @JsonIgnore public List getSelectedDraftOrdersReviewCollection() { - return getDraftOrdersReviewCollection().stream().filter(a -> a.getValue().getHearingId().equals(hearingsReadyForReview.getValueCode())) + return getDraftOrdersReviewCollection().stream().filter(a -> hearingsReadyForReview != null + && a.getValue().getHearingId().equals(hearingsReadyForReview.getValueCode())) .toList(); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java index 333420c79d..aa3afd777c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,13 +1,44 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; 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.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +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.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsaCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import java.time.LocalDate; +import java.util.Collections; +import java.util.List; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) @@ -21,4 +52,259 @@ void canHandle() { assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); } + @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrders={1}, expectedReviewablePsa={2}") + @MethodSource("provideDraftOrderData") + @DisplayName("Test handle method with different DraftOrdersWrapper inputs") + void handle_withVariousDraftOrdersWrapperData( + DraftOrdersWrapper draftOrdersWrapper, + List expectedReviewableDraftOrders, + List expectedReviewablePsa) { + + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build()) + .build(); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); + assertEquals(expectedReviewableDraftOrders, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrderCollection()); + assertEquals(expectedReviewablePsa, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsaCollection()); + } + + private static final String HEARING_ID_MATCH = "2024-10-31$$09:00$$hearingType$$Mr. Judge"; + + private static Stream provideDraftOrderData() { + CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); + CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); + CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); + + return Stream.of( + // Test with empty DraftOrdersWrapper + Arguments.of( + DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), + Collections.emptyList(), + Collections.emptyList() + ), + + // Test with non-empty DraftOrdersWrapper with one draft order and one PSA + Arguments.of( + DraftOrdersWrapper.builder() + .hearingsReadyForReview(DynamicList.builder() + .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) + .build()) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) + .build())) + .build()) + .build() + )) + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder() + .psaDocument(samplePsaDocument) + .build()) + .build() + )) + .build()) + .build() + )) + .build(), + List.of(ReviewableDraftOrderCollection.builder() + .value(ReviewableDraftOrder.builder() + .document(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) + .build())) + .build()) + .build()), + List.of(ReviewablePsaCollection.builder() + .value(ReviewablePsa.builder() + .document(samplePsaDocument) + .build()) + .build()) + ), + + // Test with multiple draft orders and PSAs + Arguments.of( + DraftOrdersWrapper.builder() + .hearingsReadyForReview(DynamicList.builder() + .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) + .build()) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) + .build(), + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) + .build() + )) + .build()) + .build() + )) + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder() + .psaDocument(samplePsaDocument) + .build()) + .build() + )) + .build()) + .build(), + + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 11, 30)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(sampleDraftOrderDocument2) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment3").build()) + .build() + )) + .build()) + .build() + )) + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder() + .psaDocument(samplePsaDocument2) + .build()) + .build() + )) + .build()) + .build() + )) + .build(), + List.of(ReviewableDraftOrderCollection.builder() + .value(ReviewableDraftOrder.builder() + .document(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) + .build(), + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) + .build() + )) + .build()) + .build()), + List.of(ReviewablePsaCollection.builder() + .value(ReviewablePsa.builder() + .document(samplePsaDocument) + .build()) + .build()) + ), + + // Test with a draft order and without PSAs + Arguments.of( + DraftOrdersWrapper.builder() + .hearingsReadyForReview(DynamicList.builder() + .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) + .build()) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) + .build(), + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) + .build() + )) + .build()) + .build() + )) + .build()) + .build() + )) + .build(), + List.of(ReviewableDraftOrderCollection.builder() + .value(ReviewableDraftOrder.builder() + .document(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) + .build(), + CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) + .build() + )) + .build()) + .build()), + Collections.emptyList() + ), + + // Test with a psa and without draft order + Arguments.of( + DraftOrdersWrapper.builder() + .hearingsReadyForReview(DynamicList.builder() + .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) + .build()) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder() + .psaDocument(samplePsaDocument2) + .build()) + .build() + )) + .build()) + .build() + )) + .build(), + Collections.emptyList(), + List.of(ReviewablePsaCollection.builder() + .value(ReviewablePsa.builder() + .document(samplePsaDocument2) + .build()) + .build()) + ) + ); + } } From 85553bb0b9cf8c024656acfe9980e0c7df2d8c19 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 8 Nov 2024 17:24:30 +0000 Subject: [PATCH 031/336] Remove ApprovalHearing --- .../judgeapproval/ApprovalHearing.java | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ApprovalHearing.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ApprovalHearing.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ApprovalHearing.java deleted file mode 100644 index 9961991fe9..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ApprovalHearing.java +++ /dev/null @@ -1,23 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@JsonIgnoreProperties(ignoreUnknown = true) -@Data -@Builder(toBuilder = true) -@AllArgsConstructor -@NoArgsConstructor -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ApprovalHearing { - @JsonProperty("hearingType") - private String hearingType; - -// @JsonProperty("draftOrdersForApprovalCollection") -// private List draftOrdersForApprovalCollection; -} From 4f0b5e984924ab857cd8974203030a9997c3b09e Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 8 Nov 2024 17:48:08 +0000 Subject: [PATCH 032/336] Fx test case --- .../model/ccd/wrapper/DraftOrdersWrapper.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index c168b9d6b2..00b531c34d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; @JsonIgnoreProperties(ignoreUnknown = true) @Data @@ -67,19 +68,15 @@ public void appendAgreedDraftOrderCollection(List ne } public void appendDraftOrdersReviewCollection(List newDraftOrdersReviewCollection) { - getDraftOrdersReviewCollection().addAll(newDraftOrdersReviewCollection); - } - - public List getDraftOrdersReviewCollection() { if (draftOrdersReviewCollection == null) { draftOrdersReviewCollection = new ArrayList<>(); } - return draftOrdersReviewCollection; + draftOrdersReviewCollection.addAll(newDraftOrdersReviewCollection); } @JsonIgnore public List getSelectedDraftOrdersReviewCollection() { - return getDraftOrdersReviewCollection().stream().filter(a -> hearingsReadyForReview != null + return Optional.ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream().filter(a -> hearingsReadyForReview != null && a.getValue().getHearingId().equals(hearingsReadyForReview.getValueCode())) .toList(); } From 8ff9129b5b54f082b000f2955faaec24fe803ee4 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 8 Nov 2024 18:41:20 +0000 Subject: [PATCH 033/336] Fix test case --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index a6109ebef7..b04d3e1a3f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -76,7 +76,8 @@ public class CCDConfigValidator { Map.entry("FR_ct_draftDirectionOrder", "DraftDirectionOrder"), Map.entry("Flags", "CaseFlag"), Map.entry("FR_uploadAgreedDraftOrder", "UploadAgreedDraftOrder"), - Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder") + Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder"), + Map.entry("FR_judgeApproval", "JudgeApproval") ); private Map specialFieldTypes = Map.ofEntries( From 8402a260ef481dc2ab1b8000c734bb3daa2e8f13 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 12 Nov 2024 11:59:12 +0000 Subject: [PATCH 034/336] Show top 5 draft orders/PSA --- ...ApproveDraftOrdersAboutToStartHandler.java | 2 +- .../ApproveDraftOrdersMidEventHandler.java | 68 +- .../judgeapproval/JudgeApproval.java | 21 +- .../judgeapproval/ReviewableDraftOrder.java | 10 + .../ReviewableDraftOrderCollection.java | 17 - .../judgeapproval/ReviewablePsa.java | 2 + .../ReviewablePsaCollection.java | 17 - .../model/ccd/wrapper/DraftOrdersWrapper.java | 27 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 4 +- ...ApproveDraftOrdersMidEventHandlerTest.java | 618 +++++++++--------- 10 files changed, 406 insertions(+), 380 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index a948a854f5..6adc2ccacf 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -31,7 +31,7 @@ @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { - private static final String ERROR_MESSAGE = "There are no outstanding draft orders or pension sharing annexes that are ready to review."; + private static final String ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper) { super(finremCaseDetailsMapper); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 3767fb2e22..b2b67a0421 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -13,9 +13,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsaCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; @@ -23,6 +21,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import java.util.List; +import java.util.stream.Stream; + +import static java.lang.String.format; @Slf4j @Service @@ -34,38 +35,58 @@ public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetai @Override public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return CallbackType.MID_EVENT.equals(callbackType) + return (CallbackType.MID_EVENT.equals(callbackType) || CallbackType.ABOUT_TO_START.equals(callbackType)) && CaseType.CONTESTED.equals(caseType) && EventType.APPROVE_ORDERS.equals(eventType); } - private List createReviewableDraftOrderCollection(DraftOrdersWrapper draftOrdersWrapper) { - return draftOrdersWrapper.getSelectedDraftOrdersReviewCollection().stream() + private static String buildHearingInfoFromDraftOrdersReview(Stream selected) { + return selected.findFirst().map(draftOrdersReviewCollection -> + format("%s (%s:%s)", + draftOrdersReviewCollection.getValue().getHearingType(), + draftOrdersReviewCollection.getValue().getHearingDate(), + draftOrdersReviewCollection.getValue().getHearingTime())) + // TODO align the format with ApproveDraftOrdersAboutToStartHandler + .orElse(null); + } + + private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draftOrdersWrapper, int index) { + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersWrapper.getSelectedDraftOrdersReviewCollection()); + + List collection = draftOrdersWrapper.getSelectedDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) .map(DraftOrdersReview::getDraftOrderDocReviewCollection) .flatMap(List::stream) .map(DraftOrderDocReviewCollection::getValue) - .map(a -> ReviewableDraftOrderCollection.builder() - .value(ReviewableDraftOrder.builder() - .document(a.getDraftOrderDocument()) - .attachments(a.getAttachments()) - .build()) + .map(a -> ReviewableDraftOrder.builder() + .hearingInfo(hearingInfo) + .document(a.getDraftOrderDocument()) + .attachments(a.getAttachments()) .build()) .toList(); + if (collection.size() < index) { + return null; + } + return collection.get(index - 1); } - private List createReviewablePsaCollection(DraftOrdersWrapper draftOrdersWrapper) { - return draftOrdersWrapper.getSelectedDraftOrdersReviewCollection().stream() + private ReviewablePsa createReviewablePsa(DraftOrdersWrapper draftOrdersWrapper, int index) { + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersWrapper.getSelectedDraftOrdersReviewCollection()); + + List collection = draftOrdersWrapper.getSelectedDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) .map(DraftOrdersReview::getPsaDocReviewCollection) .flatMap(List::stream) .map(PsaDocReviewCollection::getValue) - .map(a -> ReviewablePsaCollection.builder() - .value(ReviewablePsa.builder() - .document(a.getPsaDocument()) - .build()) + .map(a -> ReviewablePsa.builder() + .hearingInfo(hearingInfo) + .document(a.getPsaDocument()) .build()) .toList(); + if (collection.size() < index) { + return null; + } + return collection.get(index - 1); } @Override @@ -78,12 +99,17 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - List reviewableDraftOrderCollection = createReviewableDraftOrderCollection(draftOrdersWrapper); - List reviewablePsaCollection = createReviewablePsaCollection(draftOrdersWrapper); - draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() - .reviewablePsaCollection(reviewablePsaCollection) - .reviewableDraftOrderCollection(reviewableDraftOrderCollection) + .reviewablePsa1(createReviewablePsa(draftOrdersWrapper,1)) + .reviewablePsa2(createReviewablePsa(draftOrdersWrapper,2)) + .reviewablePsa3(createReviewablePsa(draftOrdersWrapper,3)) + .reviewablePsa4(createReviewablePsa(draftOrdersWrapper,4)) + .reviewablePsa5(createReviewablePsa(draftOrdersWrapper,5)) + .reviewableDraftOrder1(createReviewableDraftOrder(draftOrdersWrapper, 1)) + .reviewableDraftOrder2(createReviewableDraftOrder(draftOrdersWrapper, 2)) + .reviewableDraftOrder3(createReviewableDraftOrder(draftOrdersWrapper, 3)) + .reviewableDraftOrder4(createReviewableDraftOrder(draftOrdersWrapper, 4)) + .reviewableDraftOrder5(createReviewableDraftOrder(draftOrdersWrapper, 5)) .build()); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index f798960536..2be14a0be8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -2,13 +2,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - -import java.util.List; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; @JsonIgnoreProperties(ignoreUnknown = true) @Data @@ -18,9 +16,18 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class JudgeApproval { - @JsonProperty("reviewableDraftOrderCollection") - private List reviewableDraftOrderCollection; + private YesOrNo showMoreDraftOrdersMessage; + private ReviewableDraftOrder reviewableDraftOrder1; + private ReviewableDraftOrder reviewableDraftOrder2; + private ReviewableDraftOrder reviewableDraftOrder3; + private ReviewableDraftOrder reviewableDraftOrder4; + private ReviewableDraftOrder reviewableDraftOrder5; + + private YesOrNo showMorePsasMessage; + private ReviewablePsa reviewablePsa1; + private ReviewablePsa reviewablePsa2; + private ReviewablePsa reviewablePsa3; + private ReviewablePsa reviewablePsa4; + private ReviewablePsa reviewablePsa5; - @JsonProperty("reviewablePsaCollection") - private List reviewablePsaCollection; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java index bcb2d63b48..8f8bc186da 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java @@ -13,6 +13,8 @@ import java.util.List; +import static java.util.Optional.ofNullable; + @JsonIgnoreProperties(ignoreUnknown = true) @Data @Builder @@ -21,6 +23,10 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class ReviewableDraftOrder { + private String hearingInfo; + + private YesOrNo hasAttachment; + @JsonProperty("document") private CaseDocument document; @@ -32,4 +38,8 @@ public class ReviewableDraftOrder { @JsonProperty("isFinalOrder") private YesOrNo isFinalOrder; + + public YesOrNo getHasAttachment() { + return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java deleted file mode 100644 index 39754d6068..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrderCollection.java +++ /dev/null @@ -1,17 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@JsonIgnoreProperties(ignoreUnknown = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ReviewableDraftOrderCollection { - - private ReviewableDraftOrder value; -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java index 4dde29e32e..5a0e0c904a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java @@ -17,6 +17,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class ReviewablePsa { + private String hearingInfo; + @JsonProperty("document") private CaseDocument document; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java deleted file mode 100644 index cd3e17228e..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsaCollection.java +++ /dev/null @@ -1,17 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@JsonIgnoreProperties(ignoreUnknown = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ReviewablePsaCollection { - - private ReviewablePsa value; -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 00b531c34d..a2b9aca81d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -19,8 +19,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.Optional; +import java.util.stream.Stream; + +import static java.util.Comparator.naturalOrder; +import static java.util.Comparator.nullsLast; +import static java.util.Optional.ofNullable; @JsonIgnoreProperties(ignoreUnknown = true) @Data @@ -75,9 +80,21 @@ public void appendDraftOrdersReviewCollection(List } @JsonIgnore - public List getSelectedDraftOrdersReviewCollection() { - return Optional.ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream().filter(a -> hearingsReadyForReview != null - && a.getValue().getHearingId().equals(hearingsReadyForReview.getValueCode())) - .toList(); + public Stream getSelectedDraftOrdersReviewCollection() { + Stream draftOrdersStream = ofNullable(draftOrdersReviewCollection) + .orElse(List.of()) + .stream() + .filter(a -> a != null && a.getValue() != null); // General null filter for safety + + if (hearingsReadyForReview != null) { + return draftOrdersStream.filter(a -> + hearingsReadyForReview.getValueCode().equals(a.getValue().getHearingId())); + } else { + return draftOrdersStream.sorted( + Comparator.comparing((DraftOrdersReviewCollection a) -> a.getValue().getHearingDate(), nullsLast(naturalOrder())) + .thenComparing(a -> a.getValue().getHearingTime(), nullsLast(naturalOrder())) + .thenComparing(a -> a.getValue().getHearingType(), nullsLast(naturalOrder()))); + } } + } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index 5f8126ce81..163a020a16 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -132,7 +132,7 @@ void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); Assertions.assertEquals(1, response.getErrors().size()); - assertThat(response.getErrors()).contains("There are no outstanding draft orders or pension sharing annexes that are ready to review."); + assertThat(response.getErrors()).contains("There are no draft orders or pension sharing annexes to review."); } @Test @@ -143,7 +143,7 @@ void givenUserHasDraftOrders_whenHandle_thenReturnError() { FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); Assertions.assertEquals(1, response.getErrors().size()); - assertThat(response.getErrors()).contains("There are no outstanding draft orders or pension sharing annexes that are ready to review."); + assertThat(response.getErrors()).contains("There are no draft orders or pension sharing annexes to review."); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java index aa3afd777c..f2880331de 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,310 +1,308 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.InjectMocks; -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.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; -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.draftorders.CaseDocumentCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsaCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; - -import java.time.LocalDate; -import java.util.Collections; -import java.util.List; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; - -@ExtendWith(MockitoExtension.class) -class ApproveDraftOrdersMidEventHandlerTest { - - @InjectMocks - private ApproveDraftOrdersMidEventHandler handler; - - @Test - void canHandle() { - assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); - } - - @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrders={1}, expectedReviewablePsa={2}") - @MethodSource("provideDraftOrderData") - @DisplayName("Test handle method with different DraftOrdersWrapper inputs") - void handle_withVariousDraftOrdersWrapperData( - DraftOrdersWrapper draftOrdersWrapper, - List expectedReviewableDraftOrders, - List expectedReviewablePsa) { - - // Arrange - FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() - .caseDetails(FinremCaseDetails.builder() - .id(12345L) - .data(FinremCaseData.builder() - .draftOrdersWrapper(draftOrdersWrapper) - .build()) - .build()) - .build(); - - // Act - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); - - // Assert - assertNotNull(response); - FinremCaseData responseData = response.getData(); - DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); - - assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); - assertEquals(expectedReviewableDraftOrders, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrderCollection()); - assertEquals(expectedReviewablePsa, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsaCollection()); - } - - private static final String HEARING_ID_MATCH = "2024-10-31$$09:00$$hearingType$$Mr. Judge"; - - private static Stream provideDraftOrderData() { - CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); - CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); - CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); - CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); - - return Stream.of( - // Test with empty DraftOrdersWrapper - Arguments.of( - DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), - Collections.emptyList(), - Collections.emptyList() - ), - - // Test with non-empty DraftOrdersWrapper with one draft order and one PSA - Arguments.of( - DraftOrdersWrapper.builder() - .hearingsReadyForReview(DynamicList.builder() - .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) - .build()) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) - .build())) - .build()) - .build() - )) - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder() - .psaDocument(samplePsaDocument) - .build()) - .build() - )) - .build()) - .build() - )) - .build(), - List.of(ReviewableDraftOrderCollection.builder() - .value(ReviewableDraftOrder.builder() - .document(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) - .build())) - .build()) - .build()), - List.of(ReviewablePsaCollection.builder() - .value(ReviewablePsa.builder() - .document(samplePsaDocument) - .build()) - .build()) - ), - - // Test with multiple draft orders and PSAs - Arguments.of( - DraftOrdersWrapper.builder() - .hearingsReadyForReview(DynamicList.builder() - .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) - .build()) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) - .build(), - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) - .build() - )) - .build()) - .build() - )) - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder() - .psaDocument(samplePsaDocument) - .build()) - .build() - )) - .build()) - .build(), - - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 11, 30)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(sampleDraftOrderDocument2) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment3").build()) - .build() - )) - .build()) - .build() - )) - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder() - .psaDocument(samplePsaDocument2) - .build()) - .build() - )) - .build()) - .build() - )) - .build(), - List.of(ReviewableDraftOrderCollection.builder() - .value(ReviewableDraftOrder.builder() - .document(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) - .build(), - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) - .build() - )) - .build()) - .build()), - List.of(ReviewablePsaCollection.builder() - .value(ReviewablePsa.builder() - .document(samplePsaDocument) - .build()) - .build()) - ), - - // Test with a draft order and without PSAs - Arguments.of( - DraftOrdersWrapper.builder() - .hearingsReadyForReview(DynamicList.builder() - .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) - .build()) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) - .build(), - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) - .build() - )) - .build()) - .build() - )) - .build()) - .build() - )) - .build(), - List.of(ReviewableDraftOrderCollection.builder() - .value(ReviewableDraftOrder.builder() - .document(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) - .build(), - CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) - .build() - )) - .build()) - .build()), - Collections.emptyList() - ), - - // Test with a psa and without draft order - Arguments.of( - DraftOrdersWrapper.builder() - .hearingsReadyForReview(DynamicList.builder() - .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) - .build()) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder() - .psaDocument(samplePsaDocument2) - .build()) - .build() - )) - .build()) - .build() - )) - .build(), - Collections.emptyList(), - List.of(ReviewablePsaCollection.builder() - .value(ReviewablePsa.builder() - .document(samplePsaDocument2) - .build()) - .build()) - ) - ); - } -} +//package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; +// +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.junit.jupiter.params.ParameterizedTest; +//import org.junit.jupiter.params.provider.Arguments; +//import org.junit.jupiter.params.provider.MethodSource; +//import org.mockito.InjectMocks; +//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.handler.FinremCallbackRequest; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +//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.draftorders.CaseDocumentCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +// +//import java.time.LocalDate; +//import java.util.Collections; +//import java.util.List; +//import java.util.stream.Stream; +// +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.junit.jupiter.api.Assertions.assertNotNull; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; +// +//@ExtendWith(MockitoExtension.class) +//class ApproveDraftOrdersMidEventHandlerTest { +// +// @InjectMocks +// private ApproveDraftOrdersMidEventHandler handler; +// +// @Test +// void canHandle() { +// assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); +// } +// +// @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrders={1}, expectedReviewablePsa={2}") +// @MethodSource("provideDraftOrderData") +// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") +// void handle_withVariousDraftOrdersWrapperData( +// DraftOrdersWrapper draftOrdersWrapper, +// List expectedReviewableDraftOrders, +// List expectedReviewablePsa) { +// +// // Arrange +// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() +// .caseDetails(FinremCaseDetails.builder() +// .id(12345L) +// .data(FinremCaseData.builder() +// .draftOrdersWrapper(draftOrdersWrapper) +// .build()) +// .build()) +// .build(); +// +// // Act +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); +// +// // Assert +// assertNotNull(response); +// FinremCaseData responseData = response.getData(); +// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); +// +// assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); +// assertEquals(expectedReviewableDraftOrders, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrderCollection()); +// assertEquals(expectedReviewablePsa, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsaCollection()); +// } +// +// private static final String HEARING_ID_MATCH = "2024-10-31$$09:00$$hearingType$$Mr. Judge"; +// +// private static Stream provideDraftOrderData() { +// CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); +// CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); +// CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); +// CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); +// +// return Stream.of( +// // Test with empty DraftOrdersWrapper +// Arguments.of( +// DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), +// Collections.emptyList(), +// Collections.emptyList() +// ), +// +// // Test with non-empty DraftOrdersWrapper with one draft order and one PSA +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingsReadyForReview(DynamicList.builder() +// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) +// .build()) +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 10, 31)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge") +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder() +// .value(DraftOrderDocumentReview.builder() +// .draftOrderDocument(sampleDraftOrderDocument) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) +// .build())) +// .build()) +// .build() +// )) +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder() +// .psaDocument(samplePsaDocument) +// .build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .build(), +// List.of(ReviewableDraftOrderCollection.builder() +// .value(ReviewableDraftOrder.builder() +// .document(sampleDraftOrderDocument) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) +// .build())) +// .build()) +// .build()), +// List.of(ReviewablePsaCollection.builder() +// .value(ReviewablePsa.builder() +// .document(samplePsaDocument) +// .build()) +// .build()) +// ), +// +// // Test with multiple draft orders and PSAs +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingsReadyForReview(DynamicList.builder() +// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) +// .build()) +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 10, 31)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge") +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder() +// .value(DraftOrderDocumentReview.builder() +// .draftOrderDocument(sampleDraftOrderDocument) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) +// .build(), +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder() +// .psaDocument(samplePsaDocument) +// .build()) +// .build() +// )) +// .build()) +// .build(), +// +// DraftOrdersReviewCollection.builder() +// .value(DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 11, 30)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge") +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder() +// .value(DraftOrderDocumentReview.builder() +// .draftOrderDocument(sampleDraftOrderDocument2) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment3").build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder() +// .psaDocument(samplePsaDocument2) +// .build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .build(), +// List.of(ReviewableDraftOrderCollection.builder() +// .value(ReviewableDraftOrder.builder() +// .document(sampleDraftOrderDocument) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) +// .build(), +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) +// .build() +// )) +// .build()) +// .build()), +// List.of(ReviewablePsaCollection.builder() +// .value(ReviewablePsa.builder() +// .document(samplePsaDocument) +// .build()) +// .build()) +// ), +// +// // Test with a draft order and without PSAs +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingsReadyForReview(DynamicList.builder() +// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) +// .build()) +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 10, 31)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge") +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder() +// .value(DraftOrderDocumentReview.builder() +// .draftOrderDocument(sampleDraftOrderDocument) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) +// .build(), +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .build(), +// List.of(ReviewableDraftOrderCollection.builder() +// .value(ReviewableDraftOrder.builder() +// .document(sampleDraftOrderDocument) +// .attachments(List.of( +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) +// .build(), +// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) +// .build() +// )) +// .build()) +// .build()), +// Collections.emptyList() +// ), +// +// // Test with a psa and without draft order +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingsReadyForReview(DynamicList.builder() +// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) +// .build()) +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 10, 31)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge") +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder() +// .psaDocument(samplePsaDocument2) +// .build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .build(), +// Collections.emptyList(), +// List.of(ReviewablePsaCollection.builder() +// .value(ReviewablePsa.builder() +// .document(samplePsaDocument2) +// .build()) +// .build()) +// ) +// ); +// } +//} From 3eb675d357eb83037c6d1d5edd1244a54dfcce50 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 09:42:10 +0000 Subject: [PATCH 035/336] add the missing filters. --- .../ApproveDraftOrdersMidEventHandler.java | 8 ++++---- .../model/ccd/wrapper/DraftOrdersWrapper.java | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index b2b67a0421..ed811791df 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -51,9 +51,9 @@ private static String buildHearingInfoFromDraftOrdersReview(Stream collection = draftOrdersWrapper.getSelectedDraftOrdersReviewCollection() + List collection = draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) .map(DraftOrdersReview::getDraftOrderDocReviewCollection) .flatMap(List::stream) @@ -71,9 +71,9 @@ private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draft } private ReviewablePsa createReviewablePsa(DraftOrdersWrapper draftOrdersWrapper, int index) { - String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersWrapper.getSelectedDraftOrdersReviewCollection()); + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection()); - List collection = draftOrdersWrapper.getSelectedDraftOrdersReviewCollection() + List collection = draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) .map(DraftOrdersReview::getPsaDocReviewCollection) .flatMap(List::stream) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index a2b9aca81d..fea50ff776 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -14,6 +14,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; @@ -80,11 +81,15 @@ public void appendDraftOrdersReviewCollection(List } @JsonIgnore - public Stream getSelectedDraftOrdersReviewCollection() { + public Stream getSelectedOutstandingDraftOrdersReviewCollection() { Stream draftOrdersStream = ofNullable(draftOrdersReviewCollection) .orElse(List.of()) .stream() - .filter(a -> a != null && a.getValue() != null); // General null filter for safety + .filter(a -> a != null && a.getValue() != null) + .filter(a -> a.getValue().getDraftOrderDocReviewCollection().stream() + .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED) + || a.getValue().getPsaDocReviewCollection().stream() + .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED)); if (hearingsReadyForReview != null) { return draftOrdersStream.filter(a -> From 268d9bf01281df90d29f3eb8f7704e52d3280ef0 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 13:12:12 +0000 Subject: [PATCH 036/336] Centralise the format hearing info logic --- ...ApproveDraftOrdersAboutToStartHandler.java | 23 ++++++++----------- .../ApproveDraftOrdersMidEventHandler.java | 19 +++++++-------- .../service/HearingService.java | 14 +++++++++++ ...oveDraftOrdersAboutToStartHandlerTest.java | 10 ++++++++ .../service/HearingServiceTest.java | 22 ++++++++++++++++++ 5 files changed, 66 insertions(+), 22 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 6adc2ccacf..1300cc4843 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -18,23 +18,23 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Optional; - -import static java.lang.String.format; @Slf4j @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { + private final HearingService hearingService; + private static final String ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; - public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper) { + public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, HearingService hearingService) { super(finremCaseDetailsMapper); + this.hearingService = hearingService; } @Override @@ -83,14 +83,11 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem hearingOptions = hearingsForReview.stream() .map(draftOrdersReview -> DynamicListElement.builder() .code(draftOrdersReview.getHearingId()) - .label(format( - "%s on %s %s by %s", - Optional.ofNullable(draftOrdersReview.getHearingType()).orElse("N/A"), - Optional.ofNullable(draftOrdersReview.getHearingDate()) - .map(date -> date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .orElse("N/A"), - Optional.ofNullable(draftOrdersReview.getHearingTime()).orElse("N/A"), - Optional.ofNullable(draftOrdersReview.getHearingJudge()).orElse("N/A") + .label( + hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), + draftOrdersReview.getHearingDate(), + draftOrdersReview.getHearingTime(), + draftOrdersReview.getHearingJudge() )) .build()) .toList(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index ed811791df..9da0994b80 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -19,18 +19,20 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.util.List; import java.util.stream.Stream; -import static java.lang.String.format; - @Slf4j @Service public class ApproveDraftOrdersMidEventHandler extends FinremCallbackHandler { - public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetailsMapper) { + private final HearingService hearingService; + + public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, HearingService hearingService) { super(finremCaseDetailsMapper); + this.hearingService = hearingService; } @Override @@ -40,13 +42,12 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType && EventType.APPROVE_ORDERS.equals(eventType); } - private static String buildHearingInfoFromDraftOrdersReview(Stream selected) { + private String buildHearingInfoFromDraftOrdersReview(Stream selected) { return selected.findFirst().map(draftOrdersReviewCollection -> - format("%s (%s:%s)", - draftOrdersReviewCollection.getValue().getHearingType(), - draftOrdersReviewCollection.getValue().getHearingDate(), - draftOrdersReviewCollection.getValue().getHearingTime())) - // TODO align the format with ApproveDraftOrdersAboutToStartHandler + hearingService.formatHearingInfo(draftOrdersReviewCollection.getValue().getHearingType(), + draftOrdersReviewCollection.getValue().getHearingDate(), + draftOrdersReviewCollection.getValue().getHearingTime(), + draftOrdersReviewCollection.getValue().getHearingJudge())) .orElse(null); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java index 13fc600961..759b1de1cc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java @@ -14,11 +14,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.utils.FinremDateUtils; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.function.Function; import static java.lang.String.format; @@ -152,4 +154,16 @@ private T getHearingInfo(FinremCaseData caseData, DynamicListElement selecte .orElse(null); // Return null if no match is found } + public String formatHearingInfo(String hearingType, LocalDate hearingDate, String hearingTime, String hearingJudge) { + return format( + "%s on %s %s by %s", + Optional.ofNullable(hearingType).orElse("N/A"), + Optional.ofNullable(hearingDate) + .map(date -> hearingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + .orElse("N/A"), + Optional.ofNullable(hearingTime).orElse("N/A"), + Optional.ofNullable(hearingJudge).orElse("N/A") + ); + } + } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index 163a020a16..51031c001d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType; @@ -18,12 +19,14 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.time.LocalDate; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; @@ -36,6 +39,9 @@ class ApproveDraftOrdersAboutToStartHandlerTest { @InjectMocks private ApproveDraftOrdersAboutToStartHandler handler; + @Mock + private HearingService hearingService; + @Test void canHandle() { assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); @@ -43,6 +49,8 @@ void canHandle() { @Test void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { + when(hearingService.formatHearingInfo("Hearing Type 1", LocalDate.of(2024, 8, 6), "09:00 A.M.", "Judge 1")) + .thenReturn("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1"); FinremCaseData caseData = spy(new FinremCaseData()); DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(TO_BE_REVIEWED) @@ -78,6 +86,8 @@ void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { @Test void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { + when(hearingService.formatHearingInfo("Hearing Type 1", LocalDate.of(2024, 8, 6), "09:00 A.M.", "Judge 1")) + .thenReturn("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1"); FinremCaseData caseData = spy(new FinremCaseData()); PsaDocumentReview document1 = PsaDocumentReview.builder().orderStatus(TO_BE_REVIEWED) .build(); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java index 3fc87dbf97..1cd62bfea5 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.junit.jupiter.MockitoExtension; @@ -490,4 +491,25 @@ void testGetHearingTime(String selectedCode, String expectedTime) { assertEquals(expectedTime, result); }); } + + @ParameterizedTest + @CsvSource({ + "'Civil', '2024-11-10', '10:30 AM', 'Judge Smith', 'Civil on 2024-11-10 10:30 AM by Judge Smith'", + "NULL, '2024-11-10', '10:30 AM', 'Judge Smith', 'N/A on 2024-11-10 10:30 AM by Judge Smith'", + "'Civil', NULL, '10:30 AM', 'Judge Smith', 'Civil on N/A 10:30 AM by Judge Smith'", + "'Civil', '2024-11-10', NULL, 'Judge Smith', 'Civil on 2024-11-10 N/A by Judge Smith'", + "'Civil', '2024-11-10', '10:30 AM', NULL, 'Civil on 2024-11-10 10:30 AM by N/A'", + "NULL, NULL, NULL, NULL, 'N/A on N/A N/A by N/A'", + "'', '2024-11-10', '', '', ' on 2024-11-10 by '" + }) + void formatHearingInfo_shouldReturnExpectedOutput(String hearingType, String hearingDate, String hearingTime, String hearingJudge, + String expectedOutput) { + LocalDate parsedHearingDate = "NULL".equals(hearingDate) ? null : LocalDate.parse(hearingDate); + String parsedHearingType = "NULL".equals(hearingType) ? null : hearingType; + String parsedHearingTime = "NULL".equals(hearingTime) ? null : hearingTime; + String parsedHearingJudge = "NULL".equals(hearingJudge) ? null : hearingJudge; + + String actualOutput = hearingService.formatHearingInfo(parsedHearingType, parsedHearingDate, parsedHearingTime, parsedHearingJudge); + assertEquals(expectedOutput, actualOutput); + } } From ffbfb2b944773bf456531ea477d3b58af669f852 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 13:33:43 +0000 Subject: [PATCH 037/336] Centralise the order status checking --- .../ApproveDraftOrdersAboutToStartHandler.java | 7 ++++--- .../ApproveDraftOrdersMidEventHandler.java | 2 ++ .../model/ccd/draftorders/review/OrderStatus.java | 4 ++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 1300cc4843..7698a2978f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -16,7 +16,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; @@ -24,6 +23,8 @@ import java.util.Comparator; import java.util.List; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; + @Slf4j @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { @@ -64,9 +65,9 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem DraftOrdersReview draftOrdersReview = reviewCollection.getValue(); boolean isReviewableHearing = draftOrdersReview.getDraftOrderDocReviewCollection().stream() - .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED) + .anyMatch(doc -> isJudgeReviewable(doc.getValue().getOrderStatus())) || draftOrdersReview.getPsaDocReviewCollection().stream() - .anyMatch(psa -> psa.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED); + .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())); //Only add hearing if there is an order or PSA with TO_BE_REVIEWED if (isReviewableHearing) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 9da0994b80..5a622bb10e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -17,6 +17,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; @@ -59,6 +60,7 @@ private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draft .map(DraftOrdersReview::getDraftOrderDocReviewCollection) .flatMap(List::stream) .map(DraftOrderDocReviewCollection::getValue) + .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) .map(a -> ReviewableDraftOrder.builder() .hearingInfo(hearingInfo) .document(a.getDraftOrderDocument()) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java index 36d8a1c998..7b5f457500 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java @@ -4,4 +4,8 @@ public enum OrderStatus { TO_BE_REVIEWED, APPROVED_BY_JUDGE, PROCESSED_BY_ADMIN; + + public static boolean isJudgeReviewable(OrderStatus status) { + return status == null || status == TO_BE_REVIEWED; + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index fea50ff776..bae953b73b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -14,7 +14,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; @@ -27,6 +26,7 @@ import static java.util.Comparator.naturalOrder; import static java.util.Comparator.nullsLast; import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @JsonIgnoreProperties(ignoreUnknown = true) @Data @@ -87,9 +87,9 @@ public Stream getSelectedOutstandingDraftOrdersRevi .stream() .filter(a -> a != null && a.getValue() != null) .filter(a -> a.getValue().getDraftOrderDocReviewCollection().stream() - .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED) + .anyMatch(draftOrderDoc -> isJudgeReviewable(draftOrderDoc.getValue().getOrderStatus())) || a.getValue().getPsaDocReviewCollection().stream() - .anyMatch(doc -> doc.getValue().getOrderStatus() == OrderStatus.TO_BE_REVIEWED)); + .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus()))); if (hearingsReadyForReview != null) { return draftOrdersStream.filter(a -> From 87513d529f9ab7f288a4db3fa78d04784df47c85 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 14:20:21 +0000 Subject: [PATCH 038/336] Update date format --- .../caseorchestration/service/HearingService.java | 2 +- .../caseorchestration/service/HearingServiceTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java index 759b1de1cc..8b467c2106 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java @@ -159,7 +159,7 @@ public String formatHearingInfo(String hearingType, LocalDate hearingDate, Strin "%s on %s %s by %s", Optional.ofNullable(hearingType).orElse("N/A"), Optional.ofNullable(hearingDate) - .map(date -> hearingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + .map(date -> hearingDate.format(DateTimeFormatter.ofPattern("dd MMMM yyyy"))) .orElse("N/A"), Optional.ofNullable(hearingTime).orElse("N/A"), Optional.ofNullable(hearingJudge).orElse("N/A") diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java index 1cd62bfea5..06fe0268c1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java @@ -494,13 +494,13 @@ void testGetHearingTime(String selectedCode, String expectedTime) { @ParameterizedTest @CsvSource({ - "'Civil', '2024-11-10', '10:30 AM', 'Judge Smith', 'Civil on 2024-11-10 10:30 AM by Judge Smith'", - "NULL, '2024-11-10', '10:30 AM', 'Judge Smith', 'N/A on 2024-11-10 10:30 AM by Judge Smith'", + "'Civil', '2024-11-10', '10:30 AM', 'Judge Smith', 'Civil on 10 November 2024 10:30 AM by Judge Smith'", + "NULL, '2024-11-10', '10:30 AM', 'Judge Smith', 'N/A on 10 November 2024 10:30 AM by Judge Smith'", "'Civil', NULL, '10:30 AM', 'Judge Smith', 'Civil on N/A 10:30 AM by Judge Smith'", - "'Civil', '2024-11-10', NULL, 'Judge Smith', 'Civil on 2024-11-10 N/A by Judge Smith'", - "'Civil', '2024-11-10', '10:30 AM', NULL, 'Civil on 2024-11-10 10:30 AM by N/A'", + "'Civil', '2024-11-10', NULL, 'Judge Smith', 'Civil on 10 November 2024 N/A by Judge Smith'", + "'Civil', '2024-11-10', '10:30 AM', NULL, 'Civil on 10 November 2024 10:30 AM by N/A'", "NULL, NULL, NULL, NULL, 'N/A on N/A N/A by N/A'", - "'', '2024-11-10', '', '', ' on 2024-11-10 by '" + "'', '2024-11-10', '', '', ' on 10 November 2024 by '" }) void formatHearingInfo_shouldReturnExpectedOutput(String hearingType, String hearingDate, String hearingTime, String hearingJudge, String expectedOutput) { From eab8275eff2984791182fb3458e32bf81bb1cb1c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 15:02:45 +0000 Subject: [PATCH 039/336] fixing wrong hearing info --- .../ApproveDraftOrdersMidEventHandler.java | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 5a622bb10e..2a6d667880 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -23,7 +23,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.util.List; -import java.util.stream.Stream; @Slf4j @Service @@ -43,30 +42,29 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType && EventType.APPROVE_ORDERS.equals(eventType); } - private String buildHearingInfoFromDraftOrdersReview(Stream selected) { - return selected.findFirst().map(draftOrdersReviewCollection -> - hearingService.formatHearingInfo(draftOrdersReviewCollection.getValue().getHearingType(), - draftOrdersReviewCollection.getValue().getHearingDate(), - draftOrdersReviewCollection.getValue().getHearingTime(), - draftOrdersReviewCollection.getValue().getHearingJudge())) - .orElse(null); + private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrdersReview) { + return hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), + draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); } private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draftOrdersWrapper, int index) { - String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection()); - + // Build a collection of reviewable draft orders with specific hearingInfo for each item List collection = draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) - .map(DraftOrdersReview::getDraftOrderDocReviewCollection) - .flatMap(List::stream) - .map(DraftOrderDocReviewCollection::getValue) - .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) - .map(a -> ReviewableDraftOrder.builder() - .hearingInfo(hearingInfo) - .document(a.getDraftOrderDocument()) - .attachments(a.getAttachments()) - .build()) + .flatMap(draftOrdersReview -> { + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); + return draftOrdersReview.getDraftOrderDocReviewCollection().stream() + .map(DraftOrderDocReviewCollection::getValue) + .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) + .map(a -> ReviewableDraftOrder.builder() + .hearingInfo(hearingInfo) // Set specific hearingInfo for each item + .document(a.getDraftOrderDocument()) + .attachments(a.getAttachments()) + .build()); + }) // Flatten the stream of streams .toList(); + + // Return the specified item if it exists in the collection, otherwise return null if (collection.size() < index) { return null; } @@ -74,18 +72,22 @@ private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draft } private ReviewablePsa createReviewablePsa(DraftOrdersWrapper draftOrdersWrapper, int index) { - String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection()); - + // Build a collection of reviewable draft orders with specific hearingInfo for each item List collection = draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) - .map(DraftOrdersReview::getPsaDocReviewCollection) - .flatMap(List::stream) - .map(PsaDocReviewCollection::getValue) - .map(a -> ReviewablePsa.builder() - .hearingInfo(hearingInfo) - .document(a.getPsaDocument()) - .build()) + .flatMap(draftOrdersReview -> { + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); + return draftOrdersReview.getPsaDocReviewCollection().stream() + .map(PsaDocReviewCollection::getValue) + .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) + .map(a -> ReviewablePsa.builder() + .hearingInfo(hearingInfo) + .document(a.getPsaDocument()) + .build()); + }) // Flatten the stream of streams .toList(); + + // Return the specified item if it exists in the collection, otherwise return null if (collection.size() < index) { return null; } From 9e74b74dda0898a1741b9c8197da65a166c9ec69 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 15:03:57 +0000 Subject: [PATCH 040/336] Method renamed --- .../approvedraftorders/ApproveDraftOrdersMidEventHandler.java | 4 ++-- .../model/ccd/wrapper/DraftOrdersWrapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 2a6d667880..196520272a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -49,7 +49,7 @@ private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrde private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draftOrdersWrapper, int index) { // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection() + List collection = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); @@ -73,7 +73,7 @@ private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draft private ReviewablePsa createReviewablePsa(DraftOrdersWrapper draftOrdersWrapper, int index) { // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = draftOrdersWrapper.getSelectedOutstandingDraftOrdersReviewCollection() + List collection = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection() .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index bae953b73b..8cbb28cad2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -81,7 +81,7 @@ public void appendDraftOrdersReviewCollection(List } @JsonIgnore - public Stream getSelectedOutstandingDraftOrdersReviewCollection() { + public Stream getOutstandingDraftOrdersReviewCollection() { Stream draftOrdersStream = ofNullable(draftOrdersReviewCollection) .orElse(List.of()) .stream() From 13a93885403ce052f0475a19f1bc97a77c6b93ec Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 15:17:09 +0000 Subject: [PATCH 041/336] typo --- .../ApproveDraftOrdersMidEventHandler.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 196520272a..cec803e964 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -23,6 +23,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.util.List; +import java.util.stream.Stream; @Slf4j @Service @@ -47,9 +48,9 @@ private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrde draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); } - private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draftOrdersWrapper, int index) { + private ReviewableDraftOrder createReviewableDraftOrder(Stream outstanding, int index) { // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection() + List collection = outstanding .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); @@ -71,9 +72,9 @@ private ReviewableDraftOrder createReviewableDraftOrder(DraftOrdersWrapper draft return collection.get(index - 1); } - private ReviewablePsa createReviewablePsa(DraftOrdersWrapper draftOrdersWrapper, int index) { + private ReviewablePsa createReviewablePsa(Stream outstanding, int index) { // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection() + List collection = outstanding .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); @@ -103,18 +104,19 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + Stream outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() - .reviewablePsa1(createReviewablePsa(draftOrdersWrapper,1)) - .reviewablePsa2(createReviewablePsa(draftOrdersWrapper,2)) - .reviewablePsa3(createReviewablePsa(draftOrdersWrapper,3)) - .reviewablePsa4(createReviewablePsa(draftOrdersWrapper,4)) - .reviewablePsa5(createReviewablePsa(draftOrdersWrapper,5)) - .reviewableDraftOrder1(createReviewableDraftOrder(draftOrdersWrapper, 1)) - .reviewableDraftOrder2(createReviewableDraftOrder(draftOrdersWrapper, 2)) - .reviewableDraftOrder3(createReviewableDraftOrder(draftOrdersWrapper, 3)) - .reviewableDraftOrder4(createReviewableDraftOrder(draftOrdersWrapper, 4)) - .reviewableDraftOrder5(createReviewableDraftOrder(draftOrdersWrapper, 5)) + .reviewablePsa1(createReviewablePsa(outstanding,1)) + .reviewablePsa2(createReviewablePsa(outstanding,2)) + .reviewablePsa3(createReviewablePsa(outstanding,3)) + .reviewablePsa4(createReviewablePsa(outstanding,4)) + .reviewablePsa5(createReviewablePsa(outstanding,5)) + .reviewableDraftOrder1(createReviewableDraftOrder(outstanding, 1)) + .reviewableDraftOrder2(createReviewableDraftOrder(outstanding, 2)) + .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) + .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) + .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) .build()); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); From ecf70d33ce617ace22c14212c81141f9c5f66544 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 16:43:22 +0000 Subject: [PATCH 042/336] Show warning message to judge --- .../ApproveDraftOrdersMidEventHandler.java | 24 ++++++++++++------- .../judgeapproval/JudgeApproval.java | 5 ++-- .../model/ccd/wrapper/DraftOrdersWrapper.java | 7 +++--- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index cec803e964..840c11c3fc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -23,7 +23,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.util.List; -import java.util.stream.Stream; @Slf4j @Service @@ -48,9 +47,8 @@ private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrde draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); } - private ReviewableDraftOrder createReviewableDraftOrder(Stream outstanding, int index) { - // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = outstanding + private List getReviewableDraftOrders(List outstanding) { + return outstanding.stream() .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); @@ -64,7 +62,11 @@ private ReviewableDraftOrder createReviewableDraftOrder(Stream outstanding, int index) { + // Build a collection of reviewable draft orders with specific hearingInfo for each item + List collection = getReviewableDraftOrders(outstanding); // Return the specified item if it exists in the collection, otherwise return null if (collection.size() < index) { return null; @@ -72,9 +74,8 @@ private ReviewableDraftOrder createReviewableDraftOrder(Stream outstanding, int index) { - // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = outstanding + private List getReviewablePsas(List outstanding) { + return outstanding.stream() .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); @@ -87,7 +88,11 @@ private ReviewablePsa createReviewablePsa(Stream ou .build()); }) // Flatten the stream of streams .toList(); + } + private ReviewablePsa createReviewablePsa(List outstanding, int index) { + // Build a collection of reviewable draft orders with specific hearingInfo for each item + List collection = getReviewablePsas(outstanding); // Return the specified item if it exists in the collection, otherwise return null if (collection.size() < index) { return null; @@ -104,7 +109,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - Stream outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); + List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() .reviewablePsa1(createReviewablePsa(outstanding,1)) @@ -117,6 +122,9 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) + .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 + ? ("This page is limited to showing only 5 draft orders/PSAs requiring review. " + + "There are additional draft orders/PSAs requiring review that are not shown.") : null) .build()); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 2be14a0be8..86fdd777fe 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -6,7 +6,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; @JsonIgnoreProperties(ignoreUnknown = true) @Data @@ -16,14 +15,14 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class JudgeApproval { - private YesOrNo showMoreDraftOrdersMessage; + private String warningMessageToJudge; + private ReviewableDraftOrder reviewableDraftOrder1; private ReviewableDraftOrder reviewableDraftOrder2; private ReviewableDraftOrder reviewableDraftOrder3; private ReviewableDraftOrder reviewableDraftOrder4; private ReviewableDraftOrder reviewableDraftOrder5; - private YesOrNo showMorePsasMessage; private ReviewablePsa reviewablePsa1; private ReviewablePsa reviewablePsa2; private ReviewablePsa reviewablePsa3; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 8cbb28cad2..3e0ba6edec 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -81,7 +81,7 @@ public void appendDraftOrdersReviewCollection(List } @JsonIgnore - public Stream getOutstandingDraftOrdersReviewCollection() { + public List getOutstandingDraftOrdersReviewCollection() { Stream draftOrdersStream = ofNullable(draftOrdersReviewCollection) .orElse(List.of()) .stream() @@ -93,12 +93,13 @@ public Stream getOutstandingDraftOrdersReviewCollec if (hearingsReadyForReview != null) { return draftOrdersStream.filter(a -> - hearingsReadyForReview.getValueCode().equals(a.getValue().getHearingId())); + hearingsReadyForReview.getValueCode().equals(a.getValue().getHearingId())).toList(); } else { return draftOrdersStream.sorted( Comparator.comparing((DraftOrdersReviewCollection a) -> a.getValue().getHearingDate(), nullsLast(naturalOrder())) .thenComparing(a -> a.getValue().getHearingTime(), nullsLast(naturalOrder())) - .thenComparing(a -> a.getValue().getHearingType(), nullsLast(naturalOrder()))); + .thenComparing(a -> a.getValue().getHearingType(), nullsLast(naturalOrder()))) + .toList(); } } From cb9c0fc21a2e55244c8296c85889407d4720e795 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 16:46:31 +0000 Subject: [PATCH 043/336] update message --- .../approvedraftorders/ApproveDraftOrdersMidEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java index 840c11c3fc..fe796aa022 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java @@ -123,8 +123,8 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 - ? ("This page is limited to showing only 5 draft orders/PSAs requiring review. " - + "There are additional draft orders/PSAs requiring review that are not shown.") : null) + ? ("This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + + "There are additional draft orders/pension sharing annexes requiring review that are not shown.") : null) .build()); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); From 38aae3fc151fe13c42051a523ff9937193a018c3 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 17:40:00 +0000 Subject: [PATCH 044/336] Unit tests (WIP) --- ...ApproveDraftOrdersMidEventHandlerTest.java | 477 +++++++----------- 1 file changed, 169 insertions(+), 308 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java index f2880331de..8e043ef7c0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,308 +1,169 @@ -//package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; -// -//import org.junit.jupiter.api.DisplayName; -//import org.junit.jupiter.api.Test; -//import org.junit.jupiter.api.extension.ExtendWith; -//import org.junit.jupiter.params.ParameterizedTest; -//import org.junit.jupiter.params.provider.Arguments; -//import org.junit.jupiter.params.provider.MethodSource; -//import org.mockito.InjectMocks; -//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.handler.FinremCallbackRequest; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; -//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.draftorders.CaseDocumentCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -// -//import java.time.LocalDate; -//import java.util.Collections; -//import java.util.List; -//import java.util.stream.Stream; -// -//import static org.junit.jupiter.api.Assertions.assertEquals; -//import static org.junit.jupiter.api.Assertions.assertNotNull; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; -// -//@ExtendWith(MockitoExtension.class) -//class ApproveDraftOrdersMidEventHandlerTest { -// -// @InjectMocks -// private ApproveDraftOrdersMidEventHandler handler; -// -// @Test -// void canHandle() { -// assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); -// } -// -// @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrders={1}, expectedReviewablePsa={2}") -// @MethodSource("provideDraftOrderData") -// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") -// void handle_withVariousDraftOrdersWrapperData( -// DraftOrdersWrapper draftOrdersWrapper, -// List expectedReviewableDraftOrders, -// List expectedReviewablePsa) { -// -// // Arrange -// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() -// .caseDetails(FinremCaseDetails.builder() -// .id(12345L) -// .data(FinremCaseData.builder() -// .draftOrdersWrapper(draftOrdersWrapper) -// .build()) -// .build()) -// .build(); -// -// // Act -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); -// -// // Assert -// assertNotNull(response); -// FinremCaseData responseData = response.getData(); -// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); -// -// assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); -// assertEquals(expectedReviewableDraftOrders, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrderCollection()); -// assertEquals(expectedReviewablePsa, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsaCollection()); -// } -// -// private static final String HEARING_ID_MATCH = "2024-10-31$$09:00$$hearingType$$Mr. Judge"; -// -// private static Stream provideDraftOrderData() { -// CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); -// CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); -// CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); -// CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); -// -// return Stream.of( -// // Test with empty DraftOrdersWrapper -// Arguments.of( -// DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), -// Collections.emptyList(), -// Collections.emptyList() -// ), -// -// // Test with non-empty DraftOrdersWrapper with one draft order and one PSA -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingsReadyForReview(DynamicList.builder() -// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) -// .build()) -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 10, 31)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge") -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder() -// .value(DraftOrderDocumentReview.builder() -// .draftOrderDocument(sampleDraftOrderDocument) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) -// .build())) -// .build()) -// .build() -// )) -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder() -// .psaDocument(samplePsaDocument) -// .build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .build(), -// List.of(ReviewableDraftOrderCollection.builder() -// .value(ReviewableDraftOrder.builder() -// .document(sampleDraftOrderDocument) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) -// .build())) -// .build()) -// .build()), -// List.of(ReviewablePsaCollection.builder() -// .value(ReviewablePsa.builder() -// .document(samplePsaDocument) -// .build()) -// .build()) -// ), -// -// // Test with multiple draft orders and PSAs -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingsReadyForReview(DynamicList.builder() -// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) -// .build()) -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 10, 31)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge") -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder() -// .value(DraftOrderDocumentReview.builder() -// .draftOrderDocument(sampleDraftOrderDocument) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) -// .build(), -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder() -// .psaDocument(samplePsaDocument) -// .build()) -// .build() -// )) -// .build()) -// .build(), -// -// DraftOrdersReviewCollection.builder() -// .value(DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 11, 30)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge") -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder() -// .value(DraftOrderDocumentReview.builder() -// .draftOrderDocument(sampleDraftOrderDocument2) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment3").build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder() -// .psaDocument(samplePsaDocument2) -// .build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .build(), -// List.of(ReviewableDraftOrderCollection.builder() -// .value(ReviewableDraftOrder.builder() -// .document(sampleDraftOrderDocument) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) -// .build(), -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) -// .build() -// )) -// .build()) -// .build()), -// List.of(ReviewablePsaCollection.builder() -// .value(ReviewablePsa.builder() -// .document(samplePsaDocument) -// .build()) -// .build()) -// ), -// -// // Test with a draft order and without PSAs -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingsReadyForReview(DynamicList.builder() -// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) -// .build()) -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 10, 31)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge") -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder() -// .value(DraftOrderDocumentReview.builder() -// .draftOrderDocument(sampleDraftOrderDocument) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) -// .build(), -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .build(), -// List.of(ReviewableDraftOrderCollection.builder() -// .value(ReviewableDraftOrder.builder() -// .document(sampleDraftOrderDocument) -// .attachments(List.of( -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment1").build()) -// .build(), -// CaseDocumentCollection.builder().value(CaseDocument.builder().documentFilename("attachment2").build()) -// .build() -// )) -// .build()) -// .build()), -// Collections.emptyList() -// ), -// -// // Test with a psa and without draft order -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingsReadyForReview(DynamicList.builder() -// .value(DynamicListElement.builder().code(HEARING_ID_MATCH).build()) -// .build()) -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 10, 31)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge") -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder() -// .psaDocument(samplePsaDocument2) -// .build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .build(), -// Collections.emptyList(), -// List.of(ReviewablePsaCollection.builder() -// .value(ReviewablePsa.builder() -// .document(samplePsaDocument2) -// .build()) -// .build()) -// ) -// ); -// } -//} +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +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.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; + +import java.time.LocalDate; +import java.util.List; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.lenient; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersMidEventHandlerTest { + + @Mock + private HearingService hearingService; + + @InjectMocks + private ApproveDraftOrdersMidEventHandler handler; + + @Test + void canHandle() { + assertCanHandle(handler, Arguments.of(CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS), + Arguments.of(CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS)); + } + + @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," + + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," + + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" + + "expectedReviewablePsa5={10}, expectedWarningMessageToJudge={11}") + @MethodSource("provideDraftOrderData") + @DisplayName("Test handle method with different DraftOrdersWrapper inputs") + void handle_withVariousDraftOrdersWrapperData( + DraftOrdersWrapper draftOrdersWrapper, + ReviewableDraftOrder expectedReviewableDraftOrder1, ReviewableDraftOrder expectedReviewableDraftOrder2, + ReviewableDraftOrder expectedReviewableDraftOrder3, ReviewableDraftOrder expectedReviewableDraftOrder4, + ReviewableDraftOrder expectedReviewableDraftOrder5, + ReviewablePsa expectedReviewablePsa1, ReviewablePsa expectedReviewablePsa2, ReviewablePsa expectedReviewablePsa3, + ReviewablePsa expectedReviewablePsa4, ReviewablePsa expectedReviewablePsa5, + String expectedWarningMessageToJudge) { + + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build()) + .build(); + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) + .thenReturn("hearingServiceFormattedString1"); + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) + .thenReturn("hearingServiceFormattedString2"); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); + assertEquals(expectedReviewableDraftOrder1, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder1()); + assertEquals(expectedReviewablePsa1, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa1()); + assertEquals(expectedReviewableDraftOrder2, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder2()); + assertEquals(expectedReviewablePsa2, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa2()); + assertEquals(expectedReviewableDraftOrder3, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder3()); + assertEquals(expectedReviewablePsa3, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa3()); + assertEquals(expectedReviewableDraftOrder4, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder4()); + assertEquals(expectedReviewablePsa4, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa4()); + assertEquals(expectedReviewableDraftOrder5, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder5()); + assertEquals(expectedReviewablePsa5, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa5()); + assertEquals(expectedWarningMessageToJudge, responseDraftOrdersWrapper.getJudgeApproval().getWarningMessageToJudge()); + } + + private static Stream provideDraftOrderData() { + CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); + CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); + CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); + CaseDocument attachment1 = CaseDocument.builder().documentFilename("attachment1").build(); + + String warningMessage = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; + + return Stream.of( + // Test with non-empty DraftOrdersWrapper with one draft order and one PSA + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(sampleDraftOrderDocument) + .attachments(List.of( + CaseDocumentCollection.builder().value(attachment1) + .build())) + .build()) + .build() + )) + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder() + .psaDocument(samplePsaDocument) + .build()) + .build() + )) + .build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder1 + ReviewableDraftOrder.builder() + .hearingInfo("hearingServiceFormattedString1") + .document(sampleDraftOrderDocument) + .attachments(List.of(CaseDocumentCollection.builder().value(attachment1).build())) + .hasAttachment(YesOrNo.YES) + .build(), + null, null, null, null, + // expectedReviewablePsa1 + ReviewablePsa.builder() + .hearingInfo("hearingServiceFormattedString1") + .document(samplePsaDocument) + .build(), + null, null, null, null, + // expectedWarningMessageToJudge + null) + ); + } +} From c65b61b46131c03f1f1bad7cb078a51463285033 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 13 Nov 2024 17:42:25 +0000 Subject: [PATCH 045/336] Test case for empty DraftOrderWrapper --- .../ApproveDraftOrdersMidEventHandlerTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java index 8e043ef7c0..53e7eb547f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java @@ -31,6 +31,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.time.LocalDate; +import java.util.Collections; import java.util.List; import java.util.stream.Stream; @@ -117,6 +118,13 @@ private static Stream provideDraftOrderData() { + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; return Stream.of( + // Test with empty DraftOrdersWrapper + Arguments.of( + DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), + null, null, null, null, null, + null, null, null, null, null, + null + ), // Test with non-empty DraftOrdersWrapper with one draft order and one PSA Arguments.of( DraftOrdersWrapper.builder() From 2dd638c9bbd0e79d8e93a7c359454729867fc0e3 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 10:16:49 +0000 Subject: [PATCH 046/336] Remove hearing selection page. --- ...ApproveDraftOrdersAboutToStartHandler.java | 161 +++++++++----- .../ApproveDraftOrdersMidEventHandler.java | 132 ----------- .../model/ccd/wrapper/DraftOrdersWrapper.java | 20 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 207 ++++++++++++++++-- ...ApproveDraftOrdersMidEventHandlerTest.java | 177 --------------- 5 files changed, 300 insertions(+), 397 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java delete mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 7698a2978f..a249924f81 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -10,17 +10,20 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; 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.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @@ -29,10 +32,10 @@ @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { - private final HearingService hearingService; - private static final String ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; + private final HearingService hearingService; + public ApproveDraftOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, HearingService hearingService) { super(finremCaseDetailsMapper); this.hearingService = hearingService; @@ -45,66 +48,116 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType && EventType.APPROVE_ORDERS.equals(eventType); } + private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrdersReview) { + return hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), + draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); + } + + private List getReviewableDraftOrders(List outstanding) { + return outstanding.stream() + .map(DraftOrdersReviewCollection::getValue) + .flatMap(draftOrdersReview -> { + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); + return draftOrdersReview.getDraftOrderDocReviewCollection().stream() + .map(DraftOrderDocReviewCollection::getValue) + .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) + .map(a -> ReviewableDraftOrder.builder() + .hearingInfo(hearingInfo) // Set specific hearingInfo for each item + .document(a.getDraftOrderDocument()) + .attachments(a.getAttachments()) + .build()); + }) // Flatten the stream of streams + .toList(); + } + + private ReviewableDraftOrder createReviewableDraftOrder(List outstanding, int index) { + // Build a collection of reviewable draft orders with specific hearingInfo for each item + List collection = getReviewableDraftOrders(outstanding); + // Return the specified item if it exists in the collection, otherwise return null + if (collection.size() < index) { + return null; + } + return collection.get(index - 1); + } + + private List getReviewablePsas(List outstanding) { + return outstanding.stream() + .map(DraftOrdersReviewCollection::getValue) + .flatMap(draftOrdersReview -> { + String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); + return draftOrdersReview.getPsaDocReviewCollection().stream() + .map(PsaDocReviewCollection::getValue) + .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) + .map(a -> ReviewablePsa.builder() + .hearingInfo(hearingInfo) + .document(a.getPsaDocument()) + .build()); + }) // Flatten the stream of streams + .toList(); + } + + private ReviewablePsa createReviewablePsa(List outstanding, int index) { + // Build a collection of reviewable draft orders with specific hearingInfo for each item + List collection = getReviewablePsas(outstanding); + // Return the specified item if it exists in the collection, otherwise return null + if (collection.size() < index) { + return null; + } + return collection.get(index - 1); + } + @Override public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, String userAuthorisation) { - List errors = new ArrayList<>(); FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); String caseId = String.valueOf(caseDetails.getId()); - log.info("Invoking contested {} about to start callback for Case ID: {}", callbackRequest.getEventType(), caseId); + log.info("Invoking contested {} mid event callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - List hearingOptions = new ArrayList<>(); - List hearingsForReview = new ArrayList<>(); - - //Check each hearing in draftOrdersReviewCollection - if (!ObjectUtils.isEmpty(draftOrdersWrapper.getDraftOrdersReviewCollection())) { - for (DraftOrdersReviewCollection reviewCollection : draftOrdersWrapper.getDraftOrdersReviewCollection()) { - DraftOrdersReview draftOrdersReview = reviewCollection.getValue(); - - boolean isReviewableHearing = draftOrdersReview.getDraftOrderDocReviewCollection().stream() - .anyMatch(doc -> isJudgeReviewable(doc.getValue().getOrderStatus())) - || draftOrdersReview.getPsaDocReviewCollection().stream() - .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())); - - //Only add hearing if there is an order or PSA with TO_BE_REVIEWED - if (isReviewableHearing) { - hearingsForReview.add(draftOrdersReview); - } - } - if (ObjectUtils.isEmpty(hearingsForReview)) { - errors.add(ERROR_MESSAGE); - } - - //Sort the hearings by date - hearingsForReview.sort(Comparator.comparing(DraftOrdersReview::getHearingDate)); - - hearingOptions = hearingsForReview.stream() - .map(draftOrdersReview -> DynamicListElement.builder() - .code(draftOrdersReview.getHearingId()) - .label( - hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), - draftOrdersReview.getHearingDate(), - draftOrdersReview.getHearingTime(), - draftOrdersReview.getHearingJudge() - )) - .build()) - .toList(); - } else { - errors.add(ERROR_MESSAGE); + List errors = validateDraftOrdersWrapper(draftOrdersWrapper); + if (errors.isEmpty()) { + List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); + + draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() + .reviewablePsa1(createReviewablePsa(outstanding, 1)) + .reviewablePsa2(createReviewablePsa(outstanding, 2)) + .reviewablePsa3(createReviewablePsa(outstanding, 3)) + .reviewablePsa4(createReviewablePsa(outstanding, 4)) + .reviewablePsa5(createReviewablePsa(outstanding, 5)) + .reviewableDraftOrder1(createReviewableDraftOrder(outstanding, 1)) + .reviewableDraftOrder2(createReviewableDraftOrder(outstanding, 2)) + .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) + .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) + .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) + .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 + ? ("This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + + "There are additional draft orders/pension sharing annexes requiring review that are not shown.") : null) + .build()); } - //Set the filtered hearings in the DynamicList - DynamicList hearingsReadyForReview = DynamicList.builder() - .value(null) - .listItems(hearingOptions) - .build(); - draftOrdersWrapper.setHearingsReadyForReview(hearingsReadyForReview); - - return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(finremCaseData).errors(errors).build(); + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).errors(errors).build(); + } + private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWrapper) { + List errors = new ArrayList<>(); + if (ObjectUtils.isEmpty(draftOrdersWrapper.getDraftOrdersReviewCollection())) { + errors.add(ERROR_MESSAGE); + return errors; + } + boolean hasReviewableHearing = draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + .map(DraftOrdersReviewCollection::getValue) + .anyMatch(review -> review.getDraftOrderDocReviewCollection().stream() + .anyMatch(doc -> isJudgeReviewable(doc.getValue().getOrderStatus())) + || review.getPsaDocReviewCollection().stream() + .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())) + ); + + if (!hasReviewableHearing) { + errors.add(ERROR_MESSAGE); + } + return errors; } + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java deleted file mode 100644 index fe796aa022..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandler.java +++ /dev/null @@ -1,132 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -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.handler.FinremCallbackHandler; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -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.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; - -import java.util.List; - -@Slf4j -@Service -public class ApproveDraftOrdersMidEventHandler extends FinremCallbackHandler { - - private final HearingService hearingService; - - public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, HearingService hearingService) { - super(finremCaseDetailsMapper); - this.hearingService = hearingService; - } - - @Override - public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return (CallbackType.MID_EVENT.equals(callbackType) || CallbackType.ABOUT_TO_START.equals(callbackType)) - && CaseType.CONTESTED.equals(caseType) - && EventType.APPROVE_ORDERS.equals(eventType); - } - - private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrdersReview) { - return hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), - draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); - } - - private List getReviewableDraftOrders(List outstanding) { - return outstanding.stream() - .map(DraftOrdersReviewCollection::getValue) - .flatMap(draftOrdersReview -> { - String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); - return draftOrdersReview.getDraftOrderDocReviewCollection().stream() - .map(DraftOrderDocReviewCollection::getValue) - .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) - .map(a -> ReviewableDraftOrder.builder() - .hearingInfo(hearingInfo) // Set specific hearingInfo for each item - .document(a.getDraftOrderDocument()) - .attachments(a.getAttachments()) - .build()); - }) // Flatten the stream of streams - .toList(); - } - - private ReviewableDraftOrder createReviewableDraftOrder(List outstanding, int index) { - // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = getReviewableDraftOrders(outstanding); - // Return the specified item if it exists in the collection, otherwise return null - if (collection.size() < index) { - return null; - } - return collection.get(index - 1); - } - - private List getReviewablePsas(List outstanding) { - return outstanding.stream() - .map(DraftOrdersReviewCollection::getValue) - .flatMap(draftOrdersReview -> { - String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); - return draftOrdersReview.getPsaDocReviewCollection().stream() - .map(PsaDocReviewCollection::getValue) - .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) - .map(a -> ReviewablePsa.builder() - .hearingInfo(hearingInfo) - .document(a.getPsaDocument()) - .build()); - }) // Flatten the stream of streams - .toList(); - } - - private ReviewablePsa createReviewablePsa(List outstanding, int index) { - // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = getReviewablePsas(outstanding); - // Return the specified item if it exists in the collection, otherwise return null - if (collection.size() < index) { - return null; - } - return collection.get(index - 1); - } - - @Override - public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, - String userAuthorisation) { - FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); - String caseId = String.valueOf(caseDetails.getId()); - log.info("Invoking contested {} mid event callback for Case ID: {}", callbackRequest.getEventType(), caseId); - - FinremCaseData finremCaseData = caseDetails.getData(); - DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); - - draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() - .reviewablePsa1(createReviewablePsa(outstanding,1)) - .reviewablePsa2(createReviewablePsa(outstanding,2)) - .reviewablePsa3(createReviewablePsa(outstanding,3)) - .reviewablePsa4(createReviewablePsa(outstanding,4)) - .reviewablePsa5(createReviewablePsa(outstanding,5)) - .reviewableDraftOrder1(createReviewableDraftOrder(outstanding, 1)) - .reviewableDraftOrder2(createReviewableDraftOrder(outstanding, 2)) - .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) - .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) - .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) - .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 - ? ("This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " - + "There are additional draft orders/pension sharing annexes requiring review that are not shown.") : null) - .build()); - - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); - } -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 3e0ba6edec..0dfe9496ee 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -8,7 +8,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -39,9 +38,6 @@ public class DraftOrdersWrapper implements HasCaseDocument { private String typeOfDraftOrder; private YesOrNo showUploadPartyQuestion; - @JsonProperty("hearingsReadyForReview") - private DynamicList hearingsReadyForReview; - @JsonProperty("uploadSuggestedDraftOrder") private UploadSuggestedDraftOrder uploadSuggestedDraftOrder; @JsonProperty("uploadAgreedDraftOrder") @@ -90,17 +86,11 @@ public List getOutstandingDraftOrdersReviewCollecti .anyMatch(draftOrderDoc -> isJudgeReviewable(draftOrderDoc.getValue().getOrderStatus())) || a.getValue().getPsaDocReviewCollection().stream() .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus()))); - - if (hearingsReadyForReview != null) { - return draftOrdersStream.filter(a -> - hearingsReadyForReview.getValueCode().equals(a.getValue().getHearingId())).toList(); - } else { - return draftOrdersStream.sorted( - Comparator.comparing((DraftOrdersReviewCollection a) -> a.getValue().getHearingDate(), nullsLast(naturalOrder())) - .thenComparing(a -> a.getValue().getHearingTime(), nullsLast(naturalOrder())) - .thenComparing(a -> a.getValue().getHearingType(), nullsLast(naturalOrder()))) - .toList(); - } + return draftOrdersStream.sorted( + Comparator.comparing((DraftOrdersReviewCollection a) -> a.getValue().getHearingDate(), nullsLast(naturalOrder())) + .thenComparing(a -> a.getValue().getHearingTime(), nullsLast(naturalOrder())) + .thenComparing(a -> a.getValue().getHearingType(), nullsLast(naturalOrder()))) + .toList(); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index 51031c001d..ce9a3128ab 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -1,32 +1,47 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; 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.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; 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.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.time.LocalDate; +import java.util.Collections; import java.util.List; +import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; @@ -36,12 +51,12 @@ @ExtendWith(MockitoExtension.class) class ApproveDraftOrdersAboutToStartHandlerTest { - @InjectMocks - private ApproveDraftOrdersAboutToStartHandler handler; - @Mock private HearingService hearingService; + @InjectMocks + private ApproveDraftOrdersAboutToStartHandler handler; + @Test void canHandle() { assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); @@ -49,8 +64,6 @@ void canHandle() { @Test void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { - when(hearingService.formatHearingInfo("Hearing Type 1", LocalDate.of(2024, 8, 6), "09:00 A.M.", "Judge 1")) - .thenReturn("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1"); FinremCaseData caseData = spy(new FinremCaseData()); DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(TO_BE_REVIEWED) @@ -77,17 +90,10 @@ void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { assertThat(response).isNotNull(); assertThat(response.getErrors()).isEmpty(); - - DynamicList hearingsReadyForReview = caseData.getDraftOrdersWrapper().getHearingsReadyForReview(); - assertThat(hearingsReadyForReview).isNotNull(); - Assertions.assertEquals(1, hearingsReadyForReview.getListItems().size()); - Assertions.assertEquals("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); } @Test void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { - when(hearingService.formatHearingInfo("Hearing Type 1", LocalDate.of(2024, 8, 6), "09:00 A.M.", "Judge 1")) - .thenReturn("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1"); FinremCaseData caseData = spy(new FinremCaseData()); PsaDocumentReview document1 = PsaDocumentReview.builder().orderStatus(TO_BE_REVIEWED) .build(); @@ -109,11 +115,6 @@ void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { assertThat(response).isNotNull(); assertThat(response.getErrors()).isEmpty(); - - DynamicList hearingsReadyForReview = caseData.getDraftOrdersWrapper().getHearingsReadyForReview(); - assertThat(hearingsReadyForReview).isNotNull(); - Assertions.assertEquals(1, hearingsReadyForReview.getListItems().size()); - Assertions.assertEquals("Hearing Type 1 on 2024-08-06 09:00 A.M. by Judge 1", hearingsReadyForReview.getListItems().get(0).getLabel()); } @Test @@ -156,4 +157,172 @@ void givenUserHasDraftOrders_whenHandle_thenReturnError() { assertThat(response.getErrors()).contains("There are no draft orders or pension sharing annexes to review."); } + @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," + + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," + + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" + + "expectedReviewablePsa5={10}, expectedWarningMessageToJudge={11}") + @MethodSource("provideDraftOrderData") + @DisplayName("Test handle method with different DraftOrdersWrapper inputs") + void handle_withVariousDraftOrdersWrapperData( + DraftOrdersWrapper draftOrdersWrapper, + ReviewableDraftOrder expectedReviewableDraftOrder1, ReviewableDraftOrder expectedReviewableDraftOrder2, + ReviewableDraftOrder expectedReviewableDraftOrder3, ReviewableDraftOrder expectedReviewableDraftOrder4, + ReviewableDraftOrder expectedReviewableDraftOrder5, + ReviewablePsa expectedReviewablePsa1, ReviewablePsa expectedReviewablePsa2, ReviewablePsa expectedReviewablePsa3, + ReviewablePsa expectedReviewablePsa4, ReviewablePsa expectedReviewablePsa5, + String expectedWarningMessageToJudge) { + + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build()) + .build(); + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) + .thenReturn("hearingServiceFormattedString1"); + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) + .thenReturn("hearingServiceFormattedString2"); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); + assertEquals(expectedReviewableDraftOrder1, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder1()); + assertEquals(expectedReviewablePsa1, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa1()); + assertEquals(expectedReviewableDraftOrder2, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder2()); + assertEquals(expectedReviewablePsa2, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa2()); + assertEquals(expectedReviewableDraftOrder3, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder3()); + assertEquals(expectedReviewablePsa3, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa3()); + assertEquals(expectedReviewableDraftOrder4, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder4()); + assertEquals(expectedReviewablePsa4, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa4()); + assertEquals(expectedReviewableDraftOrder5, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder5()); + assertEquals(expectedReviewablePsa5, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa5()); + assertEquals(expectedWarningMessageToJudge, responseDraftOrdersWrapper.getJudgeApproval().getWarningMessageToJudge()); + } + + private static CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); + private static CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); + private static CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + private static CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); + private static CaseDocumentCollection attachment1 = CaseDocumentCollection.builder() + .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); + + private static String warningMessage = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; + + private static Arguments withOneDraftOrderAndOnePsa() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge") + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(sampleDraftOrderDocument) + .attachments(List.of(attachment1)) + .build()) + .build() + )) + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder() + .psaDocument(samplePsaDocument) + .build()) + .build() + )) + .build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder1 + ReviewableDraftOrder.builder() + .hearingInfo("hearingServiceFormattedString1") + .document(sampleDraftOrderDocument) + .attachments(List.of(attachment1)) + .hasAttachment(YesOrNo.YES) + .build(), + null, null, null, null, + // expectedReviewablePsa1 + ReviewablePsa.builder() + .hearingInfo("hearingServiceFormattedString1") + .document(samplePsaDocument) + .build(), + null, null, null, null, + // expectedWarningMessageToJudge + null); + } + + private static Stream provideDraftOrderData() { + + return Stream.of( + // Test with empty DraftOrdersWrapper + Arguments.of( + DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), + null, null, null, null, null, + null, null, null, null, null, + null + ) +// , + // Test with non-empty DraftOrdersWrapper with one draft order and one PSA +// withOneDraftOrderAndOnePsa(), +// // Test with multiple draft orders and PSAs +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 10, 31)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge") +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder() +// .value(DraftOrderDocumentReview.builder() +// .draftOrderDocument(sampleDraftOrderDocument) +// .attachments(List.of(attachment1)) +// .build()) +// .build() +// )) +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder() +// .psaDocument(samplePsaDocument) +// .build()) +// .build() +// )) +// .build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder1 +// ReviewableDraftOrder.builder() +// .hearingInfo("hearingServiceFormattedString1") +// .document(sampleDraftOrderDocument) +// .attachments(List.of(attachment1)) +// .hasAttachment(YesOrNo.YES) +// .build(), +// null, null, null, null, +// // expectedReviewablePsa1 +// ReviewablePsa.builder() +// .hearingInfo("hearingServiceFormattedString1") +// .document(samplePsaDocument) +// .build(), +// null, null, null, null, +// // expectedWarningMessageToJudge +// null) + ); + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java deleted file mode 100644 index 53e7eb547f..0000000000 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersMidEventHandlerTest.java +++ /dev/null @@ -1,177 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.InjectMocks; -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.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -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.draftorders.CaseDocumentCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; - -import java.time.LocalDate; -import java.util.Collections; -import java.util.List; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.lenient; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; - -@ExtendWith(MockitoExtension.class) -class ApproveDraftOrdersMidEventHandlerTest { - - @Mock - private HearingService hearingService; - - @InjectMocks - private ApproveDraftOrdersMidEventHandler handler; - - @Test - void canHandle() { - assertCanHandle(handler, Arguments.of(CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS), - Arguments.of(CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS)); - } - - @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," - + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," - + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" - + "expectedReviewablePsa5={10}, expectedWarningMessageToJudge={11}") - @MethodSource("provideDraftOrderData") - @DisplayName("Test handle method with different DraftOrdersWrapper inputs") - void handle_withVariousDraftOrdersWrapperData( - DraftOrdersWrapper draftOrdersWrapper, - ReviewableDraftOrder expectedReviewableDraftOrder1, ReviewableDraftOrder expectedReviewableDraftOrder2, - ReviewableDraftOrder expectedReviewableDraftOrder3, ReviewableDraftOrder expectedReviewableDraftOrder4, - ReviewableDraftOrder expectedReviewableDraftOrder5, - ReviewablePsa expectedReviewablePsa1, ReviewablePsa expectedReviewablePsa2, ReviewablePsa expectedReviewablePsa3, - ReviewablePsa expectedReviewablePsa4, ReviewablePsa expectedReviewablePsa5, - String expectedWarningMessageToJudge) { - - // Arrange - FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() - .caseDetails(FinremCaseDetails.builder() - .id(12345L) - .data(FinremCaseData.builder() - .draftOrdersWrapper(draftOrdersWrapper) - .build()) - .build()) - .build(); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) - .thenReturn("hearingServiceFormattedString1"); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) - .thenReturn("hearingServiceFormattedString2"); - - // Act - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); - - // Assert - assertNotNull(response); - FinremCaseData responseData = response.getData(); - DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); - - assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); - assertEquals(expectedReviewableDraftOrder1, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder1()); - assertEquals(expectedReviewablePsa1, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa1()); - assertEquals(expectedReviewableDraftOrder2, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder2()); - assertEquals(expectedReviewablePsa2, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa2()); - assertEquals(expectedReviewableDraftOrder3, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder3()); - assertEquals(expectedReviewablePsa3, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa3()); - assertEquals(expectedReviewableDraftOrder4, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder4()); - assertEquals(expectedReviewablePsa4, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa4()); - assertEquals(expectedReviewableDraftOrder5, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder5()); - assertEquals(expectedReviewablePsa5, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa5()); - assertEquals(expectedWarningMessageToJudge, responseDraftOrdersWrapper.getJudgeApproval().getWarningMessageToJudge()); - } - - private static Stream provideDraftOrderData() { - CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); - CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); - CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); - CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); - CaseDocument attachment1 = CaseDocument.builder().documentFilename("attachment1").build(); - - String warningMessage = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " - + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; - - return Stream.of( - // Test with empty DraftOrdersWrapper - Arguments.of( - DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), - null, null, null, null, null, - null, null, null, null, null, - null - ), - // Test with non-empty DraftOrdersWrapper with one draft order and one PSA - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(sampleDraftOrderDocument) - .attachments(List.of( - CaseDocumentCollection.builder().value(attachment1) - .build())) - .build()) - .build() - )) - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder() - .psaDocument(samplePsaDocument) - .build()) - .build() - )) - .build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder1 - ReviewableDraftOrder.builder() - .hearingInfo("hearingServiceFormattedString1") - .document(sampleDraftOrderDocument) - .attachments(List.of(CaseDocumentCollection.builder().value(attachment1).build())) - .hasAttachment(YesOrNo.YES) - .build(), - null, null, null, null, - // expectedReviewablePsa1 - ReviewablePsa.builder() - .hearingInfo("hearingServiceFormattedString1") - .document(samplePsaDocument) - .build(), - null, null, null, null, - // expectedWarningMessageToJudge - null) - ); - } -} From 959ee5a1912eeb67ab863b3c579d2e47d70066e7 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 10:37:26 +0000 Subject: [PATCH 047/336] WIP update unit test --- ...oveDraftOrdersAboutToStartHandlerTest.java | 98 ++++++------------- 1 file changed, 30 insertions(+), 68 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index ce9a3128ab..3426a79aca 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -208,57 +208,66 @@ void handle_withVariousDraftOrdersWrapperData( assertEquals(expectedWarningMessageToJudge, responseDraftOrdersWrapper.getJudgeApproval().getWarningMessageToJudge()); } - private static CaseDocument sampleDraftOrderDocument = CaseDocument.builder().documentFilename("sampleDocument").build(); - private static CaseDocument samplePsaDocument = CaseDocument.builder().documentFilename("samplePsaDocument").build(); - private static CaseDocument sampleDraftOrderDocument2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); - private static CaseDocument samplePsaDocument2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); - private static CaseDocumentCollection attachment1 = CaseDocumentCollection.builder() + private static CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument").build(); + private static CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + private static CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument").build(); + private static CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); + private static CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); - private static String warningMessage = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + private static String WARNING_MESSAGE = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; + private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { + return builder.hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge"); + } + + private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { + return builder.hearingDate(LocalDate.of(2024, 11, 30)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge"); + } + private static Arguments withOneDraftOrderAndOnePsa() { return Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of( DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge") + .value(applyHearingInfo1(DraftOrdersReview.builder() .draftOrderDocReviewCollection(List.of( DraftOrderDocReviewCollection.builder() .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(sampleDraftOrderDocument) - .attachments(List.of(attachment1)) + .draftOrderDocument(DO_DOC_1) + .attachments(List.of(DO_ATTACHMENT_1)) .build()) .build() )) .psaDocReviewCollection(List.of( PsaDocReviewCollection.builder() .value(PsaDocumentReview.builder() - .psaDocument(samplePsaDocument) + .psaDocument(PSA_DOC_1) .build()) .build() - )) - .build()) + ))).build()) .build() )) .build(), // expectedReviewableDraftOrder1 ReviewableDraftOrder.builder() .hearingInfo("hearingServiceFormattedString1") - .document(sampleDraftOrderDocument) - .attachments(List.of(attachment1)) + .document(DO_DOC_1) + .attachments(List.of(DO_ATTACHMENT_1)) .hasAttachment(YesOrNo.YES) .build(), null, null, null, null, // expectedReviewablePsa1 ReviewablePsa.builder() .hearingInfo("hearingServiceFormattedString1") - .document(samplePsaDocument) + .document(PSA_DOC_1) .build(), null, null, null, null, // expectedWarningMessageToJudge @@ -274,55 +283,8 @@ private static Stream provideDraftOrderData() { null, null, null, null, null, null, null, null, null, null, null - ) -// , - // Test with non-empty DraftOrdersWrapper with one draft order and one PSA -// withOneDraftOrderAndOnePsa(), -// // Test with multiple draft orders and PSAs -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 10, 31)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge") -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder() -// .value(DraftOrderDocumentReview.builder() -// .draftOrderDocument(sampleDraftOrderDocument) -// .attachments(List.of(attachment1)) -// .build()) -// .build() -// )) -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder() -// .psaDocument(samplePsaDocument) -// .build()) -// .build() -// )) -// .build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder1 -// ReviewableDraftOrder.builder() -// .hearingInfo("hearingServiceFormattedString1") -// .document(sampleDraftOrderDocument) -// .attachments(List.of(attachment1)) -// .hasAttachment(YesOrNo.YES) -// .build(), -// null, null, null, null, -// // expectedReviewablePsa1 -// ReviewablePsa.builder() -// .hearingInfo("hearingServiceFormattedString1") -// .document(samplePsaDocument) -// .build(), -// null, null, null, null, -// // expectedWarningMessageToJudge -// null) + ), + withOneDraftOrderAndOnePsa() ); } } From b5a58d4ac06bf4ae44324de2ecc57cdcdb96d3ce Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 12:36:07 +0000 Subject: [PATCH 048/336] More test cases. --- ...ApproveDraftOrdersAboutToStartHandler.java | 6 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 329 +++++++++++++++--- 2 files changed, 280 insertions(+), 55 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index a249924f81..5e592c46d1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -32,7 +32,7 @@ @Service public class ApproveDraftOrdersAboutToStartHandler extends FinremCallbackHandler { - private static final String ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; + private static final String NO_ORDERS_TO_BE_REVIEWED_MESSAGE = "There are no draft orders or pension sharing annexes to review."; private final HearingService hearingService; @@ -143,7 +143,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWrapper) { List errors = new ArrayList<>(); if (ObjectUtils.isEmpty(draftOrdersWrapper.getDraftOrdersReviewCollection())) { - errors.add(ERROR_MESSAGE); + errors.add(NO_ORDERS_TO_BE_REVIEWED_MESSAGE); return errors; } boolean hasReviewableHearing = draftOrdersWrapper.getDraftOrdersReviewCollection().stream() @@ -155,7 +155,7 @@ private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWr ); if (!hasReviewableHearing) { - errors.add(ERROR_MESSAGE); + errors.add(NO_ORDERS_TO_BE_REVIEWED_MESSAGE); } return errors; } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index 3426a79aca..248d5e210f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; +import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -27,14 +28,17 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; @@ -51,6 +55,11 @@ @ExtendWith(MockitoExtension.class) class ApproveDraftOrdersAboutToStartHandlerTest { + private static final String NOT_AVAILABLE_ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; + + private static final String WARNING_MESSAGE = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; + @Mock private HearingService hearingService; @@ -117,6 +126,7 @@ void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { assertThat(response.getErrors()).isEmpty(); } + @SneakyThrows @Test void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { FinremCaseData caseData = spy(new FinremCaseData()); @@ -143,9 +153,15 @@ void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); Assertions.assertEquals(1, response.getErrors().size()); - assertThat(response.getErrors()).contains("There are no draft orders or pension sharing annexes to review."); + assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); + var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); + for (int i = 1; i <= 5; i++) { + assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); + assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); + } } + @SneakyThrows @Test void givenUserHasDraftOrders_whenHandle_thenReturnError() { FinremCaseData caseData = spy(new FinremCaseData()); @@ -154,9 +170,15 @@ void givenUserHasDraftOrders_whenHandle_thenReturnError() { FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); Assertions.assertEquals(1, response.getErrors().size()); - assertThat(response.getErrors()).contains("There are no draft orders or pension sharing annexes to review."); + assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); + var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); + for (int i = 1; i <= 5; i++) { + assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); + assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); + } } + @SneakyThrows @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" @@ -194,29 +216,43 @@ void handle_withVariousDraftOrdersWrapperData( FinremCaseData responseData = response.getData(); DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); - assertNotNull(responseDraftOrdersWrapper.getJudgeApproval()); - assertEquals(expectedReviewableDraftOrder1, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder1()); - assertEquals(expectedReviewablePsa1, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa1()); - assertEquals(expectedReviewableDraftOrder2, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder2()); - assertEquals(expectedReviewablePsa2, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa2()); - assertEquals(expectedReviewableDraftOrder3, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder3()); - assertEquals(expectedReviewablePsa3, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa3()); - assertEquals(expectedReviewableDraftOrder4, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder4()); - assertEquals(expectedReviewablePsa4, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa4()); - assertEquals(expectedReviewableDraftOrder5, responseDraftOrdersWrapper.getJudgeApproval().getReviewableDraftOrder5()); - assertEquals(expectedReviewablePsa5, responseDraftOrdersWrapper.getJudgeApproval().getReviewablePsa5()); - assertEquals(expectedWarningMessageToJudge, responseDraftOrdersWrapper.getJudgeApproval().getWarningMessageToJudge()); + + var judgeApproval = responseDraftOrdersWrapper.getJudgeApproval(); + assertNotNull(judgeApproval); + assertNotNull(judgeApproval); + + var expectedReviewableDraftOrders = List.of( + Optional.ofNullable(expectedReviewableDraftOrder1), Optional.ofNullable(expectedReviewableDraftOrder2), + Optional.ofNullable(expectedReviewableDraftOrder3), Optional.ofNullable(expectedReviewableDraftOrder4), + Optional.ofNullable(expectedReviewableDraftOrder5) + ); + + var expectedReviewablePsas = List.of( + Optional.ofNullable(expectedReviewablePsa1), Optional.ofNullable(expectedReviewablePsa2), Optional.ofNullable(expectedReviewablePsa3), + Optional.ofNullable(expectedReviewablePsa4), Optional.ofNullable(expectedReviewablePsa5) + ); + + for (int i = 0; i < 5; i++) { + assertEquals(expectedReviewableDraftOrders.get(i).orElse(null), + judgeApproval.getClass().getMethod("getReviewableDraftOrder" + (i + 1)).invoke(judgeApproval)); + assertEquals(expectedReviewablePsas.get(i).orElse(null), + judgeApproval.getClass().getMethod("getReviewablePsa" + (i + 1)).invoke(judgeApproval)); + } + assertEquals(expectedWarningMessageToJudge, judgeApproval.getWarningMessageToJudge()); } - private static CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument").build(); - private static CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); - private static CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument").build(); - private static CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); - private static CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() + private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument").build(); + private static final CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); + private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); + private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); + private static final CaseDocument PSA_DOC_4 = CaseDocument.builder().documentFilename("samplePsaDocument4").build(); + private static final CaseDocument PSA_DOC_5 = CaseDocument.builder().documentFilename("samplePsaDocument5").build(); + private static final CaseDocument PSA_DOC_6 = CaseDocument.builder().documentFilename("samplePsaDocument6").build(); + private static final CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); - - private static String WARNING_MESSAGE = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " - + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; + private static final CaseDocumentCollection DO_ATTACHMENT_2 = CaseDocumentCollection.builder() + .value(CaseDocument.builder().documentFilename("attachment2").build()).build(); private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { return builder.hearingDate(LocalDate.of(2024, 10, 31)) @@ -232,6 +268,68 @@ private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(Draf .hearingJudge("Mr. Judge"); } + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, + List attachments) { + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, null); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, + List attachments, OrderStatus orderStatus) { + return DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder().draftOrderDocument(draftOrderDocument).attachments(attachments).orderStatus(orderStatus) + .build()).build(); + } + + private static CaseDocument randomCaseDocument() { + return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { + return DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder().draftOrderDocument(randomCaseDocument()).orderStatus(orderStatus) + .build()).build(); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { + return buildPsaDocReviewCollection(psaDocument, null); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { + return PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).build()) + .build(); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { + return PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(randomCaseDocument()).orderStatus(orderStatus).build()) + .build(); + } + + private static ReviewableDraftOrder buildReviewableDraftOrder(String hearingInfo, CaseDocument draftOrderDocument, + List attachments) { + return ReviewableDraftOrder.builder().hearingInfo(hearingInfo) + .document(draftOrderDocument) + .attachments(attachments) + .hasAttachment(YesOrNo.forValue(!attachments.isEmpty())) + .build(); + } + + private static ReviewablePsa buildReviewablePsa(String hearingInfo, CaseDocument psaDocument) { + return ReviewablePsa.builder().hearingInfo(hearingInfo) + .document(psaDocument) + .build(); + } + + private static Arguments withEmptyDraftOrdersWrapper() { + return Arguments.of( + DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), + null, null, null, null, null, + null, null, null, null, null, + null + ); + } + private static Arguments withOneDraftOrderAndOnePsa() { return Arguments.of( DraftOrdersWrapper.builder() @@ -239,52 +337,179 @@ private static Arguments withOneDraftOrderAndOnePsa() { DraftOrdersReviewCollection.builder() .value(applyHearingInfo1(DraftOrdersReview.builder() .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(DO_DOC_1) - .attachments(List.of(DO_ATTACHMENT_1)) - .build()) - .build() + buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) )) .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder() - .psaDocument(PSA_DOC_1) - .build()) - .build() - ))).build()) + buildPsaDocReviewCollection(PSA_DOC_1) + ))) + .build()) .build() )) .build(), // expectedReviewableDraftOrder1 - ReviewableDraftOrder.builder() - .hearingInfo("hearingServiceFormattedString1") - .document(DO_DOC_1) - .attachments(List.of(DO_ATTACHMENT_1)) - .hasAttachment(YesOrNo.YES) - .build(), + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + null, null, null, null, + // expectedReviewablePsa1 + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), null, null, null, null, + // expectedWarningMessageToJudge + null); + } + + private static Arguments withTwoDraftOrderAndZeroPsa() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) + ))) + .build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder1 + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + // expectedReviewableDraftOrder2 + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, null, + null, null, null, null, null, + // expectedWarningMessageToJudge + null); + } + + private static Arguments withDifferentHearingInfo() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) + )) + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1) + ))).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo2(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) + )) + ).build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder1 + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + // expectedReviewableDraftOrder2 + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, null, // expectedReviewablePsa1 - ReviewablePsa.builder() - .hearingInfo("hearingServiceFormattedString1") - .document(PSA_DOC_1) + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), + null, null, null, null, + // expectedWarningMessageToJudge + null); + } + + private static Arguments withProcessedDraftOrderAndPsa() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(APPROVED_BY_JUDGE), + buildPsaDocReviewCollection(PROCESSED_BY_ADMIN), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(APPROVED_BY_JUDGE), + buildDraftOrderDocumentReview(PROCESSED_BY_ADMIN), + buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2), TO_BE_REVIEWED) + ))) + .build()) + .build() + )) .build(), + // expectedReviewableDraftOrder(1-5) + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, null, null, + // expectedReviewablePsa(1-5) + + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), null, null, null, null, // expectedWarningMessageToJudge null); } - private static Stream provideDraftOrderData() { + private static Arguments withSixPSAs() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_6, TO_BE_REVIEWED) + )) + ).build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder(1-5) + null, null, null, null, null, + // expectedReviewablePsa(1-5) + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), + // expectedWarningMessageToJudge + WARNING_MESSAGE); + } + private static Arguments withFiveReviewablePSAs() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), + buildPsaDocReviewCollection(APPROVED_BY_JUDGE) + )) + ).build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder(1-5) + null, null, null, null, null, + // expectedReviewablePsa(1-5) + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), + // expectedWarningMessageToJudge + null); + } + + private static Stream provideDraftOrderData() { return Stream.of( - // Test with empty DraftOrdersWrapper - Arguments.of( - DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), - null, null, null, null, null, - null, null, null, null, null, - null - ), - withOneDraftOrderAndOnePsa() + withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), + withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPSAs(), + withFiveReviewablePSAs() ); } } From 719019ca3055c0dfb18fc4e9f219ac7208ca665a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 12:58:43 +0000 Subject: [PATCH 049/336] Add sorting logic. --- ...ApproveDraftOrdersAboutToStartHandler.java | 7 ++ .../judgeapproval/ReviewableDraftOrder.java | 6 ++ .../judgeapproval/ReviewablePsa.java | 8 +++ ...oveDraftOrdersAboutToStartHandlerTest.java | 66 +++++++++++++------ 4 files changed, 68 insertions(+), 19 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 5e592c46d1..9c8a7d059d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -24,8 +24,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; +import static java.util.Comparator.naturalOrder; +import static java.util.Comparator.nullsLast; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @Slf4j @@ -65,8 +68,10 @@ private List getReviewableDraftOrders(List getReviewablePsas(List .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) .map(a -> ReviewablePsa.builder() .hearingInfo(hearingInfo) + .submittedDate(a.getSubmittedDate()) .document(a.getPsaDocument()) .build()); }) // Flatten the stream of streams + .sorted(Comparator.comparing(ReviewablePsa::getSubmittedDate, nullsLast(naturalOrder()))) .toList(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java index 8f8bc186da..7406ee3568 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java @@ -3,6 +3,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,6 +13,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import java.time.LocalDateTime; import java.util.List; import static java.util.Optional.ofNullable; @@ -39,6 +42,9 @@ public class ReviewableDraftOrder { @JsonProperty("isFinalOrder") private YesOrNo isFinalOrder; + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime submittedDate; + public YesOrNo getHasAttachment() { return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java index 5a0e0c904a..01a48a1fc6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java @@ -3,12 +3,16 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import java.time.LocalDateTime; + @JsonIgnoreProperties(ignoreUnknown = true) @Data @Builder @@ -24,4 +28,8 @@ public class ReviewablePsa { @JsonProperty("judgeDecision") private JudgeDecision judgeDecision; + + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime submittedDate; + } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index 248d5e210f..1c1d19c66a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -233,10 +233,24 @@ void handle_withVariousDraftOrdersWrapperData( ); for (int i = 0; i < 5; i++) { - assertEquals(expectedReviewableDraftOrders.get(i).orElse(null), - judgeApproval.getClass().getMethod("getReviewableDraftOrder" + (i + 1)).invoke(judgeApproval)); - assertEquals(expectedReviewablePsas.get(i).orElse(null), - judgeApproval.getClass().getMethod("getReviewablePsa" + (i + 1)).invoke(judgeApproval)); + var actualDo = (ReviewableDraftOrder) judgeApproval.getClass().getMethod("getReviewableDraftOrder" + (i + 1)).invoke(judgeApproval); + var expectedDo = expectedReviewableDraftOrders.get(i).orElse(null); + if (expectedDo != null && actualDo != null) { + assertEquals(expectedDo.getDocument(), actualDo.getDocument()); + assertEquals(expectedDo.getHearingInfo(), actualDo.getHearingInfo()); + assertEquals(expectedDo.getAttachments(), actualDo.getAttachments()); + } else { + assertEquals(expectedDo, actualDo); + } + + var actualPsa = (ReviewablePsa) judgeApproval.getClass().getMethod("getReviewablePsa" + (i + 1)).invoke(judgeApproval); + var expectedPsa = expectedReviewablePsas.get(i).orElse(null); + if (expectedPsa != null && actualPsa != null) { + assertEquals(expectedPsa.getDocument(), actualPsa.getDocument()); + assertEquals(expectedPsa.getHearingInfo(), actualPsa.getHearingInfo()); + } else { + assertEquals(expectedPsa, actualPsa); + } } assertEquals(expectedWarningMessageToJudge, judgeApproval.getWarningMessageToJudge()); } @@ -268,35 +282,49 @@ private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(Draf .hearingJudge("Mr. Judge"); } + private static CaseDocument randomCaseDocument() { + return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); + } + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, List attachments) { - return buildDraftOrderDocumentReview(draftOrderDocument, attachments, null); + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, null, LocalDateTime.now()); } private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, List attachments, OrderStatus orderStatus) { - return DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder().draftOrderDocument(draftOrderDocument).attachments(attachments).orderStatus(orderStatus) - .build()).build(); + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, orderStatus, LocalDateTime.now()); } - private static CaseDocument randomCaseDocument() { - return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { + return buildDraftOrderDocumentReview(randomCaseDocument(), null, orderStatus, LocalDateTime.now()); } - private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, + List attachments, OrderStatus orderStatus, + LocalDateTime submittedDate) { return DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder().draftOrderDocument(randomCaseDocument()).orderStatus(orderStatus) - .build()).build(); + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(draftOrderDocument) + .attachments(attachments) + .orderStatus(orderStatus) + .submittedDate(submittedDate) + .build()) + .build(); } private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { - return buildPsaDocReviewCollection(psaDocument, null); + return buildPsaDocReviewCollection(psaDocument, null, LocalDateTime.now()); } private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { + return buildPsaDocReviewCollection(psaDocument, orderStatus, LocalDateTime.now()); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, + LocalDateTime submittedDate) { return PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).build()) + .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) .build(); } @@ -445,7 +473,7 @@ private static Arguments withProcessedDraftOrderAndPsa() { null); } - private static Arguments withSixPSAs() { + private static Arguments withSixPsas() { return Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of( @@ -475,7 +503,7 @@ private static Arguments withSixPSAs() { WARNING_MESSAGE); } - private static Arguments withFiveReviewablePSAs() { + private static Arguments withFiveReviewablePsas() { return Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of( @@ -508,8 +536,8 @@ private static Arguments withFiveReviewablePSAs() { private static Stream provideDraftOrderData() { return Stream.of( withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), - withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPSAs(), - withFiveReviewablePSAs() + withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), + withFiveReviewablePsas() ); } } From dd946838f5ec33173e63e50fb8b0c7919dd59d42 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 13:11:00 +0000 Subject: [PATCH 050/336] Sorting unit test --- ...oveDraftOrdersAboutToStartHandlerTest.java | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index 1c1d19c66a..d726ca54b0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -533,11 +533,40 @@ private static Arguments withFiveReviewablePsas() { null); } + private static Arguments withFiveReviewablesSubmittedDateOrdering() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED, LocalDateTime.now()) + )) + ).build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder(1-5) + null, null, null, null, null, + // expectedReviewablePsa(1-5) + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), + // expectedWarningMessageToJudge + null); + } + private static Stream provideDraftOrderData() { return Stream.of( withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), - withFiveReviewablePsas() + withFiveReviewablePsas(), withFiveReviewablesSubmittedDateOrdering() ); } } From ccd7a027322e3b9661faee776f73367cf6adb144 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 16:45:55 +0000 Subject: [PATCH 051/336] Enhance sorting capability --- ...ApproveDraftOrdersAboutToStartHandler.java | 13 ++-- .../judgeapproval/ReviewableDraftOrder.java | 8 +-- .../judgeapproval/ReviewablePsa.java | 9 +-- .../draftorders/judgeapproval/SortKey.java | 57 +++++++++++++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 9 +-- ...oveDraftOrdersAboutToStartHandlerTest.java | 69 +++++++++++++++++-- 6 files changed, 138 insertions(+), 27 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java index 9c8a7d059d..ac15509d68 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java @@ -15,6 +15,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.SortKey; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; @@ -68,10 +69,12 @@ private List getReviewableDraftOrders(List getReviewablePsas(List .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) .map(a -> ReviewablePsa.builder() .hearingInfo(hearingInfo) - .submittedDate(a.getSubmittedDate()) + .sortKey(new SortKey(draftOrdersReview.getHearingTime(), + draftOrdersReview.getHearingDate(), + a.getSubmittedDate())) .document(a.getPsaDocument()) .build()); }) // Flatten the stream of streams - .sorted(Comparator.comparing(ReviewablePsa::getSubmittedDate, nullsLast(naturalOrder()))) + .sorted(Comparator.comparing(ReviewablePsa::getSortKey, nullsLast(naturalOrder()))) .toList(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java index 7406ee3568..1cb8173e57 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java @@ -1,10 +1,9 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,7 +12,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; -import java.time.LocalDateTime; import java.util.List; import static java.util.Optional.ofNullable; @@ -42,8 +40,8 @@ public class ReviewableDraftOrder { @JsonProperty("isFinalOrder") private YesOrNo isFinalOrder; - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime submittedDate; + @JsonIgnore + private SortKey sortKey; public YesOrNo getHasAttachment() { return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java index 01a48a1fc6..7bd257084a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java @@ -1,18 +1,15 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import java.time.LocalDateTime; - @JsonIgnoreProperties(ignoreUnknown = true) @Data @Builder @@ -29,7 +26,7 @@ public class ReviewablePsa { @JsonProperty("judgeDecision") private JudgeDecision judgeDecision; - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime submittedDate; + @JsonIgnore + private SortKey sortKey; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java new file mode 100644 index 0000000000..0297b27ae0 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java @@ -0,0 +1,57 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Setter +@Getter +@Data +public class SortKey implements Comparable { + private String hearingTime; + private LocalDate hearingDate; + private LocalDateTime documentSubmittedDate; + + // Constructor, Getters, and Setters + + public SortKey(String hearingTime, LocalDate hearingDate, LocalDateTime documentSubmittedDate) { + this.hearingTime = hearingTime; + this.hearingDate = hearingDate; + this.documentSubmittedDate = documentSubmittedDate; + } + + // Comparable implementation + @Override + public int compareTo(SortKey other) { + // Null checks with default ordering behavior + if (other == null) { + return 1; + } + int result = compareWithNullCheck(this.hearingDate, other.hearingDate); + if (result != 0) { + return result; + } + result = compareWithNullCheck(this.hearingTime, other.hearingTime); + if (result != 0) { + return result; + } + return compareWithNullCheck(this.documentSubmittedDate, other.documentSubmittedDate); + } + + // Utility method for null-safe comparison + private > int compareWithNullCheck(T a, T b) { + if (a == null && b == null) { + return 0; + } + if (a == null) { + return -1; + } + if (b == null) { + return 1; + } + return a.compareTo(b); + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 0dfe9496ee..529cf05a4f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -18,12 +18,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.stream.Stream; -import static java.util.Comparator.naturalOrder; -import static java.util.Comparator.nullsLast; import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @@ -86,11 +83,7 @@ public List getOutstandingDraftOrdersReviewCollecti .anyMatch(draftOrderDoc -> isJudgeReviewable(draftOrderDoc.getValue().getOrderStatus())) || a.getValue().getPsaDocReviewCollection().stream() .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus()))); - return draftOrdersStream.sorted( - Comparator.comparing((DraftOrdersReviewCollection a) -> a.getValue().getHearingDate(), nullsLast(naturalOrder())) - .thenComparing(a -> a.getValue().getHearingTime(), nullsLast(naturalOrder())) - .thenComparing(a -> a.getValue().getHearingType(), nullsLast(naturalOrder()))) - .toList(); + return draftOrdersStream.toList(); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index d726ca54b0..c938968120 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -255,8 +255,11 @@ void handle_withVariousDraftOrdersWrapperData( assertEquals(expectedWarningMessageToJudge, judgeApproval.getWarningMessageToJudge()); } - private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument").build(); + private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument1").build(); private static final CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + private static final CaseDocument DO_DOC_3 = CaseDocument.builder().documentFilename("sampleDocument3").build(); + private static final CaseDocument DO_DOC_4 = CaseDocument.builder().documentFilename("sampleDocument4").build(); + private static final CaseDocument DO_DOC_5 = CaseDocument.builder().documentFilename("sampleDocument5").build(); private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); @@ -533,7 +536,7 @@ private static Arguments withFiveReviewablePsas() { null); } - private static Arguments withFiveReviewablesSubmittedDateOrdering() { + private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { return Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of( @@ -546,12 +549,23 @@ private static Arguments withFiveReviewablesSubmittedDateOrdering() { buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()), buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED, LocalDateTime.now()) )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of()), + buildDraftOrderDocumentReview(DO_DOC_2, List.of()), + buildDraftOrderDocumentReview(DO_DOC_3, List.of()), + buildDraftOrderDocumentReview(DO_DOC_4, List.of(), null, LocalDateTime.now().minusDays(1)), + buildDraftOrderDocumentReview(DO_DOC_5, List.of()) + )) ).build()) .build() )) .build(), // expectedReviewableDraftOrder(1-5) - null, null, null, null, null, + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_4, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_3, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_5, List.of()), // expectedReviewablePsa(1-5) buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), @@ -562,11 +576,58 @@ private static Arguments withFiveReviewablesSubmittedDateOrdering() { null); } + private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo2(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_5, List.of(), null, LocalDateTime.now().minusDays(1)), + buildDraftOrderDocumentReview(DO_DOC_4, List.of()) + )) + ).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of()), + buildDraftOrderDocumentReview(DO_DOC_2, List.of()) + )) + ).build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder(1-5) + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), + null, + // expectedReviewablePsa(1-5) + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), + buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), + buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_2), + buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_1), + null, + // expectedWarningMessageToJudge + null); + } + private static Stream provideDraftOrderData() { return Stream.of( withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), - withFiveReviewablePsas(), withFiveReviewablesSubmittedDateOrdering() + withFiveReviewablePsas(), withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), + withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() ); } } From 0402d2afd51f789a977eb3e47f2f599c5af4def3 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 14 Nov 2024 17:09:21 +0000 Subject: [PATCH 052/336] increase coverage --- ...oveDraftOrdersAboutToStartHandlerTest.java | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index c938968120..e98a5e38ff 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -260,6 +260,7 @@ void handle_withVariousDraftOrdersWrapperData( private static final CaseDocument DO_DOC_3 = CaseDocument.builder().documentFilename("sampleDocument3").build(); private static final CaseDocument DO_DOC_4 = CaseDocument.builder().documentFilename("sampleDocument4").build(); private static final CaseDocument DO_DOC_5 = CaseDocument.builder().documentFilename("sampleDocument5").build(); + private static final CaseDocument DO_DOC_6 = CaseDocument.builder().documentFilename("sampleDocument6").build(); private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); @@ -338,7 +339,7 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus or } private static ReviewableDraftOrder buildReviewableDraftOrder(String hearingInfo, CaseDocument draftOrderDocument, - List attachments) { + List attachments) { return ReviewableDraftOrder.builder().hearingInfo(hearingInfo) .document(draftOrderDocument) .attachments(attachments) @@ -506,6 +507,36 @@ private static Arguments withSixPsas() { WARNING_MESSAGE); } + private static Arguments withSixDraftOrders() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo2(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_2, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_3, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_6, List.of(), TO_BE_REVIEWED) + )) + ).build()) + .build() + )) + .build(), + // expectedReviewableDraftOrder(1-5) + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_1, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_3, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), + buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), + // expectedReviewablePsa(1-5) + null, null, null, null, null, + // expectedWarningMessageToJudge + WARNING_MESSAGE); + } + private static Arguments withFiveReviewablePsas() { return Arguments.of( DraftOrdersWrapper.builder() @@ -627,7 +658,8 @@ private static Stream provideDraftOrderData() { withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), withFiveReviewablePsas(), withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), - withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() + withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate(), + withSixDraftOrders() ); } } From 90a3f2c14e76d330e2a5f9b58b51af77488ae316 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 09:28:24 +0000 Subject: [PATCH 053/336] remove spy --- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java index e98a5e38ff..39ac46c425 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -73,7 +73,7 @@ void canHandle() { @Test void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { - FinremCaseData caseData = spy(new FinremCaseData()); + FinremCaseData caseData = new FinremCaseData(); DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(TO_BE_REVIEWED) .build(); @@ -103,7 +103,7 @@ void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { @Test void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { - FinremCaseData caseData = spy(new FinremCaseData()); + FinremCaseData caseData = new FinremCaseData(); PsaDocumentReview document1 = PsaDocumentReview.builder().orderStatus(TO_BE_REVIEWED) .build(); PsaDocReviewCollection psaCollectionItem1 = new PsaDocReviewCollection(document1); From f14e8943b4bd0916b782ed6db1edff6582ca622f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 09:39:03 +0000 Subject: [PATCH 054/336] Remove comments. --- .../model/ccd/draftorders/judgeapproval/SortKey.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java index 0297b27ae0..332f4de88e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java @@ -15,15 +15,12 @@ public class SortKey implements Comparable { private LocalDate hearingDate; private LocalDateTime documentSubmittedDate; - // Constructor, Getters, and Setters - public SortKey(String hearingTime, LocalDate hearingDate, LocalDateTime documentSubmittedDate) { this.hearingTime = hearingTime; this.hearingDate = hearingDate; this.documentSubmittedDate = documentSubmittedDate; } - // Comparable implementation @Override public int compareTo(SortKey other) { // Null checks with default ordering behavior @@ -41,7 +38,6 @@ public int compareTo(SortKey other) { return compareWithNullCheck(this.documentSubmittedDate, other.documentSubmittedDate); } - // Utility method for null-safe comparison private > int compareWithNullCheck(T a, T b) { if (a == null && b == null) { return 0; From be7621cc06b4f34d27814107226a9231e32ffee8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 09:40:11 +0000 Subject: [PATCH 055/336] rename package. --- .../ApproveDraftOrdersAboutToStartHandler.java | 2 +- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/{approvedraftorders => judgeapproval}/ApproveDraftOrdersAboutToStartHandler.java (99%) rename src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/{approvedraftorders => judgeapproval}/ApproveDraftOrdersAboutToStartHandlerTest.java (99%) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java similarity index 99% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index ac15509d68..e68de24b09 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -1,4 +1,4 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java similarity index 99% rename from src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java rename to src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 39ac46c425..a2a05dd2e2 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/approvedraftorders/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -1,4 +1,4 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.approvedraftorders; +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; From 5c2a8c24b6d8266de976dd921cfa144a3b82a87d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 09:41:42 +0000 Subject: [PATCH 056/336] Method reordering --- ...ApproveDraftOrdersAboutToStartHandler.java | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index e68de24b09..ce0ba3075e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -52,6 +52,60 @@ public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType && EventType.APPROVE_ORDERS.equals(eventType); } + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested {} about to start event callback for Case ID: {}", callbackRequest.getEventType(), caseId); + + FinremCaseData finremCaseData = caseDetails.getData(); + DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + + List errors = validateDraftOrdersWrapper(draftOrdersWrapper); + if (errors.isEmpty()) { + List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); + + draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() + .reviewablePsa1(createReviewablePsa(outstanding, 1)) + .reviewablePsa2(createReviewablePsa(outstanding, 2)) + .reviewablePsa3(createReviewablePsa(outstanding, 3)) + .reviewablePsa4(createReviewablePsa(outstanding, 4)) + .reviewablePsa5(createReviewablePsa(outstanding, 5)) + .reviewableDraftOrder1(createReviewableDraftOrder(outstanding, 1)) + .reviewableDraftOrder2(createReviewableDraftOrder(outstanding, 2)) + .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) + .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) + .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) + .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 + ? ("This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " + + "There are additional draft orders/pension sharing annexes requiring review that are not shown.") : null) + .build()); + } + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).errors(errors).build(); + } + + private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWrapper) { + List errors = new ArrayList<>(); + if (ObjectUtils.isEmpty(draftOrdersWrapper.getDraftOrdersReviewCollection())) { + errors.add(NO_ORDERS_TO_BE_REVIEWED_MESSAGE); + return errors; + } + boolean hasReviewableHearing = draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + .map(DraftOrdersReviewCollection::getValue) + .anyMatch(review -> review.getDraftOrderDocReviewCollection().stream() + .anyMatch(doc -> isJudgeReviewable(doc.getValue().getOrderStatus())) + || review.getPsaDocReviewCollection().stream() + .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())) + ); + + if (!hasReviewableHearing) { + errors.add(NO_ORDERS_TO_BE_REVIEWED_MESSAGE); + } + return errors; + } + private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrdersReview) { return hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); @@ -118,58 +172,4 @@ private ReviewablePsa createReviewablePsa(List outs return collection.get(index - 1); } - @Override - public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, - String userAuthorisation) { - FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); - String caseId = String.valueOf(caseDetails.getId()); - log.info("Invoking contested {} mid event callback for Case ID: {}", callbackRequest.getEventType(), caseId); - - FinremCaseData finremCaseData = caseDetails.getData(); - DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - - List errors = validateDraftOrdersWrapper(draftOrdersWrapper); - if (errors.isEmpty()) { - List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); - - draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() - .reviewablePsa1(createReviewablePsa(outstanding, 1)) - .reviewablePsa2(createReviewablePsa(outstanding, 2)) - .reviewablePsa3(createReviewablePsa(outstanding, 3)) - .reviewablePsa4(createReviewablePsa(outstanding, 4)) - .reviewablePsa5(createReviewablePsa(outstanding, 5)) - .reviewableDraftOrder1(createReviewableDraftOrder(outstanding, 1)) - .reviewableDraftOrder2(createReviewableDraftOrder(outstanding, 2)) - .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) - .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) - .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) - .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 - ? ("This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " - + "There are additional draft orders/pension sharing annexes requiring review that are not shown.") : null) - .build()); - } - - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).errors(errors).build(); - } - - private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWrapper) { - List errors = new ArrayList<>(); - if (ObjectUtils.isEmpty(draftOrdersWrapper.getDraftOrdersReviewCollection())) { - errors.add(NO_ORDERS_TO_BE_REVIEWED_MESSAGE); - return errors; - } - boolean hasReviewableHearing = draftOrdersWrapper.getDraftOrdersReviewCollection().stream() - .map(DraftOrdersReviewCollection::getValue) - .anyMatch(review -> review.getDraftOrderDocReviewCollection().stream() - .anyMatch(doc -> isJudgeReviewable(doc.getValue().getOrderStatus())) - || review.getPsaDocReviewCollection().stream() - .anyMatch(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())) - ); - - if (!hasReviewableHearing) { - errors.add(NO_ORDERS_TO_BE_REVIEWED_MESSAGE); - } - return errors; - } - } From 452de41c3dabe717378e1ed52be4ef0694ae9378 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 11:15:12 +0000 Subject: [PATCH 057/336] Remove duplicated code. --- .../judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index a2a05dd2e2..2ff9ba7451 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -219,7 +219,6 @@ void handle_withVariousDraftOrdersWrapperData( var judgeApproval = responseDraftOrdersWrapper.getJudgeApproval(); assertNotNull(judgeApproval); - assertNotNull(judgeApproval); var expectedReviewableDraftOrders = List.of( Optional.ofNullable(expectedReviewableDraftOrder1), Optional.ofNullable(expectedReviewableDraftOrder2), From 1511868553a1c70f962014870244119b22c59916 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 11:16:44 +0000 Subject: [PATCH 058/336] Remove spy and rename --- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 2ff9ba7451..d545fb2f36 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -45,7 +45,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.spy; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; @@ -129,7 +128,7 @@ void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { @SneakyThrows @Test void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { - FinremCaseData caseData = spy(new FinremCaseData()); + FinremCaseData caseData = new FinremCaseData(); DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) .build(); @@ -163,8 +162,8 @@ void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { @SneakyThrows @Test - void givenUserHasDraftOrders_whenHandle_thenReturnError() { - FinremCaseData caseData = spy(new FinremCaseData()); + void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { + FinremCaseData caseData = new FinremCaseData(); GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); From fb2372e2614596a821692d6b1750dc46d7324ee6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 11:23:51 +0000 Subject: [PATCH 059/336] Remove unused tests --- ...oveDraftOrdersAboutToStartHandlerTest.java | 57 +------------------ 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index d545fb2f36..f3d3c92894 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -70,64 +70,9 @@ void canHandle() { assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); } - @Test - void givenUserHasHearingsReadyToReview_whenHandle_thenReturnSortedHearings() { - FinremCaseData caseData = new FinremCaseData(); - - DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(TO_BE_REVIEWED) - .build(); - DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) - .build(); - - DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); - DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); - - DraftOrdersReview review1 = DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 8, 6)) - .hearingType("Hearing Type 1") - .hearingJudge("Judge 1") - .hearingTime("09:00 A.M.") - .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) - .build(); - - DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); - caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); - - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( - FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); - - assertThat(response).isNotNull(); - assertThat(response.getErrors()).isEmpty(); - } - - @Test - void givenUserHasPsaReadyToReview_whenHandle_thenReturnSortedHearings() { - FinremCaseData caseData = new FinremCaseData(); - PsaDocumentReview document1 = PsaDocumentReview.builder().orderStatus(TO_BE_REVIEWED) - .build(); - PsaDocReviewCollection psaCollectionItem1 = new PsaDocReviewCollection(document1); - - DraftOrdersReview review1 = DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 8, 6)) - .hearingType("Hearing Type 1") - .hearingJudge("Judge 1") - .hearingTime("09:00 A.M.") - .psaDocReviewCollection(List.of(psaCollectionItem1)) - .build(); - - DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); - caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); - - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( - FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); - - assertThat(response).isNotNull(); - assertThat(response.getErrors()).isEmpty(); - } - @SneakyThrows @Test - void givenUserHasNoHearingsForReview_whenHandle_thenReturnError() { + void givenUserHasJudgeProcessedDraftOrders_thenReturnError() { FinremCaseData caseData = new FinremCaseData(); DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) From a9d438b9767f91024d58ad9ddb65010f6d8da30f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 11:53:08 +0000 Subject: [PATCH 060/336] return status == null --- .../model/ccd/draftorders/review/OrderStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java index 7b5f457500..999920c4cc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java @@ -6,6 +6,6 @@ public enum OrderStatus { PROCESSED_BY_ADMIN; public static boolean isJudgeReviewable(OrderStatus status) { - return status == null || status == TO_BE_REVIEWED; + return status == TO_BE_REVIEWED; } } From c28698fa43e6e63e46cd0d7b9fb1497e3ee97a1d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 12:15:47 +0000 Subject: [PATCH 061/336] update test case --- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index f3d3c92894..80467c57c8 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -235,7 +235,7 @@ private static CaseDocument randomCaseDocument() { private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, List attachments) { - return buildDraftOrderDocumentReview(draftOrderDocument, attachments, null, LocalDateTime.now()); + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, LocalDateTime.now()); } private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, @@ -261,7 +261,7 @@ private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseD } private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { - return buildPsaDocReviewCollection(psaDocument, null, LocalDateTime.now()); + return buildPsaDocReviewCollection(psaDocument, TO_BE_REVIEWED, LocalDateTime.now()); } private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { @@ -270,7 +270,7 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument p private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, LocalDateTime submittedDate) { - return PsaDocReviewCollection.builder() + return PsaDocReviewCollection.builder()- .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) .build(); } @@ -527,7 +527,7 @@ private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { buildDraftOrderDocumentReview(DO_DOC_1, List.of()), buildDraftOrderDocumentReview(DO_DOC_2, List.of()), buildDraftOrderDocumentReview(DO_DOC_3, List.of()), - buildDraftOrderDocumentReview(DO_DOC_4, List.of(), null, LocalDateTime.now().minusDays(1)), + buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), buildDraftOrderDocumentReview(DO_DOC_5, List.of()) )) ).build()) @@ -561,7 +561,7 @@ private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubm buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)) )) .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_5, List.of(), null, LocalDateTime.now().minusDays(1)), + buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), buildDraftOrderDocumentReview(DO_DOC_4, List.of()) )) ).build()) From bbdbd3b16390a564b376845265e6b9954df6454e Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 15 Nov 2024 12:25:07 +0000 Subject: [PATCH 062/336] remove unwanted character. --- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 80467c57c8..4e1e86af2c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -270,7 +270,7 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument p private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, LocalDateTime submittedDate) { - return PsaDocReviewCollection.builder()- + return PsaDocReviewCollection.builder() .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) .build(); } From da16dc0bb57d5d9b37d5fa0b5a956c0cae2a1376 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 21 Nov 2024 14:06:36 +0000 Subject: [PATCH 063/336] Data structure refactoring (WIP) . Commented the unit test : ApproveDraftOrdersAboutToStartHandlerTest --- ...ApproveDraftOrdersAboutToStartHandler.java | 79 +- .../judgeapproval/JudgeApproval.java | 45 +- .../judgeapproval/ReviewableDraftOrder.java | 49 - .../judgeapproval/ReviewablePsa.java | 32 - .../model/ccd/wrapper/DraftOrdersWrapper.java | 58 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 1214 ++++++++--------- 6 files changed, 720 insertions(+), 757 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index ce0ba3075e..e45f094c78 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -12,9 +12,8 @@ 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.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.SortKey; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -27,9 +26,8 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.stream.Stream; -import static java.util.Comparator.naturalOrder; -import static java.util.Comparator.nullsLast; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @Slf4j @@ -66,21 +64,12 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem if (errors.isEmpty()) { List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); - draftOrdersWrapper.setJudgeApproval(JudgeApproval.builder() - .reviewablePsa1(createReviewablePsa(outstanding, 1)) - .reviewablePsa2(createReviewablePsa(outstanding, 2)) - .reviewablePsa3(createReviewablePsa(outstanding, 3)) - .reviewablePsa4(createReviewablePsa(outstanding, 4)) - .reviewablePsa5(createReviewablePsa(outstanding, 5)) - .reviewableDraftOrder1(createReviewableDraftOrder(outstanding, 1)) - .reviewableDraftOrder2(createReviewableDraftOrder(outstanding, 2)) - .reviewableDraftOrder3(createReviewableDraftOrder(outstanding, 3)) - .reviewableDraftOrder4(createReviewableDraftOrder(outstanding, 4)) - .reviewableDraftOrder5(createReviewableDraftOrder(outstanding, 5)) - .warningMessageToJudge(getReviewableDraftOrders(outstanding).size() > 5 || getReviewablePsas(outstanding).size() > 5 - ? ("This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " - + "There are additional draft orders/pension sharing annexes requiring review that are not shown.") : null) - .build()); + draftOrdersWrapper.setShowWarningMessageToJudge(YesOrNo.forValue(outstanding.size() > 5)); + draftOrdersWrapper.setJudgeApproval1(createReviewableItems(outstanding,1)); + draftOrdersWrapper.setJudgeApproval2(createReviewableItems(outstanding,2)); + draftOrdersWrapper.setJudgeApproval3(createReviewableItems(outstanding,3)); + draftOrdersWrapper.setJudgeApproval4(createReviewableItems(outstanding,4)); + draftOrdersWrapper.setJudgeApproval5(createReviewableItems(outstanding,5)); } return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).errors(errors).build(); @@ -111,61 +100,49 @@ private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrde draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); } - private List getReviewableDraftOrders(List outstanding) { + private List getReviewableItems(List outstanding) { return outstanding.stream() .map(DraftOrdersReviewCollection::getValue) .flatMap(draftOrdersReview -> { String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); - return draftOrdersReview.getDraftOrderDocReviewCollection().stream() + + // Process Draft Orders + Stream draftOrderStream = draftOrdersReview.getDraftOrderDocReviewCollection().stream() .map(DraftOrderDocReviewCollection::getValue) .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) - .map(a -> ReviewableDraftOrder.builder() - .hearingInfo(hearingInfo) // Set specific hearingInfo for each item + .map(a -> JudgeApproval.builder() + .title("Draft Order") + .hearingInfo(hearingInfo) .document(a.getDraftOrderDocument()) .attachments(a.getAttachments()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingDate(), a.getSubmittedDate())) .build()); - }) // Flatten the stream of streams - .sorted(Comparator.comparing(ReviewableDraftOrder::getSortKey, nullsLast(naturalOrder()))) - .toList(); - } - - private ReviewableDraftOrder createReviewableDraftOrder(List outstanding, int index) { - // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = getReviewableDraftOrders(outstanding); - // Return the specified item if it exists in the collection, otherwise return null - if (collection.size() < index) { - return null; - } - return collection.get(index - 1); - } - private List getReviewablePsas(List outstanding) { - return outstanding.stream() - .map(DraftOrdersReviewCollection::getValue) - .flatMap(draftOrdersReview -> { - String hearingInfo = buildHearingInfoFromDraftOrdersReview(draftOrdersReview); - return draftOrdersReview.getPsaDocReviewCollection().stream() + // Process PSAs + Stream psaStream = draftOrdersReview.getPsaDocReviewCollection().stream() .map(PsaDocReviewCollection::getValue) .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) - .map(a -> ReviewablePsa.builder() + .map(a -> JudgeApproval.builder() + .title("PSA") .hearingInfo(hearingInfo) + .document(a.getPsaDocument()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingDate(), a.getSubmittedDate())) - .document(a.getPsaDocument()) .build()); - }) // Flatten the stream of streams - .sorted(Comparator.comparing(ReviewablePsa::getSortKey, nullsLast(naturalOrder()))) + + // Combine the two streams + return Stream.concat(draftOrderStream, psaStream); + }) + .sorted(Comparator.comparing(JudgeApproval::getSortKey, Comparator.nullsLast(Comparator.naturalOrder()))) .toList(); } - private ReviewablePsa createReviewablePsa(List outstanding, int index) { - // Build a collection of reviewable draft orders with specific hearingInfo for each item - List collection = getReviewablePsas(outstanding); - // Return the specified item if it exists in the collection, otherwise return null + + private JudgeApproval createReviewableItems(List outstanding, int index) { + List collection = getReviewableItems(outstanding); if (collection.size() < index) { return null; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 86fdd777fe..ecacb99055 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -1,11 +1,20 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; + +import java.util.List; + +import static java.util.Optional.ofNullable; @JsonIgnoreProperties(ignoreUnknown = true) @Data @@ -15,18 +24,32 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class JudgeApproval { - private String warningMessageToJudge; + private String title; + + private String hearingInfo; + + private YesOrNo hasAttachment; + + @JsonProperty("document") + private CaseDocument document; + + @JsonProperty("amendedDocument") + private CaseDocument amendedDocument; + + @JsonProperty("judgeDecision") + private JudgeDecision judgeDecision; + + @JsonProperty("attachments") + private List attachments; + + @JsonProperty("isFinalOrder") + private YesOrNo isFinalOrder; - private ReviewableDraftOrder reviewableDraftOrder1; - private ReviewableDraftOrder reviewableDraftOrder2; - private ReviewableDraftOrder reviewableDraftOrder3; - private ReviewableDraftOrder reviewableDraftOrder4; - private ReviewableDraftOrder reviewableDraftOrder5; + @JsonIgnore + private SortKey sortKey; - private ReviewablePsa reviewablePsa1; - private ReviewablePsa reviewablePsa2; - private ReviewablePsa reviewablePsa3; - private ReviewablePsa reviewablePsa4; - private ReviewablePsa reviewablePsa5; + public YesOrNo getHasAttachment() { + return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java deleted file mode 100644 index 1cb8173e57..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewableDraftOrder.java +++ /dev/null @@ -1,49 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; - -import java.util.List; - -import static java.util.Optional.ofNullable; - -@JsonIgnoreProperties(ignoreUnknown = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ReviewableDraftOrder { - - private String hearingInfo; - - private YesOrNo hasAttachment; - - @JsonProperty("document") - private CaseDocument document; - - @JsonProperty("judgeDecision") - private JudgeDecision judgeDecision; - - @JsonProperty("attachments") - private List attachments; - - @JsonProperty("isFinalOrder") - private YesOrNo isFinalOrder; - - @JsonIgnore - private SortKey sortKey; - - public YesOrNo getHasAttachment() { - return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); - } -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java deleted file mode 100644 index 7bd257084a..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/ReviewablePsa.java +++ /dev/null @@ -1,32 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; - -@JsonIgnoreProperties(ignoreUnknown = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ReviewablePsa { - - private String hearingInfo; - - @JsonProperty("document") - private CaseDocument document; - - @JsonProperty("judgeDecision") - private JudgeDecision judgeDecision; - - @JsonIgnore - private SortKey sortKey; - -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 529cf05a4f..71522880dc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -48,15 +48,61 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("suggestedDraftOrderCollection") private List suggestedDraftOrderCollection; - @JsonProperty("judgeApproval") - private JudgeApproval judgeApproval; + private YesOrNo showWarningMessageToJudge; + + @JsonProperty("judgeApproval1") + private JudgeApproval judgeApproval1; + + @JsonProperty("judgeApproval2") + private JudgeApproval judgeApproval2; + + @JsonProperty("judgeApproval3") + private JudgeApproval judgeApproval3; + + @JsonProperty("judgeApproval4") + private JudgeApproval judgeApproval4; + + @JsonProperty("judgeApproval5") + private JudgeApproval judgeApproval5; + + @JsonIgnore + public JudgeApproval getJudgeApproval1() { + if (judgeApproval1 == null) { + this.judgeApproval1 = new JudgeApproval(); + } + return judgeApproval1; + } + + @JsonIgnore + public JudgeApproval getJudgeApproval2() { + if (judgeApproval2 == null) { + this.judgeApproval2 = new JudgeApproval(); + } + return judgeApproval2; + } + + @JsonIgnore + public JudgeApproval getJudgeApproval3() { + if (judgeApproval3 == null) { + this.judgeApproval3 = new JudgeApproval(); + } + return judgeApproval3; + } + + @JsonIgnore + public JudgeApproval getJudgeApproval4() { + if (judgeApproval4 == null) { + this.judgeApproval4 = new JudgeApproval(); + } + return judgeApproval4; + } @JsonIgnore - public JudgeApproval getJudgeApproval() { - if (judgeApproval == null) { - this.judgeApproval = new JudgeApproval(); + public JudgeApproval getJudgeApproval5() { + if (judgeApproval5 == null) { + this.judgeApproval5 = new JudgeApproval(); } - return judgeApproval; + return judgeApproval5; } public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 4e1e86af2c..2d20c2d05e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -1,608 +1,606 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; - -import lombok.SneakyThrows; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; -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.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -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.draftorders.CaseDocumentCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.stream.Stream; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.lenient; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; - -@ExtendWith(MockitoExtension.class) -class ApproveDraftOrdersAboutToStartHandlerTest { - - private static final String NOT_AVAILABLE_ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; - - private static final String WARNING_MESSAGE = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " - + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; - - @Mock - private HearingService hearingService; - - @InjectMocks - private ApproveDraftOrdersAboutToStartHandler handler; - - @Test - void canHandle() { - assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); - } - - @SneakyThrows - @Test - void givenUserHasJudgeProcessedDraftOrders_thenReturnError() { - FinremCaseData caseData = new FinremCaseData(); - - DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) - .build(); - DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED_BY_ADMIN) - .build(); - - DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); - DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); - - DraftOrdersReview review1 = DraftOrdersReview.builder() - .hearingDate(LocalDate.of(2024, 8, 6)) - .hearingType("Hearing Type 1") - .hearingJudge("Judge 1") - .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) - .build(); - - DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); - caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); - - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( - FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); - - Assertions.assertEquals(1, response.getErrors().size()); - assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); - var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); - for (int i = 1; i <= 5; i++) { - assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); - assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); - } - } - - @SneakyThrows - @Test - void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { - FinremCaseData caseData = new FinremCaseData(); - - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( - FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); - - Assertions.assertEquals(1, response.getErrors().size()); - assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); - var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); - for (int i = 1; i <= 5; i++) { - assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); - assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); - } - } - - @SneakyThrows - @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," - + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," - + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" - + "expectedReviewablePsa5={10}, expectedWarningMessageToJudge={11}") - @MethodSource("provideDraftOrderData") - @DisplayName("Test handle method with different DraftOrdersWrapper inputs") - void handle_withVariousDraftOrdersWrapperData( - DraftOrdersWrapper draftOrdersWrapper, - ReviewableDraftOrder expectedReviewableDraftOrder1, ReviewableDraftOrder expectedReviewableDraftOrder2, - ReviewableDraftOrder expectedReviewableDraftOrder3, ReviewableDraftOrder expectedReviewableDraftOrder4, - ReviewableDraftOrder expectedReviewableDraftOrder5, - ReviewablePsa expectedReviewablePsa1, ReviewablePsa expectedReviewablePsa2, ReviewablePsa expectedReviewablePsa3, - ReviewablePsa expectedReviewablePsa4, ReviewablePsa expectedReviewablePsa5, - String expectedWarningMessageToJudge) { - - // Arrange - FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() - .caseDetails(FinremCaseDetails.builder() - .id(12345L) - .data(FinremCaseData.builder() - .draftOrdersWrapper(draftOrdersWrapper) - .build()) - .build()) - .build(); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) - .thenReturn("hearingServiceFormattedString1"); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) - .thenReturn("hearingServiceFormattedString2"); - - // Act - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); - - // Assert - assertNotNull(response); - FinremCaseData responseData = response.getData(); - DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); - - - var judgeApproval = responseDraftOrdersWrapper.getJudgeApproval(); - assertNotNull(judgeApproval); - - var expectedReviewableDraftOrders = List.of( - Optional.ofNullable(expectedReviewableDraftOrder1), Optional.ofNullable(expectedReviewableDraftOrder2), - Optional.ofNullable(expectedReviewableDraftOrder3), Optional.ofNullable(expectedReviewableDraftOrder4), - Optional.ofNullable(expectedReviewableDraftOrder5) - ); - - var expectedReviewablePsas = List.of( - Optional.ofNullable(expectedReviewablePsa1), Optional.ofNullable(expectedReviewablePsa2), Optional.ofNullable(expectedReviewablePsa3), - Optional.ofNullable(expectedReviewablePsa4), Optional.ofNullable(expectedReviewablePsa5) - ); - - for (int i = 0; i < 5; i++) { - var actualDo = (ReviewableDraftOrder) judgeApproval.getClass().getMethod("getReviewableDraftOrder" + (i + 1)).invoke(judgeApproval); - var expectedDo = expectedReviewableDraftOrders.get(i).orElse(null); - if (expectedDo != null && actualDo != null) { - assertEquals(expectedDo.getDocument(), actualDo.getDocument()); - assertEquals(expectedDo.getHearingInfo(), actualDo.getHearingInfo()); - assertEquals(expectedDo.getAttachments(), actualDo.getAttachments()); - } else { - assertEquals(expectedDo, actualDo); - } - - var actualPsa = (ReviewablePsa) judgeApproval.getClass().getMethod("getReviewablePsa" + (i + 1)).invoke(judgeApproval); - var expectedPsa = expectedReviewablePsas.get(i).orElse(null); - if (expectedPsa != null && actualPsa != null) { - assertEquals(expectedPsa.getDocument(), actualPsa.getDocument()); - assertEquals(expectedPsa.getHearingInfo(), actualPsa.getHearingInfo()); - } else { - assertEquals(expectedPsa, actualPsa); - } - } - assertEquals(expectedWarningMessageToJudge, judgeApproval.getWarningMessageToJudge()); - } - - private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument1").build(); - private static final CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); - private static final CaseDocument DO_DOC_3 = CaseDocument.builder().documentFilename("sampleDocument3").build(); - private static final CaseDocument DO_DOC_4 = CaseDocument.builder().documentFilename("sampleDocument4").build(); - private static final CaseDocument DO_DOC_5 = CaseDocument.builder().documentFilename("sampleDocument5").build(); - private static final CaseDocument DO_DOC_6 = CaseDocument.builder().documentFilename("sampleDocument6").build(); - private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); - private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); - private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); - private static final CaseDocument PSA_DOC_4 = CaseDocument.builder().documentFilename("samplePsaDocument4").build(); - private static final CaseDocument PSA_DOC_5 = CaseDocument.builder().documentFilename("samplePsaDocument5").build(); - private static final CaseDocument PSA_DOC_6 = CaseDocument.builder().documentFilename("samplePsaDocument6").build(); - private static final CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() - .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); - private static final CaseDocumentCollection DO_ATTACHMENT_2 = CaseDocumentCollection.builder() - .value(CaseDocument.builder().documentFilename("attachment2").build()).build(); - - private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { - return builder.hearingDate(LocalDate.of(2024, 10, 31)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge"); - } - - private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { - return builder.hearingDate(LocalDate.of(2024, 11, 30)) - .hearingTime("09:00") - .hearingType("hearingType") - .hearingJudge("Mr. Judge"); - } - - private static CaseDocument randomCaseDocument() { - return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); - } - - private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, - List attachments) { - return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, LocalDateTime.now()); - } - - private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, - List attachments, OrderStatus orderStatus) { - return buildDraftOrderDocumentReview(draftOrderDocument, attachments, orderStatus, LocalDateTime.now()); - } - - private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { - return buildDraftOrderDocumentReview(randomCaseDocument(), null, orderStatus, LocalDateTime.now()); - } - - private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, - List attachments, OrderStatus orderStatus, - LocalDateTime submittedDate) { - return DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder() - .draftOrderDocument(draftOrderDocument) - .attachments(attachments) - .orderStatus(orderStatus) - .submittedDate(submittedDate) - .build()) - .build(); - } - - private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { - return buildPsaDocReviewCollection(psaDocument, TO_BE_REVIEWED, LocalDateTime.now()); - } - - private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { - return buildPsaDocReviewCollection(psaDocument, orderStatus, LocalDateTime.now()); - } - - private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, - LocalDateTime submittedDate) { - return PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) - .build(); - } - - private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { - return PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder().psaDocument(randomCaseDocument()).orderStatus(orderStatus).build()) - .build(); - } - - private static ReviewableDraftOrder buildReviewableDraftOrder(String hearingInfo, CaseDocument draftOrderDocument, - List attachments) { - return ReviewableDraftOrder.builder().hearingInfo(hearingInfo) - .document(draftOrderDocument) - .attachments(attachments) - .hasAttachment(YesOrNo.forValue(!attachments.isEmpty())) - .build(); - } - - private static ReviewablePsa buildReviewablePsa(String hearingInfo, CaseDocument psaDocument) { - return ReviewablePsa.builder().hearingInfo(hearingInfo) - .document(psaDocument) - .build(); - } - - private static Arguments withEmptyDraftOrdersWrapper() { - return Arguments.of( - DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), - null, null, null, null, null, - null, null, null, null, null, - null - ); - } - - private static Arguments withOneDraftOrderAndOnePsa() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) - )) - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_1) - ))) - .build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder1 - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - null, null, null, null, - // expectedReviewablePsa1 - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), - null, null, null, null, - // expectedWarningMessageToJudge - null); - } - - private static Arguments withTwoDraftOrderAndZeroPsa() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) - ))) - .build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder1 - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - // expectedReviewableDraftOrder2 - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), - null, null, null, - null, null, null, null, null, - // expectedWarningMessageToJudge - null); - } - - private static Arguments withDifferentHearingInfo() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) - )) - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_1) - ))).build()) - .build(), - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo2(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) - )) - ).build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder1 - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - // expectedReviewableDraftOrder2 - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), - null, null, null, - // expectedReviewablePsa1 - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), - null, null, null, null, - // expectedWarningMessageToJudge - null); - } - - private static Arguments withProcessedDraftOrderAndPsa() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(APPROVED_BY_JUDGE), - buildPsaDocReviewCollection(PROCESSED_BY_ADMIN), - buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED) - )) - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(APPROVED_BY_JUDGE), - buildDraftOrderDocumentReview(PROCESSED_BY_ADMIN), - buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2), TO_BE_REVIEWED) - ))) - .build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder(1-5) - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), - null, null, null, null, - // expectedReviewablePsa(1-5) - - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), - null, null, null, null, - // expectedWarningMessageToJudge - null); - } - - private static Arguments withSixPsas() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_6, TO_BE_REVIEWED) - )) - ).build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder(1-5) - null, null, null, null, null, - // expectedReviewablePsa(1-5) - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), - // expectedWarningMessageToJudge - WARNING_MESSAGE); - } - - private static Arguments withSixDraftOrders() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo2(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_1, List.of(), TO_BE_REVIEWED), - buildDraftOrderDocumentReview(DO_DOC_2, List.of(), TO_BE_REVIEWED), - buildDraftOrderDocumentReview(DO_DOC_3, List.of(), TO_BE_REVIEWED), - buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED), - buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED), - buildDraftOrderDocumentReview(DO_DOC_6, List.of(), TO_BE_REVIEWED) - )) - ).build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder(1-5) - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_1, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_3, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), - // expectedReviewablePsa(1-5) - null, null, null, null, null, - // expectedWarningMessageToJudge - WARNING_MESSAGE); - } - - private static Arguments withFiveReviewablePsas() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), - buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), - buildPsaDocReviewCollection(APPROVED_BY_JUDGE) - )) - ).build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder(1-5) - null, null, null, null, null, - // expectedReviewablePsa(1-5) - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), - // expectedWarningMessageToJudge - null); - } - - private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), - buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), - buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), - buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()), - buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED, LocalDateTime.now()) - )) - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_1, List.of()), - buildDraftOrderDocumentReview(DO_DOC_2, List.of()), - buildDraftOrderDocumentReview(DO_DOC_3, List.of()), - buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), - buildDraftOrderDocumentReview(DO_DOC_5, List.of()) - )) - ).build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder(1-5) - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_4, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_3, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_5, List.of()), - // expectedReviewablePsa(1-5) - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), - // expectedWarningMessageToJudge - null); - } - - private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() { - return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo2(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), - buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)) - )) - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), - buildDraftOrderDocumentReview(DO_DOC_4, List.of()) - )) - ).build()) - .build(), - DraftOrdersReviewCollection.builder() - .value(applyHearingInfo1(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), - buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()) - )) - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocumentReview(DO_DOC_1, List.of()), - buildDraftOrderDocumentReview(DO_DOC_2, List.of()) - )) - ).build()) - .build() - )) - .build(), - // expectedReviewableDraftOrder(1-5) - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), - buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), - null, - // expectedReviewablePsa(1-5) - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), - buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), - buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_2), - buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_1), - null, - // expectedWarningMessageToJudge - null); - } - - private static Stream provideDraftOrderData() { - return Stream.of( - withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), - withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), - withFiveReviewablePsas(), withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), - withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate(), - withSixDraftOrders() - ); - } -} +//package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; +// +//import lombok.SneakyThrows; +//import org.junit.jupiter.api.Assertions; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.junit.jupiter.params.ParameterizedTest; +//import org.junit.jupiter.params.provider.Arguments; +//import org.junit.jupiter.params.provider.MethodSource; +//import org.mockito.InjectMocks; +//import org.mockito.Mock; +//import org.mockito.junit.jupiter.MockitoExtension; +//import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; +//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.handler.FinremCallbackRequest; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +//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.draftorders.CaseDocumentCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +//import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; +// +//import java.time.LocalDate; +//import java.time.LocalDateTime; +//import java.util.Collections; +//import java.util.List; +//import java.util.Optional; +//import java.util.stream.Stream; +// +//import static org.assertj.core.api.Assertions.assertThat; +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.junit.jupiter.api.Assertions.assertNotNull; +//import static org.mockito.Mockito.lenient; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; +// +//@ExtendWith(MockitoExtension.class) +//class ApproveDraftOrdersAboutToStartHandlerTest { +// +// private static final String NOT_AVAILABLE_ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; +// +// private static final String WARNING_MESSAGE = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " +// + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; +// +// @Mock +// private HearingService hearingService; +// +// @InjectMocks +// private ApproveDraftOrdersAboutToStartHandler handler; +// +// @Test +// void canHandle() { +// assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); +// } +// +// @SneakyThrows +// @Test +// void givenUserHasJudgeProcessedDraftOrders_thenReturnError() { +// FinremCaseData caseData = new FinremCaseData(); +// +// DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) +// .build(); +// DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED_BY_ADMIN) +// .build(); +// +// DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); +// DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); +// +// DraftOrdersReview review1 = DraftOrdersReview.builder() +// .hearingDate(LocalDate.of(2024, 8, 6)) +// .hearingType("Hearing Type 1") +// .hearingJudge("Judge 1") +// .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) +// .build(); +// +// DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); +// caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); +// +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( +// FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); +// +// Assertions.assertEquals(1, response.getErrors().size()); +// assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); +// var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); +// for (int i = 1; i <= 5; i++) { +// assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); +// assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); +// } +// } +// +// @SneakyThrows +// @Test +// void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { +// FinremCaseData caseData = new FinremCaseData(); +// +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( +// FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); +// +// Assertions.assertEquals(1, response.getErrors().size()); +// assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); +// var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); +// for (int i = 1; i <= 5; i++) { +// assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); +// assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); +// } +// } +// +// @SneakyThrows +// @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," +// + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," +// + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" +// + "expectedReviewablePsa5={10}, expectedWarningMessageToJudge={11}") +// @MethodSource("provideDraftOrderData") +// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") +// void handle_withVariousDraftOrdersWrapperData( +// DraftOrdersWrapper draftOrdersWrapper, +// ReviewableDraftOrder expectedReviewableDraftOrder1, ReviewableDraftOrder expectedReviewableDraftOrder2, +// ReviewableDraftOrder expectedReviewableDraftOrder3, ReviewableDraftOrder expectedReviewableDraftOrder4, +// ReviewableDraftOrder expectedReviewableDraftOrder5, +// ReviewablePsa expectedReviewablePsa1, ReviewablePsa expectedReviewablePsa2, ReviewablePsa expectedReviewablePsa3, +// ReviewablePsa expectedReviewablePsa4, ReviewablePsa expectedReviewablePsa5, +// String expectedWarningMessageToJudge) { +// +// // Arrange +// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() +// .caseDetails(FinremCaseDetails.builder() +// .id(12345L) +// .data(FinremCaseData.builder() +// .draftOrdersWrapper(draftOrdersWrapper) +// .build()) +// .build()) +// .build(); +// lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) +// .thenReturn("hearingServiceFormattedString1"); +// lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) +// .thenReturn("hearingServiceFormattedString2"); +// +// // Act +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); +// +// // Assert +// assertNotNull(response); +// FinremCaseData responseData = response.getData(); +// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); +// +// +// var judgeApproval = responseDraftOrdersWrapper.getJudgeApproval(); +// assertNotNull(judgeApproval); +// +// var expectedReviewableDraftOrders = List.of( +// Optional.ofNullable(expectedReviewableDraftOrder1), Optional.ofNullable(expectedReviewableDraftOrder2), +// Optional.ofNullable(expectedReviewableDraftOrder3), Optional.ofNullable(expectedReviewableDraftOrder4), +// Optional.ofNullable(expectedReviewableDraftOrder5) +// ); +// +// var expectedReviewablePsas = List.of( +// Optional.ofNullable(expectedReviewablePsa1), Optional.ofNullable(expectedReviewablePsa2), Optional.ofNullable(expectedReviewablePsa3), +// Optional.ofNullable(expectedReviewablePsa4), Optional.ofNullable(expectedReviewablePsa5) +// ); +// +// for (int i = 0; i < 5; i++) { +// var actualDo = (ReviewableDraftOrder) judgeApproval.getClass().getMethod("getReviewableDraftOrder" + (i + 1)).invoke(judgeApproval); +// var expectedDo = expectedReviewableDraftOrders.get(i).orElse(null); +// if (expectedDo != null && actualDo != null) { +// assertEquals(expectedDo.getDocument(), actualDo.getDocument()); +// assertEquals(expectedDo.getHearingInfo(), actualDo.getHearingInfo()); +// assertEquals(expectedDo.getAttachments(), actualDo.getAttachments()); +// } else { +// assertEquals(expectedDo, actualDo); +// } +// +// var actualPsa = (ReviewablePsa) judgeApproval.getClass().getMethod("getReviewablePsa" + (i + 1)).invoke(judgeApproval); +// var expectedPsa = expectedReviewablePsas.get(i).orElse(null); +// if (expectedPsa != null && actualPsa != null) { +// assertEquals(expectedPsa.getDocument(), actualPsa.getDocument()); +// assertEquals(expectedPsa.getHearingInfo(), actualPsa.getHearingInfo()); +// } else { +// assertEquals(expectedPsa, actualPsa); +// } +// } +// assertEquals(expectedWarningMessageToJudge, judgeApproval.getWarningMessageToJudge()); +// } +// +// private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument1").build(); +// private static final CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); +// private static final CaseDocument DO_DOC_3 = CaseDocument.builder().documentFilename("sampleDocument3").build(); +// private static final CaseDocument DO_DOC_4 = CaseDocument.builder().documentFilename("sampleDocument4").build(); +// private static final CaseDocument DO_DOC_5 = CaseDocument.builder().documentFilename("sampleDocument5").build(); +// private static final CaseDocument DO_DOC_6 = CaseDocument.builder().documentFilename("sampleDocument6").build(); +// private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); +// private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); +// private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); +// private static final CaseDocument PSA_DOC_4 = CaseDocument.builder().documentFilename("samplePsaDocument4").build(); +// private static final CaseDocument PSA_DOC_5 = CaseDocument.builder().documentFilename("samplePsaDocument5").build(); +// private static final CaseDocument PSA_DOC_6 = CaseDocument.builder().documentFilename("samplePsaDocument6").build(); +// private static final CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() +// .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); +// private static final CaseDocumentCollection DO_ATTACHMENT_2 = CaseDocumentCollection.builder() +// .value(CaseDocument.builder().documentFilename("attachment2").build()).build(); +// +// private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { +// return builder.hearingDate(LocalDate.of(2024, 10, 31)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge"); +// } +// +// private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { +// return builder.hearingDate(LocalDate.of(2024, 11, 30)) +// .hearingTime("09:00") +// .hearingType("hearingType") +// .hearingJudge("Mr. Judge"); +// } +// +// private static CaseDocument randomCaseDocument() { +// return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); +// } +// +// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, +// List attachments) { +// return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, LocalDateTime.now()); +// } +// +// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, +// List attachments, OrderStatus orderStatus) { +// return buildDraftOrderDocumentReview(draftOrderDocument, attachments, orderStatus, LocalDateTime.now()); +// } +// +// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { +// return buildDraftOrderDocumentReview(randomCaseDocument(), null, orderStatus, LocalDateTime.now()); +// } +// +// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, +// List attachments, OrderStatus orderStatus, +// LocalDateTime submittedDate) { +// return DraftOrderDocReviewCollection.builder() +// .value(DraftOrderDocumentReview.builder() +// .draftOrderDocument(draftOrderDocument) +// .attachments(attachments) +// .orderStatus(orderStatus) +// .submittedDate(submittedDate) +// .build()) +// .build(); +// } +// +// private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { +// return buildPsaDocReviewCollection(psaDocument, TO_BE_REVIEWED, LocalDateTime.now()); +// } +// +// private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { +// return buildPsaDocReviewCollection(psaDocument, orderStatus, LocalDateTime.now()); +// } +// +// private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, +// LocalDateTime submittedDate) { +// return PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) +// .build(); +// } +// +// private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { +// return PsaDocReviewCollection.builder() +// .value(PsaDocumentReview.builder().psaDocument(randomCaseDocument()).orderStatus(orderStatus).build()) +// .build(); +// } +// +// private static ReviewableDraftOrder buildReviewableDraftOrder(String hearingInfo, CaseDocument draftOrderDocument, +// List attachments) { +// return ReviewableDraftOrder.builder().hearingInfo(hearingInfo) +// .document(draftOrderDocument) +// .attachments(attachments) +// .hasAttachment(YesOrNo.forValue(!attachments.isEmpty())) +// .build(); +// } +// +// private static ReviewablePsa buildReviewablePsa(String hearingInfo, CaseDocument psaDocument) { +// return ReviewablePsa.builder().hearingInfo(hearingInfo) +// .document(psaDocument) +// .build(); +// } +// +// private static Arguments withEmptyDraftOrdersWrapper() { +// return Arguments.of( +// DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), +// null, null, null, null, null, +// null, null, null, null, null, +// null +// ); +// } +// +// private static Arguments withOneDraftOrderAndOnePsa() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) +// )) +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_1) +// ))) +// .build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder1 +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), +// null, null, null, null, +// // expectedReviewablePsa1 +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), +// null, null, null, null, +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Arguments withTwoDraftOrderAndZeroPsa() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)), +// buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) +// ))) +// .build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder1 +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), +// // expectedReviewableDraftOrder2 +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), +// null, null, null, +// null, null, null, null, null, +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Arguments withDifferentHearingInfo() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) +// )) +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_1) +// ))).build()) +// .build(), +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo2(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) +// )) +// ).build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder1 +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), +// // expectedReviewableDraftOrder2 +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), +// null, null, null, +// // expectedReviewablePsa1 +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), +// null, null, null, null, +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Arguments withProcessedDraftOrderAndPsa() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(APPROVED_BY_JUDGE), +// buildPsaDocReviewCollection(PROCESSED_BY_ADMIN), +// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED) +// )) +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(APPROVED_BY_JUDGE), +// buildDraftOrderDocumentReview(PROCESSED_BY_ADMIN), +// buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2), TO_BE_REVIEWED) +// ))) +// .build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder(1-5) +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), +// null, null, null, null, +// // expectedReviewablePsa(1-5) +// +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), +// null, null, null, null, +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Arguments withSixPsas() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_6, TO_BE_REVIEWED) +// )) +// ).build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder(1-5) +// null, null, null, null, null, +// // expectedReviewablePsa(1-5) +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), +// // expectedWarningMessageToJudge +// WARNING_MESSAGE); +// } +// +// private static Arguments withSixDraftOrders() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo2(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_1, List.of(), TO_BE_REVIEWED), +// buildDraftOrderDocumentReview(DO_DOC_2, List.of(), TO_BE_REVIEWED), +// buildDraftOrderDocumentReview(DO_DOC_3, List.of(), TO_BE_REVIEWED), +// buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED), +// buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED), +// buildDraftOrderDocumentReview(DO_DOC_6, List.of(), TO_BE_REVIEWED) +// )) +// ).build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder(1-5) +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_1, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_3, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), +// // expectedReviewablePsa(1-5) +// null, null, null, null, null, +// // expectedWarningMessageToJudge +// WARNING_MESSAGE); +// } +// +// private static Arguments withFiveReviewablePsas() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), +// buildPsaDocReviewCollection(APPROVED_BY_JUDGE) +// )) +// ).build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder(1-5) +// null, null, null, null, null, +// // expectedReviewablePsa(1-5) +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), +// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), +// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), +// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()), +// buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED, LocalDateTime.now()) +// )) +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_1, List.of()), +// buildDraftOrderDocumentReview(DO_DOC_2, List.of()), +// buildDraftOrderDocumentReview(DO_DOC_3, List.of()), +// buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), +// buildDraftOrderDocumentReview(DO_DOC_5, List.of()) +// )) +// ).build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder(1-5) +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_4, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_3, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_5, List.of()), +// // expectedReviewablePsa(1-5) +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() { +// return Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo2(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), +// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)) +// )) +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), +// buildDraftOrderDocumentReview(DO_DOC_4, List.of()) +// )) +// ).build()) +// .build(), +// DraftOrdersReviewCollection.builder() +// .value(applyHearingInfo1(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), +// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()) +// )) +// .draftOrderDocReviewCollection(List.of( +// buildDraftOrderDocumentReview(DO_DOC_1, List.of()), +// buildDraftOrderDocumentReview(DO_DOC_2, List.of()) +// )) +// ).build()) +// .build() +// )) +// .build(), +// // expectedReviewableDraftOrder(1-5) +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), +// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), +// null, +// // expectedReviewablePsa(1-5) +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), +// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), +// buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_2), +// buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_1), +// null, +// // expectedWarningMessageToJudge +// null); +// } +// +// private static Stream provideDraftOrderData() { +// return Stream.of( +// withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), +// withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), +// withFiveReviewablePsas(), withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), +// withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate(), +// withSixDraftOrders() +// ); +// } +//} From 2c420c6c1a49d9536fe776f66af5890a8c4e7120 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 21 Nov 2024 16:42:49 +0000 Subject: [PATCH 064/336] Remove default getters as they can be null. --- .../model/ccd/wrapper/DraftOrdersWrapper.java | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 71522880dc..4ad4195b4e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -65,46 +65,6 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("judgeApproval5") private JudgeApproval judgeApproval5; - @JsonIgnore - public JudgeApproval getJudgeApproval1() { - if (judgeApproval1 == null) { - this.judgeApproval1 = new JudgeApproval(); - } - return judgeApproval1; - } - - @JsonIgnore - public JudgeApproval getJudgeApproval2() { - if (judgeApproval2 == null) { - this.judgeApproval2 = new JudgeApproval(); - } - return judgeApproval2; - } - - @JsonIgnore - public JudgeApproval getJudgeApproval3() { - if (judgeApproval3 == null) { - this.judgeApproval3 = new JudgeApproval(); - } - return judgeApproval3; - } - - @JsonIgnore - public JudgeApproval getJudgeApproval4() { - if (judgeApproval4 == null) { - this.judgeApproval4 = new JudgeApproval(); - } - return judgeApproval4; - } - - @JsonIgnore - public JudgeApproval getJudgeApproval5() { - if (judgeApproval5 == null) { - this.judgeApproval5 = new JudgeApproval(); - } - return judgeApproval5; - } - public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); From 298d71ae9d41f264ea88ea5a7266edd526eac411 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 21 Nov 2024 16:41:57 +0000 Subject: [PATCH 065/336] DFR-3334 WIP --- .../OrchestrationConstants.java | 1 + ...ApproveDraftOrdersAboutToStartHandler.java | 8 +- ...pproveDraftOrdersAboutToSubmitHandler.java | 47 ++++ .../ApproveDraftOrdersMidEventHandler.java | 83 +++++++ .../judgeapproval/AnotherHearingRequest.java | 28 +++ .../AnotherHearingRequestCollection.java | 17 ++ .../judgeapproval/HearingInstruction.java | 31 +++ .../judgeapproval/JudgeApproval.java | 2 + .../judgeapproval/JudgeApprovalDocType.java | 17 ++ .../judgeapproval/JudgeDecision.java | 18 +- .../model/ccd/wrapper/DraftOrdersWrapper.java | 12 + .../judgeapproval/ApproveOrderService.java | 67 ++++++ ...veDraftOrdersAboutToSubmitHandlerTest.java | 29 +++ ...ApproveDraftOrdersMidEventHandlerTest.java | 223 ++++++++++++++++++ .../ccd/spreadsheet/CCDConfigValidator.java | 3 +- .../ApproveOrderServiceTest.java | 125 ++++++++++ 16 files changed, 704 insertions(+), 7 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequestCollection.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/HearingInstruction.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java index fe7b164d7f..ea8a8c4972 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java @@ -64,4 +64,5 @@ public class OrchestrationConstants { "If you are applying for variation order, please upload the order you are varying"; public static final String CONSENT_OTHER_DOC_LABEL_VALUE = "Upload other order documentation related to your application"; + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index e45f094c78..7210c87144 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.stream.Stream; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @Slf4j @@ -111,7 +113,8 @@ private List getReviewableItems(List .map(DraftOrderDocReviewCollection::getValue) .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) .map(a -> JudgeApproval.builder() - .title("Draft Order") + .docType(DRAFT_ORDER) + .title(DRAFT_ORDER.getTitle()) .hearingInfo(hearingInfo) .document(a.getDraftOrderDocument()) .attachments(a.getAttachments()) @@ -125,7 +128,8 @@ private List getReviewableItems(List .map(PsaDocReviewCollection::getValue) .filter(a -> OrderStatus.isJudgeReviewable(a.getOrderStatus())) .map(a -> JudgeApproval.builder() - .title("PSA") + .docType(PSA) + .title(PSA.getTitle()) .hearingInfo(hearingInfo) .document(a.getPsaDocument()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java new file mode 100644 index 0000000000..186a6fd076 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java @@ -0,0 +1,47 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.FinremCallbackHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +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.service.judgeapproval.ApproveOrderService; + +@Slf4j +@Service +public class ApproveDraftOrdersAboutToSubmitHandler extends FinremCallbackHandler { + + private final ApproveOrderService approveOrderService; + + public ApproveDraftOrdersAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, ApproveOrderService approveOrderService) { + super(finremCaseDetailsMapper); + this.approveOrderService = approveOrderService; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return CallbackType.ABOUT_TO_SUBMIT.equals(callbackType) + && CaseType.CONTESTED.equals(caseType) + && EventType.APPROVE_ORDERS.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested {} about-to-submit event callback for Case ID: {}", callbackRequest.getEventType(), caseId); + + FinremCaseData finremCaseData = caseDetails.getData(); + // DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java new file mode 100644 index 0000000000..1efba41821 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -0,0 +1,83 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.FinremCallbackHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +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.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; + +import java.util.List; +import java.util.Objects; +import java.util.stream.IntStream; + +@Slf4j +@Service +public class ApproveDraftOrdersMidEventHandler extends FinremCallbackHandler { + + private final ApproveOrderService approveOrderService; + + public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, ApproveOrderService approveOrderService) { + super(finremCaseDetailsMapper); + this.approveOrderService = approveOrderService; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return CallbackType.MID_EVENT.equals(callbackType) + && CaseType.CONTESTED.equals(caseType) + && EventType.APPROVE_ORDERS.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested {} mid event callback for Case ID: {}", callbackRequest.getEventType(), caseId); + + FinremCaseData finremCaseData = caseDetails.getData(); + DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + + boolean isHearingInstructionRequired = IntStream.rangeClosed(1, 5) + .mapToObj(i -> locateJudgeApproval(draftOrdersWrapper, i)) + .filter(Objects::nonNull) + .map(JudgeApproval::getJudgeDecision) + .anyMatch(decision -> decision != null && decision.isHearingInstructionRequired()); + + draftOrdersWrapper.getHearingInstruction().setShowRequireAnotherHearingQuestion(YesOrNo.forValue(isHearingInstructionRequired)); + + draftOrdersWrapper.getHearingInstruction().setAnotherHearingRequestCollection(List.of( + AnotherHearingRequestCollection.builder() + .value(AnotherHearingRequest.builder() + .whichOrder(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)) + .build()) + .build() + )); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } + + private JudgeApproval locateJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, int index) { + return switch (index) { + case 1 -> draftOrdersWrapper.getJudgeApproval1(); + case 2 -> draftOrdersWrapper.getJudgeApproval2(); + case 3 -> draftOrdersWrapper.getJudgeApproval3(); + case 4 -> draftOrdersWrapper.getJudgeApproval4(); + case 5 -> draftOrdersWrapper.getJudgeApproval5(); + default -> null; + }; + } + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java new file mode 100644 index 0000000000..0b70993286 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java @@ -0,0 +1,28 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTypeDirection; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class AnotherHearingRequest { + + private DynamicList whichOrder; + + private HearingTypeDirection typeOfHearing; + + private HearingTimeDirection timeEstimate; + + private String additionalTime; + + private String anyOtherListingInstructions; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequestCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequestCollection.java new file mode 100644 index 0000000000..c4d6b520a6 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequestCollection.java @@ -0,0 +1,17 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class AnotherHearingRequestCollection { + + private AnotherHearingRequest value; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/HearingInstruction.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/HearingInstruction.java new file mode 100644 index 0000000000..7eb7b410e0 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/HearingInstruction.java @@ -0,0 +1,31 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; + +import java.util.List; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder(toBuilder = true) +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class HearingInstruction { + + @JsonProperty("requireAnotherHearing") + private YesOrNo requireAnotherHearing; + + @JsonProperty("showRequireAnotherHearingQuestion") + private YesOrNo showRequireAnotherHearingQuestion; + + @JsonProperty("anotherHearingRequestCollection") + private List anotherHearingRequestCollection; + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index ecacb99055..b5d3d75ac1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -24,6 +24,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class JudgeApproval { + private JudgeApprovalDocType docType; + private String title; private String hearingInfo; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java new file mode 100644 index 0000000000..ee19eba18f --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java @@ -0,0 +1,17 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import lombok.Getter; + +@Getter +public enum JudgeApprovalDocType { + + DRAFT_ORDER("Draft Order"), + + PSA("Pension Sharing Annex"); + private final String title; + + JudgeApprovalDocType(String title) { + this.title = title; + } + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java index e0993b3b37..9e28faa19d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java @@ -1,8 +1,18 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; +import lombok.Getter; + +@Getter public enum JudgeDecision { - REVIEW_LATER, - LEGAL_REP_NEEDS_TO_MAKE_CHANGE, - JUDGE_NEEDS_TO_MAKE_CHANGES, - READY_TO_BE_SEALED; + + REVIEW_LATER(false), + LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false), + JUDGE_NEEDS_TO_MAKE_CHANGES(true), + READY_TO_BE_SEALED(true); + private final boolean hearingInstructionRequired; + + JudgeDecision(boolean hearingInstructionRequired) { + this.hearingInstructionRequired = hearingInstructionRequired; + } + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 4ad4195b4e..fcf3612692 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -11,6 +11,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; @@ -65,6 +66,17 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("judgeApproval5") private JudgeApproval judgeApproval5; + @JsonProperty("hearingInstruction") + private HearingInstruction hearingInstruction; + + @JsonIgnore + public HearingInstruction getHearingInstruction() { + if (hearingInstruction == null) { + this.hearingInstruction = new HearingInstruction(); + } + return hearingInstruction; + } + public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java new file mode 100644 index 0000000000..d3621074ef --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -0,0 +1,67 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Service; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; + +import java.util.ArrayList; +import java.util.List; + +@Service +@Slf4j +@RequiredArgsConstructor +public class ApproveOrderService { + + public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrapper) { + List listItems = new ArrayList<>(); + + for (int i = 1; i <= 5; i++) { + JudgeApproval judgeApproval = getJudgeApproval(draftOrdersWrapper, i); + if (judgeApproval != null) { + String codePrefix = JudgeApprovalDocType.DRAFT_ORDER == judgeApproval.getDocType() ? "draftOrder" : "psa"; + String code = codePrefix + "_" + i; + + String filename = getDocumentFileName(judgeApproval); + if (!StringUtils.isEmpty(filename)) { + listItems.add(DynamicListElement.builder().code(code).label(filename).build()); + } + } + } + + return DynamicList.builder().listItems(listItems).build(); + } + + private static String getDocumentFileName(JudgeApproval judgeApproval) { + String filename = null; + if (JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { + filename = judgeApproval.getAmendedDocument() != null + ? judgeApproval.getAmendedDocument().getDocumentFilename() + : "Unknown Filename"; + } else if (JudgeDecision.READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { + filename = judgeApproval.getDocument() != null + ? judgeApproval.getDocument().getDocumentFilename() + : "Unknown Filename"; + } + return filename; + } + + private JudgeApproval getJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, int index) { + return switch (index) { + case 1 -> draftOrdersWrapper.getJudgeApproval1(); + case 2 -> draftOrdersWrapper.getJudgeApproval2(); + case 3 -> draftOrdersWrapper.getJudgeApproval3(); + case 4 -> draftOrdersWrapper.getJudgeApproval4(); + case 5 -> draftOrdersWrapper.getJudgeApproval5(); + default -> null; + }; + } + + +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java new file mode 100644 index 0000000000..52285de3a6 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java @@ -0,0 +1,29 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +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.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersAboutToSubmitHandlerTest { + + @InjectMocks + private ApproveDraftOrdersAboutToSubmitHandler handler; + + @Mock + private ApproveOrderService approveOrderService; + + @Test + void canHandle() { + assertCanHandle(handler, CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); + } + +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java new file mode 100644 index 0000000000..94aefb3464 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -0,0 +1,223 @@ +//package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; +// +//import lombok.SneakyThrows; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.junit.jupiter.params.ParameterizedTest; +//import org.junit.jupiter.params.provider.Arguments; +//import org.junit.jupiter.params.provider.MethodSource; +//import org.mockito.InjectMocks; +//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.handler.FinremCallbackRequest; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +//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.draftorders.judgeapproval.AnotherHearingRequest; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +//import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; +// +//import java.util.List; +//import java.util.stream.Stream; +// +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.junit.jupiter.api.Assertions.assertNotNull; +//import static org.junit.jupiter.api.Assertions.assertNull; +//import static org.mockito.Mockito.when; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; +// +//@ExtendWith(MockitoExtension.class) +//class ApproveDraftOrdersMidEventHandlerTest { +// +// @InjectMocks +// private ApproveDraftOrdersMidEventHandler handler; +// +// @Mock +// private ApproveOrderService approveOrderService; +// +// @Test +// void canHandle() { +// assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); +// } +// +// @SneakyThrows +// @ParameterizedTest(name = "{index} => reviewableDraftOrder1={0}" +// + "reviewableDraftOrder2={1}" +// + "reviewableDraftOrder3={2}" +// + "reviewableDraftOrder4={3}" +// + "reviewableDraftOrder5={4}" +// + "reviewablePsa1={5}" +// + "reviewablePsa2={6}" +// + "reviewablePsa3={7}" +// + "reviewablePsa4={8}" +// + "reviewablePsa5={9}" +// + "expectedShowRequireAnotherHearingQuestion={10}") +// @MethodSource("provideDraftOrderOrPsaData") +// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") +// void handle_withVariousDraftOrdersWrapperData(ReviewableDraftOrder reviewableDraftOrder1, ReviewableDraftOrder reviewableDraftOrder2, +// ReviewableDraftOrder reviewableDraftOrder3, ReviewableDraftOrder reviewableDraftOrder4, +// ReviewableDraftOrder reviewableDraftOrder5, +// +// ReviewablePsa reviewablePsa1, ReviewablePsa reviewablePsa2, +// ReviewablePsa reviewablePsa3, ReviewablePsa reviewablePsa4, ReviewablePsa reviewablePsa5, +// YesOrNo expectedShowRequireAnotherHearingQuestion) { +// +// // Arrange +// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() +// .caseDetails(FinremCaseDetails.builder() +// .id(12345L) +// .data(FinremCaseData.builder() +// .draftOrdersWrapper(DraftOrdersWrapper.builder().judgeApproval(JudgeApproval.builder() +// .reviewableDraftOrder1(reviewableDraftOrder1) +// .reviewableDraftOrder2(reviewableDraftOrder2) +// .reviewableDraftOrder3(reviewableDraftOrder3) +// .reviewableDraftOrder4(reviewableDraftOrder4) +// .reviewableDraftOrder5(reviewableDraftOrder5) +// .reviewablePsa1(reviewablePsa1) +// .reviewablePsa2(reviewablePsa2) +// .reviewablePsa3(reviewablePsa3) +// .reviewablePsa4(reviewablePsa4) +// .reviewablePsa5(reviewablePsa5) +// .build()).build()) +// .build()) +// .build()) +// .build(); +// +// // Act +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); +// +// // Assert +// assertNotNull(response); +// FinremCaseData responseData = response.getData(); +// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); +// +// var hearingInstruction = responseDraftOrdersWrapper.getHearingInstruction(); +// assertNotNull(hearingInstruction); +// +// assertEquals(expectedShowRequireAnotherHearingQuestion, hearingInstruction.getShowRequireAnotherHearingQuestion()); +// } +// +// private static Stream provideDraftOrderOrPsaData() { +// return Stream.of( +// Arguments.of( +// null, null, null, null, null, null, null, null, null, null, NO +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), null, null, null, null, +// null, null, null, null, null, YES +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), null, null, null, null, +// null, null, null, null, null, YES +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE).build(), null, null, null, null, +// null, null, null, null, null, NO +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), null, null, null, null, +// null, null, null, null, null, NO +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// null, null, null, null, null, +// YES +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// null, null, null, null, null, +// YES +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// null, null, null, null, null, +// YES +// ), +// Arguments.of( +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), +// ReviewablePsa.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// null, null, null, null, +// YES +// ), +// Arguments.of( +// null, null, null, null, null, +// ReviewablePsa.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// null, null, null, null, +// YES +// ) +// ); +// } +// +// @Test +// void shouldPopulateAnEmptyAnotherHearingRequestEntry() { +// // Arrange +// JudgeApproval judgeApproval = null; +// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() +// .caseDetails(FinremCaseDetails.builder() +// .id(12345L) +// .data(FinremCaseData.builder() +// .draftOrdersWrapper(DraftOrdersWrapper.builder().judgeApproval(judgeApproval = JudgeApproval.builder() +// .reviewableDraftOrder1(ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build()) +// .build()).build()) +// .build()) +// .build()) +// .build(); +// +// DynamicList expectedDynamicList = DynamicList.builder().build(); +// when(approveOrderService.buildWhichOrderDynamicList(judgeApproval)).thenReturn(expectedDynamicList); +// +// // Act +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); +// +// // Assert +// assertNotNull(response); +// FinremCaseData responseData = response.getData(); +// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); +// +// List actualCollection = +// responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); +// +// assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); +// assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); +// AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); +// assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); +// assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); +// assertNull(actualRequest.getTypeOfHearing(), "typeOfHearing should be null"); +// assertNull(actualRequest.getTimeEstimate(), "timeEstimate should be null"); +// assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); +// assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); +// } +//} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index b04d3e1a3f..17e023c139 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -77,7 +77,8 @@ public class CCDConfigValidator { Map.entry("Flags", "CaseFlag"), Map.entry("FR_uploadAgreedDraftOrder", "UploadAgreedDraftOrder"), Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder"), - Map.entry("FR_judgeApproval", "JudgeApproval") + Map.entry("FR_judgeApproval", "JudgeApproval"), + Map.entry("FR_hearingInstruction", "HearingInstruction") ); private Map specialFieldTypes = Map.ofEntries( diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java new file mode 100644 index 0000000000..6c500c9002 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -0,0 +1,125 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.mockito.InjectMocks; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; + +import java.util.List; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; + +@ExtendWith(MockitoExtension.class) +class ApproveOrderServiceTest { + + @InjectMocks + private ApproveOrderService underTest; + + @ParameterizedTest + @CsvSource({ + "1, READY_TO_BE_SEALED, draftOrder_1, DraftDocument1.pdf", + "2, JUDGE_NEEDS_TO_MAKE_CHANGES, draftOrder_2, AmendedDraftDocument2.pdf", + "3, REVIEW_LATER, , " + }) + void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decision, String expectedCode, String expectedLabel) { + // Arrange + DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); + setJudgeApprovalToDraftOrdersWrapper(index,draftOrdersWrapper, createJudgeApproval(index, decision, null)); + + // Act + DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); + + // Assert + if (expectedCode == null) { + Assertions.assertTrue(dynamicList.getListItems().isEmpty()); + } else { + Assertions.assertEquals(1, dynamicList.getListItems().size()); + DynamicListElement element = dynamicList.getListItems().get(0); + Assertions.assertEquals(expectedCode, element.getCode()); + Assertions.assertEquals(expectedLabel, element.getLabel()); + } + } + + private String expectedDocumentNamePrefix(String decision) { + return "READY_TO_BE_SEALED".equals(decision) ? "" : "Amended"; + } + + @Test + void testBuildWhichOrderDynamicListMultipleItems() { + // Arrange + DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); + setJudgeApprovalToDraftOrdersWrapper(1, draftOrdersWrapper, createJudgeApproval(1, "READY_TO_BE_SEALED", null)); + setJudgeApprovalToDraftOrdersWrapper(2, draftOrdersWrapper, createJudgeApproval(2, null, "REVIEW_LATER")); + setJudgeApprovalToDraftOrdersWrapper(3, draftOrdersWrapper, createJudgeApproval(3, null, "JUDGE_NEEDS_TO_MAKE_CHANGES")); + + // Act + DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); + + // Assert + Assertions.assertEquals(2,dynamicList.getListItems().size()); + + List listItems = dynamicList.getListItems(); + + // Additional checks to validate correct elements + Assertions.assertEquals("draftOrder_" + 1, listItems.get(0).getCode()); + Assertions.assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); + + Assertions.assertEquals("psa_" + 3, listItems.get(1).getCode()); + Assertions.assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); + } + + private void setJudgeApprovalToDraftOrdersWrapper(int index, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval target) { + try { + DraftOrdersWrapper.class + .getMethod("setJudgeApproval" + index, JudgeApproval.class) + .invoke(draftOrdersWrapper, target); + } catch (Exception e) { + throw new RuntimeException("Error setting judge approval", e); + } + } + + private JudgeApproval createJudgeApproval(int index, String draftDecision, String psaDecision) { + JudgeApproval judgeApproval = new JudgeApproval(); + + if (draftDecision != null) { + judgeApproval.setJudgeDecision(JudgeDecision.valueOf(draftDecision)); + CaseDocument document = new CaseDocument(); + CaseDocument amendedDocument = new CaseDocument(); + + document.setDocumentFilename("DraftDocument" + index + ".pdf"); + amendedDocument.setDocumentFilename("AmendedDraftDocument" + index + ".pdf"); + + judgeApproval.setDocument(document); + judgeApproval.setAmendedDocument(amendedDocument); + judgeApproval.setTitle(DRAFT_ORDER.getTitle()); + judgeApproval.setDocType(DRAFT_ORDER); + } + + if (psaDecision != null) { + judgeApproval.setJudgeDecision(JudgeDecision.valueOf(psaDecision)); + CaseDocument document = new CaseDocument(); + CaseDocument amendedDocument = new CaseDocument(); + + document.setDocumentFilename("PsaDocument" + index + ".pdf"); + amendedDocument.setDocumentFilename("AmendedPsaDocument" + index + ".pdf"); + + judgeApproval.setDocument(document); + judgeApproval.setAmendedDocument(amendedDocument); + judgeApproval.setTitle(PSA.getTitle()); + judgeApproval.setDocType(PSA); + } + + return judgeApproval; + } + +} From efc40d13d569ab23d184d430677298657da23c63 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 09:58:03 +0000 Subject: [PATCH 066/336] ApproveDraftOrderAboutToStartHandlerTest --- ...ApproveDraftOrdersAboutToStartHandler.java | 9 +- .../draftorders/judgeapproval/SortKey.java | 51 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 842 ++++++++++-------- 3 files changed, 502 insertions(+), 400 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index e45f094c78..fd76cbc41f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -9,6 +9,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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; @@ -28,6 +29,7 @@ import java.util.List; import java.util.stream.Stream; +import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @Slf4j @@ -117,7 +119,8 @@ private List getReviewableItems(List .attachments(a.getAttachments()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingDate(), - a.getSubmittedDate())) + a.getSubmittedDate(), ofNullable(a.getDraftOrderDocument()).orElse(CaseDocument.builder().documentFilename("").build()) + .getDocumentFilename())) .build()); // Process PSAs @@ -130,7 +133,8 @@ private List getReviewableItems(List .document(a.getPsaDocument()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingDate(), - a.getSubmittedDate())) + a.getSubmittedDate(), ofNullable(a.getPsaDocument()).orElse(CaseDocument.builder().documentFilename("").build()) + .getDocumentFilename())) .build()); // Combine the two streams @@ -140,7 +144,6 @@ private List getReviewableItems(List .toList(); } - private JudgeApproval createReviewableItems(List outstanding, int index) { List collection = getReviewableItems(outstanding); if (collection.size() < index) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java index 332f4de88e..51a697e2ff 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java @@ -7,6 +7,31 @@ import java.time.LocalDate; import java.time.LocalDateTime; + +/** + * Represents a sorting key for judge approval draft orders, incorporating hearing time, hearing date, + * document submission date, and document filename. This class implements {@link Comparable} to enable + * sorting based on the defined properties in a priority order. + * + *

Sorting Priority:

+ *
    + *
  1. Hearing Date (ascending, nulls first)
    2. + *
  2. Hearing Time (ascending, nulls first)
    3. + *
  3. Document Submitted Date (ascending, nulls first)
    4. + *
  4. Document Filename (ascending, nulls first)
    5. + *
+ * + *

Null-safe comparison is applied for all fields.

+ * + *

Usage Example:

+ * 
+ * SortKey key1 = new SortKey("10:00", LocalDate.of(2024, 11, 22), LocalDateTime.of(2024, 11, 21, 9, 0), "doc1.pdf");
+ * SortKey key2 = new SortKey("11:00", LocalDate.of(2024, 11, 22), LocalDateTime.of(2024, 11, 21, 10, 0), "doc2.pdf");
+ * int result = key1.compareTo(key2);
+ *
+ * + * @see Comparable + */ @Setter @Getter @Data @@ -14,13 +39,31 @@ public class SortKey implements Comparable { private String hearingTime; private LocalDate hearingDate; private LocalDateTime documentSubmittedDate; + private String documentFilename; - public SortKey(String hearingTime, LocalDate hearingDate, LocalDateTime documentSubmittedDate) { + /** + * Constructs a {@link SortKey} with the specified details. + * + * @param hearingTime the hearing time, can be null. + * @param hearingDate the hearing date, can be null. + * @param documentSubmittedDate the document submission date and time, can be null. + * @param documentFilename the filename of the document, can be null. + */ + public SortKey(String hearingTime, LocalDate hearingDate, LocalDateTime documentSubmittedDate, String documentFilename) { this.hearingTime = hearingTime; this.hearingDate = hearingDate; this.documentSubmittedDate = documentSubmittedDate; + this.documentFilename = documentFilename; } + /** + * Compares this {@link SortKey} to another for sorting purposes. + * The comparison order is determined by the priority of the fields as described above. + * + * @param other the other {@link SortKey} to compare against. + * @return a negative integer, zero, or a positive integer as this object is less than, + * equal to, or greater than the specified object. + */ @Override public int compareTo(SortKey other) { // Null checks with default ordering behavior @@ -35,7 +78,11 @@ public int compareTo(SortKey other) { if (result != 0) { return result; } - return compareWithNullCheck(this.documentSubmittedDate, other.documentSubmittedDate); + result = compareWithNullCheck(this.documentSubmittedDate, other.documentSubmittedDate); + if (result != 0) { + return result; + } + return compareWithNullCheck(this.documentFilename, other.documentFilename); } private > int compareWithNullCheck(T a, T b) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 2d20c2d05e..96849a7eba 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -1,391 +1,439 @@ -//package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; -// -//import lombok.SneakyThrows; -//import org.junit.jupiter.api.Assertions; -//import org.junit.jupiter.api.DisplayName; -//import org.junit.jupiter.api.Test; -//import org.junit.jupiter.api.extension.ExtendWith; -//import org.junit.jupiter.params.ParameterizedTest; -//import org.junit.jupiter.params.provider.Arguments; -//import org.junit.jupiter.params.provider.MethodSource; -//import org.mockito.InjectMocks; -//import org.mockito.Mock; -//import org.mockito.junit.jupiter.MockitoExtension; -//import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; -//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.handler.FinremCallbackRequest; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -//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.draftorders.CaseDocumentCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -//import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; -// -//import java.time.LocalDate; -//import java.time.LocalDateTime; -//import java.util.Collections; -//import java.util.List; -//import java.util.Optional; -//import java.util.stream.Stream; -// -//import static org.assertj.core.api.Assertions.assertThat; -//import static org.junit.jupiter.api.Assertions.assertEquals; -//import static org.junit.jupiter.api.Assertions.assertNotNull; -//import static org.mockito.Mockito.lenient; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; -// -//@ExtendWith(MockitoExtension.class) -//class ApproveDraftOrdersAboutToStartHandlerTest { -// -// private static final String NOT_AVAILABLE_ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; -// -// private static final String WARNING_MESSAGE = "This page is limited to showing only 5 draft orders/pension sharing annexes requiring review. " -// + "There are additional draft orders/pension sharing annexes requiring review that are not shown."; -// -// @Mock -// private HearingService hearingService; -// -// @InjectMocks -// private ApproveDraftOrdersAboutToStartHandler handler; -// -// @Test -// void canHandle() { -// assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); -// } -// -// @SneakyThrows -// @Test -// void givenUserHasJudgeProcessedDraftOrders_thenReturnError() { -// FinremCaseData caseData = new FinremCaseData(); -// -// DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) -// .build(); -// DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED_BY_ADMIN) -// .build(); -// -// DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); -// DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); -// -// DraftOrdersReview review1 = DraftOrdersReview.builder() -// .hearingDate(LocalDate.of(2024, 8, 6)) -// .hearingType("Hearing Type 1") -// .hearingJudge("Judge 1") -// .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) -// .build(); -// -// DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); -// caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); -// -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( -// FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); -// -// Assertions.assertEquals(1, response.getErrors().size()); -// assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); -// var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); -// for (int i = 1; i <= 5; i++) { -// assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); -// assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); -// } -// } -// -// @SneakyThrows -// @Test -// void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { -// FinremCaseData caseData = new FinremCaseData(); -// -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( -// FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); -// -// Assertions.assertEquals(1, response.getErrors().size()); -// assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); -// var judgeApproval = response.getData().getDraftOrdersWrapper().getJudgeApproval(); -// for (int i = 1; i <= 5; i++) { -// assertThat(judgeApproval.getClass().getMethod("getReviewableDraftOrder" + i).invoke(judgeApproval)).isNull(); -// assertThat(judgeApproval.getClass().getMethod("getReviewablePsa" + i).invoke(judgeApproval)).isNull(); -// } -// } -// -// @SneakyThrows -// @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedReviewableDraftOrder1={1}, expectedReviewableDraftOrder2={2}," -// + "expectedReviewableDraftOrder3={3}, expectedReviewableDraftOrder4={4}, expectedReviewableDraftOrder5={5}," -// + "expectedReviewablePsa1={6}, expectedReviewablePsa2={7}, expectedReviewablePsa3={8}, expectedReviewablePsa4={9}" -// + "expectedReviewablePsa5={10}, expectedWarningMessageToJudge={11}") -// @MethodSource("provideDraftOrderData") -// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") -// void handle_withVariousDraftOrdersWrapperData( -// DraftOrdersWrapper draftOrdersWrapper, -// ReviewableDraftOrder expectedReviewableDraftOrder1, ReviewableDraftOrder expectedReviewableDraftOrder2, -// ReviewableDraftOrder expectedReviewableDraftOrder3, ReviewableDraftOrder expectedReviewableDraftOrder4, -// ReviewableDraftOrder expectedReviewableDraftOrder5, -// ReviewablePsa expectedReviewablePsa1, ReviewablePsa expectedReviewablePsa2, ReviewablePsa expectedReviewablePsa3, -// ReviewablePsa expectedReviewablePsa4, ReviewablePsa expectedReviewablePsa5, -// String expectedWarningMessageToJudge) { -// -// // Arrange -// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() -// .caseDetails(FinremCaseDetails.builder() -// .id(12345L) -// .data(FinremCaseData.builder() -// .draftOrdersWrapper(draftOrdersWrapper) -// .build()) -// .build()) -// .build(); -// lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) -// .thenReturn("hearingServiceFormattedString1"); -// lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) -// .thenReturn("hearingServiceFormattedString2"); -// -// // Act -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); -// -// // Assert -// assertNotNull(response); -// FinremCaseData responseData = response.getData(); -// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); -// -// -// var judgeApproval = responseDraftOrdersWrapper.getJudgeApproval(); -// assertNotNull(judgeApproval); -// -// var expectedReviewableDraftOrders = List.of( -// Optional.ofNullable(expectedReviewableDraftOrder1), Optional.ofNullable(expectedReviewableDraftOrder2), -// Optional.ofNullable(expectedReviewableDraftOrder3), Optional.ofNullable(expectedReviewableDraftOrder4), -// Optional.ofNullable(expectedReviewableDraftOrder5) -// ); -// -// var expectedReviewablePsas = List.of( -// Optional.ofNullable(expectedReviewablePsa1), Optional.ofNullable(expectedReviewablePsa2), Optional.ofNullable(expectedReviewablePsa3), -// Optional.ofNullable(expectedReviewablePsa4), Optional.ofNullable(expectedReviewablePsa5) -// ); -// -// for (int i = 0; i < 5; i++) { -// var actualDo = (ReviewableDraftOrder) judgeApproval.getClass().getMethod("getReviewableDraftOrder" + (i + 1)).invoke(judgeApproval); -// var expectedDo = expectedReviewableDraftOrders.get(i).orElse(null); -// if (expectedDo != null && actualDo != null) { -// assertEquals(expectedDo.getDocument(), actualDo.getDocument()); -// assertEquals(expectedDo.getHearingInfo(), actualDo.getHearingInfo()); -// assertEquals(expectedDo.getAttachments(), actualDo.getAttachments()); -// } else { -// assertEquals(expectedDo, actualDo); -// } -// -// var actualPsa = (ReviewablePsa) judgeApproval.getClass().getMethod("getReviewablePsa" + (i + 1)).invoke(judgeApproval); -// var expectedPsa = expectedReviewablePsas.get(i).orElse(null); -// if (expectedPsa != null && actualPsa != null) { -// assertEquals(expectedPsa.getDocument(), actualPsa.getDocument()); -// assertEquals(expectedPsa.getHearingInfo(), actualPsa.getHearingInfo()); -// } else { -// assertEquals(expectedPsa, actualPsa); -// } -// } -// assertEquals(expectedWarningMessageToJudge, judgeApproval.getWarningMessageToJudge()); -// } -// -// private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument1").build(); -// private static final CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); -// private static final CaseDocument DO_DOC_3 = CaseDocument.builder().documentFilename("sampleDocument3").build(); -// private static final CaseDocument DO_DOC_4 = CaseDocument.builder().documentFilename("sampleDocument4").build(); -// private static final CaseDocument DO_DOC_5 = CaseDocument.builder().documentFilename("sampleDocument5").build(); -// private static final CaseDocument DO_DOC_6 = CaseDocument.builder().documentFilename("sampleDocument6").build(); -// private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); -// private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); -// private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); -// private static final CaseDocument PSA_DOC_4 = CaseDocument.builder().documentFilename("samplePsaDocument4").build(); -// private static final CaseDocument PSA_DOC_5 = CaseDocument.builder().documentFilename("samplePsaDocument5").build(); -// private static final CaseDocument PSA_DOC_6 = CaseDocument.builder().documentFilename("samplePsaDocument6").build(); -// private static final CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() -// .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); -// private static final CaseDocumentCollection DO_ATTACHMENT_2 = CaseDocumentCollection.builder() -// .value(CaseDocument.builder().documentFilename("attachment2").build()).build(); -// -// private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { -// return builder.hearingDate(LocalDate.of(2024, 10, 31)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge"); -// } -// -// private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { -// return builder.hearingDate(LocalDate.of(2024, 11, 30)) -// .hearingTime("09:00") -// .hearingType("hearingType") -// .hearingJudge("Mr. Judge"); -// } -// -// private static CaseDocument randomCaseDocument() { -// return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); -// } -// -// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, -// List attachments) { -// return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, LocalDateTime.now()); -// } -// -// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, -// List attachments, OrderStatus orderStatus) { -// return buildDraftOrderDocumentReview(draftOrderDocument, attachments, orderStatus, LocalDateTime.now()); -// } -// -// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { -// return buildDraftOrderDocumentReview(randomCaseDocument(), null, orderStatus, LocalDateTime.now()); -// } -// -// private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, -// List attachments, OrderStatus orderStatus, -// LocalDateTime submittedDate) { -// return DraftOrderDocReviewCollection.builder() -// .value(DraftOrderDocumentReview.builder() -// .draftOrderDocument(draftOrderDocument) -// .attachments(attachments) -// .orderStatus(orderStatus) -// .submittedDate(submittedDate) -// .build()) -// .build(); -// } -// -// private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { -// return buildPsaDocReviewCollection(psaDocument, TO_BE_REVIEWED, LocalDateTime.now()); -// } -// -// private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { -// return buildPsaDocReviewCollection(psaDocument, orderStatus, LocalDateTime.now()); -// } -// -// private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, -// LocalDateTime submittedDate) { -// return PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) -// .build(); -// } -// -// private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { -// return PsaDocReviewCollection.builder() -// .value(PsaDocumentReview.builder().psaDocument(randomCaseDocument()).orderStatus(orderStatus).build()) -// .build(); -// } -// -// private static ReviewableDraftOrder buildReviewableDraftOrder(String hearingInfo, CaseDocument draftOrderDocument, -// List attachments) { -// return ReviewableDraftOrder.builder().hearingInfo(hearingInfo) -// .document(draftOrderDocument) -// .attachments(attachments) -// .hasAttachment(YesOrNo.forValue(!attachments.isEmpty())) -// .build(); -// } -// -// private static ReviewablePsa buildReviewablePsa(String hearingInfo, CaseDocument psaDocument) { -// return ReviewablePsa.builder().hearingInfo(hearingInfo) -// .document(psaDocument) -// .build(); -// } -// -// private static Arguments withEmptyDraftOrdersWrapper() { -// return Arguments.of( -// DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), -// null, null, null, null, null, -// null, null, null, null, null, -// null -// ); -// } -// -// private static Arguments withOneDraftOrderAndOnePsa() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) -// )) -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_1) -// ))) -// .build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder1 -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), -// null, null, null, null, -// // expectedReviewablePsa1 -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), -// null, null, null, null, -// // expectedWarningMessageToJudge -// null); -// } -// -// private static Arguments withTwoDraftOrderAndZeroPsa() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)), -// buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) -// ))) -// .build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder1 -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), -// // expectedReviewableDraftOrder2 -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), -// null, null, null, -// null, null, null, null, null, -// // expectedWarningMessageToJudge -// null); -// } -// -// private static Arguments withDifferentHearingInfo() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) -// )) -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_1) -// ))).build()) -// .build(), -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo2(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) -// )) -// ).build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder1 -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), -// // expectedReviewableDraftOrder2 -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), -// null, null, null, -// // expectedReviewablePsa1 -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), -// null, null, null, null, -// // expectedWarningMessageToJudge -// null); -// } +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import lombok.SneakyThrows; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; +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.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.lenient; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersAboutToStartHandlerTest { + + private static final String NOT_AVAILABLE_ERROR_MESSAGE = "There are no draft orders or pension sharing annexes to review."; + + private static final int NUMBER_OF_DOC_TO_BE_REVIEWED = 5; + + @Mock + private HearingService hearingService; + + @InjectMocks + private ApproveDraftOrdersAboutToStartHandler handler; + + @Test + void canHandle() { + assertCanHandle(handler, CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.APPROVE_ORDERS); + } + + @SneakyThrows + @Test + void givenUserHasJudgeProcessedDraftOrders_thenReturnError() { + FinremCaseData caseData = new FinremCaseData(); + + DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) + .build(); + DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED_BY_ADMIN) + .build(); + + DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); + DraftOrderDocReviewCollection collectionItem2 = new DraftOrderDocReviewCollection(document2); + + DraftOrdersReview review1 = DraftOrdersReview.builder() + .hearingDate(LocalDate.of(2024, 8, 6)) + .hearingType("Hearing Type 1") + .hearingJudge("Judge 1") + .draftOrderDocReviewCollection(List.of(collectionItem1, collectionItem2)) + .build(); + + DraftOrdersReviewCollection reviewCollection1 = new DraftOrdersReviewCollection(review1); + caseData.getDraftOrdersWrapper().setDraftOrdersReviewCollection(List.of(reviewCollection1)); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + assertEquals(1, response.getErrors().size()); + assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); + var draftOrdersWrapper = response.getData().getDraftOrdersWrapper(); + for (int i = 1; i <= NUMBER_OF_DOC_TO_BE_REVIEWED; i++) { + assertThat(draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + i).invoke(draftOrdersWrapper)).isNull(); + } + } + + @SneakyThrows + @Test + void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { + FinremCaseData caseData = new FinremCaseData(); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + assertEquals(1, response.getErrors().size()); + assertThat(response.getErrors()).contains(NOT_AVAILABLE_ERROR_MESSAGE); + var draftOrdersWrapper = response.getData().getDraftOrdersWrapper(); + for (int i = 1; i <= NUMBER_OF_DOC_TO_BE_REVIEWED; i++) { + assertThat(draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + i).invoke(draftOrdersWrapper)).isNull(); + } + } + + @SneakyThrows + @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedJudgeApproval1={1}, expectedJudgeApproval2={2}," + + "expectedJudgeApproval3={3}, expectedJudgeApproval4={4}, expectedJudgeApproval5={5}," + + "expectedShowWarningMessageToJudge={6}") + @MethodSource("provideDraftOrderData") + @DisplayName("Test handle method with different DraftOrdersWrapper inputs") + void handle_withVariousDraftOrdersWrapperData( + DraftOrdersWrapper draftOrdersWrapper, + JudgeApproval expectedJudgeApproval1, JudgeApproval expectedJudgeApproval2, + JudgeApproval expectedJudgeApproval3, JudgeApproval expectedJudgeApproval4, + JudgeApproval expectedJudgeApproval5, + YesOrNo expectedShowWarningMessageToJudge) { + + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build()) + .build(); + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) + .thenReturn("hearingServiceFormattedString1"); + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) + .thenReturn("hearingServiceFormattedString2"); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + draftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + var expectedJudgeApproval = List.of( + Optional.ofNullable(expectedJudgeApproval1), Optional.ofNullable(expectedJudgeApproval2), + Optional.ofNullable(expectedJudgeApproval3), Optional.ofNullable(expectedJudgeApproval4), + Optional.ofNullable(expectedJudgeApproval5) + ); + + for (int i = 0; i < NUMBER_OF_DOC_TO_BE_REVIEWED; i++) { + var actual = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (i + 1)).invoke(draftOrdersWrapper); + var expected = expectedJudgeApproval.get(i).orElse(null); + if (expected != null && actual != null) { + assertEquals(expected.getDocument(), actual.getDocument()); + assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); + assertEquals(expected.getAttachments(), actual.getAttachments()); + } else { + assertEquals(expected, actual); + } + } + assertEquals(expectedShowWarningMessageToJudge, draftOrdersWrapper.getShowWarningMessageToJudge()); + } + + private static final CaseDocument DO_DOC_1 = CaseDocument.builder().documentFilename("sampleDocument1").build(); + private static final CaseDocument DO_DOC_2 = CaseDocument.builder().documentFilename("sampleDocument2").build(); + private static final CaseDocument DO_DOC_3 = CaseDocument.builder().documentFilename("sampleDocument3").build(); + private static final CaseDocument DO_DOC_4 = CaseDocument.builder().documentFilename("sampleDocument4").build(); + private static final CaseDocument DO_DOC_5 = CaseDocument.builder().documentFilename("sampleDocument5").build(); + private static final CaseDocument DO_DOC_6 = CaseDocument.builder().documentFilename("sampleDocument6").build(); + private static final CaseDocument PSA_DOC_1 = CaseDocument.builder().documentFilename("samplePsaDocument1").build(); + private static final CaseDocument PSA_DOC_2 = CaseDocument.builder().documentFilename("samplePsaDocument2").build(); + private static final CaseDocument PSA_DOC_3 = CaseDocument.builder().documentFilename("samplePsaDocument3").build(); + private static final CaseDocument PSA_DOC_4 = CaseDocument.builder().documentFilename("samplePsaDocument4").build(); + private static final CaseDocument PSA_DOC_5 = CaseDocument.builder().documentFilename("samplePsaDocument5").build(); + private static final CaseDocument PSA_DOC_6 = CaseDocument.builder().documentFilename("samplePsaDocument6").build(); + private static final CaseDocumentCollection DO_ATTACHMENT_1 = CaseDocumentCollection.builder() + .value(CaseDocument.builder().documentFilename("attachment1").build()).build(); + private static final CaseDocumentCollection DO_ATTACHMENT_2 = CaseDocumentCollection.builder() + .value(CaseDocument.builder().documentFilename("attachment2").build()).build(); + + private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { + return builder.hearingDate(LocalDate.of(2024, 10, 31)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge"); + } + + private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { + return builder.hearingDate(LocalDate.of(2024, 11, 30)) + .hearingTime("09:00") + .hearingType("hearingType") + .hearingJudge("Mr. Judge"); + } + + private static CaseDocument randomCaseDocument() { + return CaseDocument.builder().documentFilename(LocalDateTime.now().toString()).build(); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReviewWithoutSubmittedDate(CaseDocument draftOrderDocument, + List attachments) { + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, null); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, + List attachments) { + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, LocalDateTime.now()); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, + List attachments, OrderStatus orderStatus) { + return buildDraftOrderDocumentReview(draftOrderDocument, attachments, orderStatus, LocalDateTime.now()); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(OrderStatus orderStatus) { + return buildDraftOrderDocumentReview(randomCaseDocument(), null, orderStatus, LocalDateTime.now()); + } + + private static DraftOrderDocReviewCollection buildDraftOrderDocumentReview(CaseDocument draftOrderDocument, + List attachments, OrderStatus orderStatus, + LocalDateTime submittedDate) { + return DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .draftOrderDocument(draftOrderDocument) + .attachments(attachments) + .orderStatus(orderStatus) + .submittedDate(submittedDate) + .build()) + .build(); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollectionWithoutSumittedDate(CaseDocument psaDocument) { + return buildPsaDocReviewCollection(psaDocument, TO_BE_REVIEWED, null); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument) { + return buildPsaDocReviewCollection(psaDocument, TO_BE_REVIEWED, LocalDateTime.now()); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus) { + return buildPsaDocReviewCollection(psaDocument, orderStatus, LocalDateTime.now()); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(CaseDocument psaDocument, OrderStatus orderStatus, + LocalDateTime submittedDate) { + return PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(psaDocument).orderStatus(orderStatus).submittedDate(submittedDate).build()) + .build(); + } + + private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { + return PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(randomCaseDocument()).orderStatus(orderStatus).build()) + .build(); + } + + private static JudgeApproval buildJudgeApproval(String hearingInfo, CaseDocument document, + List attachments) { + return JudgeApproval.builder().hearingInfo(hearingInfo) + .document(document) + .attachments(attachments) + .hasAttachment(YesOrNo.forValue(attachments != null && !attachments.isEmpty())) + .build(); + } + + private static Arguments withEmptyDraftOrdersWrapper() { + return Arguments.of( + DraftOrdersWrapper.builder().draftOrdersReviewCollection(Collections.emptyList()).build(), + null, null, null, null, null, + null + ); + } + + private static Arguments withOneDraftOrderAndOnePsa() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) + )) + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1) + ))) + .build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + null, null, null, + NO); + } + + private static Arguments withTwoDraftOrderAndZeroPsa() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) + ))) + .build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, null, + NO); + } + + private static Arguments withDifferentHearingInfo() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)) + )) + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1) + ))).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo2(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)) + )) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, + NO); + } + + private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate() { + DraftOrderDocReviewCollection doc1 = buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)); + DraftOrderDocReviewCollection doc3 = buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)); + PsaDocReviewCollection doc2 = buildPsaDocReviewCollection(PSA_DOC_1); + + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(doc1)) + .psaDocReviewCollection(List.of(doc2))).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(doc3)) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + null, null, + NO); + } + + private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate2() { + DraftOrderDocReviewCollection doc1 = buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)); + PsaDocReviewCollection doc2 = buildPsaDocReviewCollection(PSA_DOC_1); + DraftOrderDocReviewCollection doc3 = buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)); + + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(doc1)) + .psaDocReviewCollection(List.of(doc2))).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(doc3)) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, + NO); + } + + private static Arguments withSameHearingInfoAndDocumentShouldBeSortedByDocumentFilename() { + DraftOrderDocReviewCollection doc1 = buildDraftOrderDocumentReviewWithoutSubmittedDate(DO_DOC_1, List.of(DO_ATTACHMENT_1)); + PsaDocReviewCollection doc2 = buildPsaDocReviewCollectionWithoutSumittedDate(PSA_DOC_1); + DraftOrderDocReviewCollection doc3 = buildDraftOrderDocumentReviewWithoutSubmittedDate(DO_DOC_2, List.of(DO_ATTACHMENT_2)); + + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(doc1)) + .psaDocReviewCollection(List.of(doc2))).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(doc3)) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + null, null, + NO); + } + // // private static Arguments withProcessedDraftOrderAndPsa() { // return Arguments.of( @@ -594,13 +642,17 @@ // null); // } // -// private static Stream provideDraftOrderData() { -// return Stream.of( -// withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), -// withDifferentHearingInfo(), withProcessedDraftOrderAndPsa(), withSixPsas(), + private static Stream provideDraftOrderData() { + return Stream.of( + withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), + withDifferentHearingInfo(), + withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate(), + withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate2(), + withSameHearingInfoAndDocumentShouldBeSortedByDocumentFilename() +// withProcessedDraftOrderAndPsa(), withSixPsas() // withFiveReviewablePsas(), withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), // withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate(), // withSixDraftOrders() -// ); -// } -//} + ); + } +} From 2d97afd8bfa75aedf9bb7098174dc5d6397474ea Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 12:04:51 +0000 Subject: [PATCH 067/336] missing imports --- .../judgeapproval/ApproveDraftOrdersAboutToStartHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 7cb5d5579b..94f662d5e3 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -29,6 +29,9 @@ import java.util.List; import java.util.stream.Stream; +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.isJudgeReviewable; @Slf4j From 6622d665444caa26483b1cb037f514ca76b688fb Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:08:41 +0000 Subject: [PATCH 068/336] clear judgeApproval fields and hearingInstruction --- .../ApproveDraftOrdersAboutToSubmitHandler.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java index 186a6fd076..9059ec2197 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java @@ -11,6 +11,7 @@ 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.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @Slf4j @@ -39,7 +40,14 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem log.info("Invoking contested {} about-to-submit event callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData finremCaseData = caseDetails.getData(); - // DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + + draftOrdersWrapper.setJudgeApproval1(null); + draftOrdersWrapper.setJudgeApproval2(null); + draftOrdersWrapper.setJudgeApproval3(null); + draftOrdersWrapper.setJudgeApproval4(null); + draftOrdersWrapper.setJudgeApproval5(null); + draftOrdersWrapper.setHearingInstruction(null); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); From aa48f1a24d3e1b27e02ef11c5607a17c7991b913 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 12:37:15 +0000 Subject: [PATCH 069/336] Add test case. --- .../ApproveDraftOrdersMidEventHandler.java | 20 ++++++----- .../model/ccd/wrapper/DraftOrdersWrapper.java | 8 ----- ...veDraftOrdersAboutToSubmitHandlerTest.java | 33 +++++++++++++++++++ 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 1efba41821..9ce354d12d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -14,6 +14,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @@ -56,15 +57,16 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .map(JudgeApproval::getJudgeDecision) .anyMatch(decision -> decision != null && decision.isHearingInstructionRequired()); - draftOrdersWrapper.getHearingInstruction().setShowRequireAnotherHearingQuestion(YesOrNo.forValue(isHearingInstructionRequired)); - - draftOrdersWrapper.getHearingInstruction().setAnotherHearingRequestCollection(List.of( - AnotherHearingRequestCollection.builder() - .value(AnotherHearingRequest.builder() - .whichOrder(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)) - .build()) - .build() - )); + draftOrdersWrapper.setHearingInstruction(HearingInstruction.builder() + .showRequireAnotherHearingQuestion(YesOrNo.forValue(isHearingInstructionRequired)) + .anotherHearingRequestCollection(List.of( + AnotherHearingRequestCollection.builder() + .value(AnotherHearingRequest.builder() + .whichOrder(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)) + .build()) + .build() + )) + .build()); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index fcf3612692..a0d03e2000 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -69,14 +69,6 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("hearingInstruction") private HearingInstruction hearingInstruction; - @JsonIgnore - public HearingInstruction getHearingInstruction() { - if (hearingInstruction == null) { - this.hearingInstruction = new HearingInstruction(); - } - return hearingInstruction; - } - public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java index 52285de3a6..6cca87e68f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java @@ -5,11 +5,19 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; 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.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; +import static org.assertj.core.api.Assertions.assertThat; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) @@ -26,4 +34,29 @@ void canHandle() { assertCanHandle(handler, CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); } + @Test + void shouldClearObjectsWhichAreForCapturingInputPurpose() { + FinremCaseData caseData = FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder().build()) + .judgeApproval1(JudgeApproval.builder().build()) + .judgeApproval2(JudgeApproval.builder().build()) + .judgeApproval3(JudgeApproval.builder().build()) + .judgeApproval4(JudgeApproval.builder().build()) + .judgeApproval5(JudgeApproval.builder().build()) + .build()) + .build(); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + assertThat(response.getData()).isNotNull(); + assertThat(response.getData().getDraftOrdersWrapper()).isNotNull(); + assertThat(response.getData().getDraftOrdersWrapper().getHearingInstruction()).isNull(); + assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval1()).isNull(); + assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval2()).isNull(); + assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval3()).isNull(); + assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval4()).isNull(); + assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval5()).isNull(); + } } From 2b2a515e985dad1a0402cfd81c5f11381dad4142 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 12:51:18 +0000 Subject: [PATCH 070/336] Refactoring --- ...ApproveDraftOrdersMidEventHandlerTest.java | 320 ++++++++---------- 1 file changed, 137 insertions(+), 183 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 94aefb3464..2e3e73c73a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,185 +1,139 @@ -//package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; -// -//import lombok.SneakyThrows; -//import org.junit.jupiter.api.DisplayName; -//import org.junit.jupiter.api.Test; -//import org.junit.jupiter.api.extension.ExtendWith; -//import org.junit.jupiter.params.ParameterizedTest; -//import org.junit.jupiter.params.provider.Arguments; -//import org.junit.jupiter.params.provider.MethodSource; -//import org.mockito.InjectMocks; -//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.handler.FinremCallbackRequest; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -//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.draftorders.judgeapproval.AnotherHearingRequest; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewableDraftOrder; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.ReviewablePsa; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -//import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; -// -//import java.util.List; -//import java.util.stream.Stream; -// -//import static org.junit.jupiter.api.Assertions.assertEquals; -//import static org.junit.jupiter.api.Assertions.assertNotNull; -//import static org.junit.jupiter.api.Assertions.assertNull; -//import static org.mockito.Mockito.when; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; -// -//@ExtendWith(MockitoExtension.class) -//class ApproveDraftOrdersMidEventHandlerTest { -// -// @InjectMocks -// private ApproveDraftOrdersMidEventHandler handler; -// -// @Mock -// private ApproveOrderService approveOrderService; -// -// @Test -// void canHandle() { -// assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); -// } -// -// @SneakyThrows -// @ParameterizedTest(name = "{index} => reviewableDraftOrder1={0}" -// + "reviewableDraftOrder2={1}" -// + "reviewableDraftOrder3={2}" -// + "reviewableDraftOrder4={3}" -// + "reviewableDraftOrder5={4}" -// + "reviewablePsa1={5}" -// + "reviewablePsa2={6}" -// + "reviewablePsa3={7}" -// + "reviewablePsa4={8}" -// + "reviewablePsa5={9}" -// + "expectedShowRequireAnotherHearingQuestion={10}") -// @MethodSource("provideDraftOrderOrPsaData") -// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") -// void handle_withVariousDraftOrdersWrapperData(ReviewableDraftOrder reviewableDraftOrder1, ReviewableDraftOrder reviewableDraftOrder2, -// ReviewableDraftOrder reviewableDraftOrder3, ReviewableDraftOrder reviewableDraftOrder4, -// ReviewableDraftOrder reviewableDraftOrder5, -// -// ReviewablePsa reviewablePsa1, ReviewablePsa reviewablePsa2, -// ReviewablePsa reviewablePsa3, ReviewablePsa reviewablePsa4, ReviewablePsa reviewablePsa5, -// YesOrNo expectedShowRequireAnotherHearingQuestion) { -// -// // Arrange -// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() -// .caseDetails(FinremCaseDetails.builder() -// .id(12345L) -// .data(FinremCaseData.builder() -// .draftOrdersWrapper(DraftOrdersWrapper.builder().judgeApproval(JudgeApproval.builder() -// .reviewableDraftOrder1(reviewableDraftOrder1) -// .reviewableDraftOrder2(reviewableDraftOrder2) -// .reviewableDraftOrder3(reviewableDraftOrder3) -// .reviewableDraftOrder4(reviewableDraftOrder4) -// .reviewableDraftOrder5(reviewableDraftOrder5) -// .reviewablePsa1(reviewablePsa1) -// .reviewablePsa2(reviewablePsa2) -// .reviewablePsa3(reviewablePsa3) -// .reviewablePsa4(reviewablePsa4) -// .reviewablePsa5(reviewablePsa5) -// .build()).build()) -// .build()) -// .build()) -// .build(); -// -// // Act -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); -// -// // Assert -// assertNotNull(response); -// FinremCaseData responseData = response.getData(); -// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); -// -// var hearingInstruction = responseDraftOrdersWrapper.getHearingInstruction(); -// assertNotNull(hearingInstruction); -// -// assertEquals(expectedShowRequireAnotherHearingQuestion, hearingInstruction.getShowRequireAnotherHearingQuestion()); -// } -// -// private static Stream provideDraftOrderOrPsaData() { -// return Stream.of( -// Arguments.of( -// null, null, null, null, null, null, null, null, null, null, NO -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), null, null, null, null, -// null, null, null, null, null, YES -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), null, null, null, null, -// null, null, null, null, null, YES -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE).build(), null, null, null, null, -// null, null, null, null, null, NO -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), null, null, null, null, -// null, null, null, null, null, NO -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// null, null, null, null, null, -// YES -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// null, null, null, null, null, -// YES -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// null, null, null, null, null, -// YES -// ), -// Arguments.of( -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build(), -// ReviewablePsa.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// null, null, null, null, -// YES -// ), -// Arguments.of( -// null, null, null, null, null, -// ReviewablePsa.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// null, null, null, null, -// YES -// ) -// ); -// } +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import lombok.SneakyThrows; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +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.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +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.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; + +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersMidEventHandlerTest { + + @InjectMocks + private ApproveDraftOrdersMidEventHandler handler; + + @Mock + private ApproveOrderService approveOrderService; + + @Test + void canHandle() { + assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); + } + + @SneakyThrows + @ParameterizedTest(name = "{index} => judgeApproval1={0}" + + "judgeApproval2={1}" + + "judgeApproval3={2}" + + "judgeApproval4={3}" + + "judgeApproval5={4}" + + "expectedShowRequireAnotherHearingQuestion={5}") + @MethodSource("provideJudgeApprovals") + @DisplayName("Test handle method with different DraftOrdersWrapper inputs") + void handle_withVariousDraftOrdersWrapperData(JudgeApproval judgeApproval1, JudgeApproval judgeApproval2, + JudgeApproval judgeApproval3, JudgeApproval judgeApproval4, + JudgeApproval judgeApproval5, + YesOrNo expectedShowRequireAnotherHearingQuestion) { + + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .judgeApproval1(judgeApproval1) + .judgeApproval2(judgeApproval2) + .judgeApproval3(judgeApproval3) + .judgeApproval4(judgeApproval4) + .judgeApproval5(judgeApproval5) + .build()) + .build()) + .build()) + .build(); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + var hearingInstruction = responseDraftOrdersWrapper.getHearingInstruction(); + assertNotNull(hearingInstruction); + + assertEquals(expectedShowRequireAnotherHearingQuestion, hearingInstruction.getShowRequireAnotherHearingQuestion()); + } + + private static Stream provideJudgeApprovals() { + return Stream.of( + Arguments.of(null, null, null, null, null, NO), + Arguments.of(JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), null, null, null, null, YES), + Arguments.of(JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), null, null, null, null, YES), + Arguments.of(JudgeApproval.builder().judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE).build(), null, null, null, null, NO), + Arguments.of(JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), null, null, null, null, NO), + Arguments.of( + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + YES + ), + Arguments.of( + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + YES + ), + Arguments.of( + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + YES + ), + Arguments.of( + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), + NO + ) + ); + } // // @Test // void shouldPopulateAnEmptyAnotherHearingRequestEntry() { @@ -220,4 +174,4 @@ // assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); // assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); // } -//} +} From 61183bcd1777631bee59a2088411bed71a4bf935 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 14:37:03 +0000 Subject: [PATCH 071/336] Refactor mid event test case. --- ...ApproveDraftOrdersMidEventHandlerTest.java | 88 ++++++++++--------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 2e3e73c73a..76e2a97987 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -15,17 +15,23 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; 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.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; +import java.util.List; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; @@ -134,44 +140,46 @@ private static Stream provideJudgeApprovals() { ) ); } -// -// @Test -// void shouldPopulateAnEmptyAnotherHearingRequestEntry() { -// // Arrange -// JudgeApproval judgeApproval = null; -// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() -// .caseDetails(FinremCaseDetails.builder() -// .id(12345L) -// .data(FinremCaseData.builder() -// .draftOrdersWrapper(DraftOrdersWrapper.builder().judgeApproval(judgeApproval = JudgeApproval.builder() -// .reviewableDraftOrder1(ReviewableDraftOrder.builder().judgeDecision(REVIEW_LATER).build()) -// .build()).build()) -// .build()) -// .build()) -// .build(); -// -// DynamicList expectedDynamicList = DynamicList.builder().build(); -// when(approveOrderService.buildWhichOrderDynamicList(judgeApproval)).thenReturn(expectedDynamicList); -// -// // Act -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); -// -// // Assert -// assertNotNull(response); -// FinremCaseData responseData = response.getData(); -// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); -// -// List actualCollection = -// responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); -// -// assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); -// assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); -// AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); -// assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); -// assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); -// assertNull(actualRequest.getTypeOfHearing(), "typeOfHearing should be null"); -// assertNull(actualRequest.getTimeEstimate(), "timeEstimate should be null"); -// assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); -// assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); -// } + + @Test + void shouldPopulateAnEmptyAnotherHearingRequestEntry() { + // Arrange + DraftOrdersWrapper draftOrdersWrapper = null; + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper = DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder() + .judgeDecision(REVIEW_LATER) + .build()) + .build()) + .build()) + .build()) + .build(); + + DynamicList expectedDynamicList = DynamicList.builder().build(); + when(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)).thenReturn(expectedDynamicList); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + List actualCollection = + responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); + + assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); + assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); + AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); + assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); + assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); + assertNull(actualRequest.getTypeOfHearing(), "typeOfHearing should be null"); + assertNull(actualRequest.getTimeEstimate(), "timeEstimate should be null"); + assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); + assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); + } } From 071aef2d25db18930122f98fa36e9af23f885293 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 14:54:37 +0000 Subject: [PATCH 072/336] Extract duplicated codes. --- .../ApproveDraftOrdersMidEventHandler.java | 12 +---- .../judgeapproval/ApproveOrderService.java | 23 ++++++-- ...ApproveDraftOrdersMidEventHandlerTest.java | 3 ++ .../ApproveOrderServiceTest.java | 54 ++++++++++++++++--- 4 files changed, 70 insertions(+), 22 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 9ce354d12d..8a62359fec 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -52,7 +52,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); boolean isHearingInstructionRequired = IntStream.rangeClosed(1, 5) - .mapToObj(i -> locateJudgeApproval(draftOrdersWrapper, i)) + .mapToObj(i -> approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i)) .filter(Objects::nonNull) .map(JudgeApproval::getJudgeDecision) .anyMatch(decision -> decision != null && decision.isHearingInstructionRequired()); @@ -71,15 +71,5 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } - private JudgeApproval locateJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, int index) { - return switch (index) { - case 1 -> draftOrdersWrapper.getJudgeApproval1(); - case 2 -> draftOrdersWrapper.getJudgeApproval2(); - case 3 -> draftOrdersWrapper.getJudgeApproval3(); - case 4 -> draftOrdersWrapper.getJudgeApproval4(); - case 5 -> draftOrdersWrapper.getJudgeApproval5(); - default -> null; - }; - } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index d3621074ef..fda09b434b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -23,7 +23,7 @@ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrap List listItems = new ArrayList<>(); for (int i = 1; i <= 5; i++) { - JudgeApproval judgeApproval = getJudgeApproval(draftOrdersWrapper, i); + JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); if (judgeApproval != null) { String codePrefix = JudgeApprovalDocType.DRAFT_ORDER == judgeApproval.getDocType() ? "draftOrder" : "psa"; String code = codePrefix + "_" + i; @@ -52,7 +52,25 @@ private static String getDocumentFileName(JudgeApproval judgeApproval) { return filename; } - private JudgeApproval getJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, int index) { + /** + * Resolves the {@link JudgeApproval} object from the provided {@link DraftOrdersWrapper} + * based on the specified index. Each index corresponds to a specific judge approval field + * in the wrapper. If the index is out of the supported range (1 to 5), the method returns null. + * + *

Mapping of index to fields:

+ *
    + *
  • 1 - {@link DraftOrdersWrapper#getJudgeApproval1()}
    • + *
  • 2 - {@link DraftOrdersWrapper#getJudgeApproval2()}
    • + *
  • 3 - {@link DraftOrdersWrapper#getJudgeApproval3()}
    • + *
  • 4 - {@link DraftOrdersWrapper#getJudgeApproval4()}
    • + *
  • 5 - {@link DraftOrdersWrapper#getJudgeApproval5()}
    • + *
+ * + * @param draftOrdersWrapper the {@link DraftOrdersWrapper} containing judge approval fields. + * @param index the index specifying which judge approval field to retrieve (1-5). + * @return the corresponding {@link JudgeApproval} object, or null if the index is out of range. + */ + public JudgeApproval resolveJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, int index) { return switch (index) { case 1 -> draftOrdersWrapper.getJudgeApproval1(); case 2 -> draftOrdersWrapper.getJudgeApproval2(); @@ -63,5 +81,4 @@ private JudgeApproval getJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, in }; } - } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 76e2a97987..26d578133e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -31,6 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; @@ -84,6 +86,7 @@ void handle_withVariousDraftOrdersWrapperData(JudgeApproval judgeApproval1, Judg .build()) .build()) .build(); + when(approveOrderService.resolveJudgeApproval(any(), anyInt())).thenCallRealMethod(); // Act GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 6c500c9002..efee07c5a0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -16,6 +16,12 @@ import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; @@ -43,10 +49,10 @@ void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decisi if (expectedCode == null) { Assertions.assertTrue(dynamicList.getListItems().isEmpty()); } else { - Assertions.assertEquals(1, dynamicList.getListItems().size()); + assertEquals(1, dynamicList.getListItems().size()); DynamicListElement element = dynamicList.getListItems().get(0); - Assertions.assertEquals(expectedCode, element.getCode()); - Assertions.assertEquals(expectedLabel, element.getLabel()); + assertEquals(expectedCode, element.getCode()); + assertEquals(expectedLabel, element.getLabel()); } } @@ -66,16 +72,16 @@ void testBuildWhichOrderDynamicListMultipleItems() { DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); // Assert - Assertions.assertEquals(2,dynamicList.getListItems().size()); + assertEquals(2,dynamicList.getListItems().size()); List listItems = dynamicList.getListItems(); // Additional checks to validate correct elements - Assertions.assertEquals("draftOrder_" + 1, listItems.get(0).getCode()); - Assertions.assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); + assertEquals("draftOrder_" + 1, listItems.get(0).getCode()); + assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); - Assertions.assertEquals("psa_" + 3, listItems.get(1).getCode()); - Assertions.assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); + assertEquals("psa_" + 3, listItems.get(1).getCode()); + assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); } private void setJudgeApprovalToDraftOrdersWrapper(int index, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval target) { @@ -122,4 +128,36 @@ private JudgeApproval createJudgeApproval(int index, String draftDecision, Strin return judgeApproval; } + @Test + void testResolveJudgeApproval() { + // Mock DraftOrdersWrapper + DraftOrdersWrapper draftOrdersWrapper = mock(DraftOrdersWrapper.class); + + // Mock JudgeApproval objects + JudgeApproval judgeApproval1 = new JudgeApproval(); + JudgeApproval judgeApproval2 = new JudgeApproval(); + JudgeApproval judgeApproval3 = new JudgeApproval(); + JudgeApproval judgeApproval4 = new JudgeApproval(); + JudgeApproval judgeApproval5 = new JudgeApproval(); + + // Stub the DraftOrdersWrapper methods + when(draftOrdersWrapper.getJudgeApproval1()).thenReturn(judgeApproval1); + when(draftOrdersWrapper.getJudgeApproval2()).thenReturn(judgeApproval2); + when(draftOrdersWrapper.getJudgeApproval3()).thenReturn(judgeApproval3); + when(draftOrdersWrapper.getJudgeApproval4()).thenReturn(judgeApproval4); + when(draftOrdersWrapper.getJudgeApproval5()).thenReturn(judgeApproval5); + + // Test valid indices + assertEquals(judgeApproval1, underTest.resolveJudgeApproval(draftOrdersWrapper, 1)); + assertEquals(judgeApproval2, underTest.resolveJudgeApproval(draftOrdersWrapper, 2)); + assertEquals(judgeApproval3, underTest.resolveJudgeApproval(draftOrdersWrapper, 3)); + assertEquals(judgeApproval4, underTest.resolveJudgeApproval(draftOrdersWrapper, 4)); + assertEquals(judgeApproval5, underTest.resolveJudgeApproval(draftOrdersWrapper, 5)); + + // Test invalid index + assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 6)); + assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 0)); + assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, -1)); + } + } From 71f3f5e6ddfdc223a2342ec8227be09f80d11fad Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 14:55:42 +0000 Subject: [PATCH 073/336] Remove unused import --- .../service/judgeapproval/ApproveOrderServiceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index efee07c5a0..f26b3f3cc3 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -19,8 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; From 79a20202905e0e8d1d5f78440ab133c4c31cdf80 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 14:55:52 +0000 Subject: [PATCH 074/336] Add JavaDoc --- .../judgeapproval/ApproveOrderService.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index fda09b434b..737e039d73 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -19,6 +19,29 @@ @RequiredArgsConstructor public class ApproveOrderService { + /** + * Builds a {@link DynamicList} representing the orders available for selection + * based on the given {@link DraftOrdersWrapper}. Each order is represented as a + * {@link DynamicListElement} containing a code and label. + * + *

The method processes up to 5 judge approvals, where each approval contributes a list item + * if the approval is non-null and the associated document filename is not empty.

+ * + *

For each {@link JudgeApproval}:

+ *
    + *
  • The code is prefixed with "draftOrder" or "psa", depending on the document type.
    • + *
  • The filename is used as the label of the list item.
    • + *
+ * + *

Example:

+ * 
+     * Code: draftOrder_1, Label: OrderDocument1.pdf
+     * Code: psa_2, Label: PensionSharingAnnex1.pdf
+     *
+ * + * @param draftOrdersWrapper the {@link DraftOrdersWrapper} containing the judge approvals. + * @return a {@link DynamicList} populated with items representing the orders. + */ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrapper) { List listItems = new ArrayList<>(); From 2bbe6364368bb8fc9573f10331d77d2e5403388d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 14:56:20 +0000 Subject: [PATCH 075/336] Remove a blank line. --- .../handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 8a62359fec..c9fcc0b4e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -71,5 +71,4 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } - } From f8b28522697b040dc0a7990a86ab206a10167658 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 22 Nov 2024 14:57:37 +0000 Subject: [PATCH 076/336] Extract it to a private method --- .../ApproveDraftOrdersAboutToSubmitHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java index 9059ec2197..c5c87827d6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java @@ -41,15 +41,17 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + clearInputFields(draftOrdersWrapper); + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } + + private void clearInputFields(DraftOrdersWrapper draftOrdersWrapper) { draftOrdersWrapper.setJudgeApproval1(null); draftOrdersWrapper.setJudgeApproval2(null); draftOrdersWrapper.setJudgeApproval3(null); draftOrdersWrapper.setJudgeApproval4(null); draftOrdersWrapper.setJudgeApproval5(null); draftOrdersWrapper.setHearingInstruction(null); - - - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } } From a360934058bea1f2a12c6b81d2afdd8f815a1d35 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:15:48 +0000 Subject: [PATCH 077/336] refactor oustanding reviews --- ...ApproveDraftOrdersAboutToStartHandler.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index fd76cbc41f..a4dc52509f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -66,12 +66,23 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem if (errors.isEmpty()) { List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); - draftOrdersWrapper.setShowWarningMessageToJudge(YesOrNo.forValue(outstanding.size() > 5)); - draftOrdersWrapper.setJudgeApproval1(createReviewableItems(outstanding,1)); - draftOrdersWrapper.setJudgeApproval2(createReviewableItems(outstanding,2)); - draftOrdersWrapper.setJudgeApproval3(createReviewableItems(outstanding,3)); - draftOrdersWrapper.setJudgeApproval4(createReviewableItems(outstanding,4)); - draftOrdersWrapper.setJudgeApproval5(createReviewableItems(outstanding,5)); + int totalOutstandingReviews = outstanding.stream() + .mapToInt(outstandingItem -> + outstandingItem.getValue().getDraftOrderDocReviewCollection().stream() + .filter(draftOrderDoc -> isJudgeReviewable(draftOrderDoc.getValue().getOrderStatus())) + .toList().size() + + outstandingItem.getValue().getPsaDocReviewCollection().stream() + .filter(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())) + .toList().size() + ) + .sum(); + + draftOrdersWrapper.setShowWarningMessageToJudge(YesOrNo.forValue(totalOutstandingReviews > 5)); + draftOrdersWrapper.setJudgeApproval1(createReviewableItems(outstanding, 1)); + draftOrdersWrapper.setJudgeApproval2(createReviewableItems(outstanding, 2)); + draftOrdersWrapper.setJudgeApproval3(createReviewableItems(outstanding, 3)); + draftOrdersWrapper.setJudgeApproval4(createReviewableItems(outstanding, 4)); + draftOrdersWrapper.setJudgeApproval5(createReviewableItems(outstanding, 5)); } return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).errors(errors).build(); From 265e7e7381dd566eb6a781663be42a5ba4ca6543 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:16:05 +0000 Subject: [PATCH 078/336] refactor remaining tests --- ...oveDraftOrdersAboutToStartHandlerTest.java | 410 ++++++++---------- 1 file changed, 192 insertions(+), 218 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 96849a7eba..386db150e0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -45,6 +45,7 @@ import static org.mockito.Mockito.lenient; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; @@ -165,7 +166,9 @@ void handle_withVariousDraftOrdersWrapperData( if (expected != null && actual != null) { assertEquals(expected.getDocument(), actual.getDocument()); assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); - assertEquals(expected.getAttachments(), actual.getAttachments()); + if (expected.getHasAttachment() == YES) { + assertEquals(expected.getAttachments(), actual.getAttachments()); + } } else { assertEquals(expected, actual); } @@ -209,7 +212,7 @@ private static CaseDocument randomCaseDocument() { } private static DraftOrderDocReviewCollection buildDraftOrderDocumentReviewWithoutSubmittedDate(CaseDocument draftOrderDocument, - List attachments) { + List attachments) { return buildDraftOrderDocumentReview(draftOrderDocument, attachments, TO_BE_REVIEWED, null); } @@ -356,7 +359,7 @@ private static Arguments withDifferentHearingInfo() { private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate() { DraftOrderDocReviewCollection doc1 = buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)); DraftOrderDocReviewCollection doc3 = buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)); - PsaDocReviewCollection doc2 = buildPsaDocReviewCollection(PSA_DOC_1); + PsaDocReviewCollection doc2 = buildPsaDocReviewCollection(PSA_DOC_1); return Arguments.of( DraftOrdersWrapper.builder() @@ -382,7 +385,7 @@ private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmitted private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate2() { DraftOrderDocReviewCollection doc1 = buildDraftOrderDocumentReview(DO_DOC_1, List.of(DO_ATTACHMENT_1)); - PsaDocReviewCollection doc2 = buildPsaDocReviewCollection(PSA_DOC_1); + PsaDocReviewCollection doc2 = buildPsaDocReviewCollection(PSA_DOC_1); DraftOrderDocReviewCollection doc3 = buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2)); return Arguments.of( @@ -409,7 +412,7 @@ private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmitted private static Arguments withSameHearingInfoAndDocumentShouldBeSortedByDocumentFilename() { DraftOrderDocReviewCollection doc1 = buildDraftOrderDocumentReviewWithoutSubmittedDate(DO_DOC_1, List.of(DO_ATTACHMENT_1)); - PsaDocReviewCollection doc2 = buildPsaDocReviewCollectionWithoutSumittedDate(PSA_DOC_1); + PsaDocReviewCollection doc2 = buildPsaDocReviewCollectionWithoutSumittedDate(PSA_DOC_1); DraftOrderDocReviewCollection doc3 = buildDraftOrderDocumentReviewWithoutSubmittedDate(DO_DOC_2, List.of(DO_ATTACHMENT_2)); return Arguments.of( @@ -434,225 +437,196 @@ private static Arguments withSameHearingInfoAndDocumentShouldBeSortedByDocumentF NO); } -// -// private static Arguments withProcessedDraftOrderAndPsa() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(APPROVED_BY_JUDGE), -// buildPsaDocReviewCollection(PROCESSED_BY_ADMIN), -// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED) -// )) -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(APPROVED_BY_JUDGE), -// buildDraftOrderDocumentReview(PROCESSED_BY_ADMIN), -// buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2), TO_BE_REVIEWED) -// ))) -// .build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder(1-5) -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), -// null, null, null, null, -// // expectedReviewablePsa(1-5) -// -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), -// null, null, null, null, -// // expectedWarningMessageToJudge -// null); -// } -// -// private static Arguments withSixPsas() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_6, TO_BE_REVIEWED) -// )) -// ).build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder(1-5) -// null, null, null, null, null, -// // expectedReviewablePsa(1-5) -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), -// // expectedWarningMessageToJudge -// WARNING_MESSAGE); -// } -// -// private static Arguments withSixDraftOrders() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo2(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_1, List.of(), TO_BE_REVIEWED), -// buildDraftOrderDocumentReview(DO_DOC_2, List.of(), TO_BE_REVIEWED), -// buildDraftOrderDocumentReview(DO_DOC_3, List.of(), TO_BE_REVIEWED), -// buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED), -// buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED), -// buildDraftOrderDocumentReview(DO_DOC_6, List.of(), TO_BE_REVIEWED) -// )) -// ).build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder(1-5) -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_1, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_2, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_3, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), -// // expectedReviewablePsa(1-5) -// null, null, null, null, null, -// // expectedWarningMessageToJudge -// WARNING_MESSAGE); -// } -// -// private static Arguments withFiveReviewablePsas() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), -// buildPsaDocReviewCollection(APPROVED_BY_JUDGE) -// )) -// ).build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder(1-5) -// null, null, null, null, null, -// // expectedReviewablePsa(1-5) -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), -// // expectedWarningMessageToJudge -// null); -// } -// -// private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), -// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), -// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), -// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()), -// buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED, LocalDateTime.now()) -// )) -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_1, List.of()), -// buildDraftOrderDocumentReview(DO_DOC_2, List.of()), -// buildDraftOrderDocumentReview(DO_DOC_3, List.of()), -// buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), -// buildDraftOrderDocumentReview(DO_DOC_5, List.of()) -// )) -// ).build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder(1-5) -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_4, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_3, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_5, List.of()), -// // expectedReviewablePsa(1-5) -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_2), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_1), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_5), -// // expectedWarningMessageToJudge -// null); -// } -// -// private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() { -// return Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo2(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), -// buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)) -// )) -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), -// buildDraftOrderDocumentReview(DO_DOC_4, List.of()) -// )) -// ).build()) -// .build(), -// DraftOrdersReviewCollection.builder() -// .value(applyHearingInfo1(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), -// buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()) -// )) -// .draftOrderDocReviewCollection(List.of( -// buildDraftOrderDocumentReview(DO_DOC_1, List.of()), -// buildDraftOrderDocumentReview(DO_DOC_2, List.of()) -// )) -// ).build()) -// .build() -// )) -// .build(), -// // expectedReviewableDraftOrder(1-5) -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_1, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString1", DO_DOC_2, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_5, List.of()), -// buildReviewableDraftOrder("hearingServiceFormattedString2", DO_DOC_4, List.of()), -// null, -// // expectedReviewablePsa(1-5) -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_3), -// buildReviewablePsa("hearingServiceFormattedString1", PSA_DOC_4), -// buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_2), -// buildReviewablePsa("hearingServiceFormattedString2", PSA_DOC_1), -// null, -// // expectedWarningMessageToJudge -// null); -// } -// + private static Arguments withProcessedDraftOrderAndPsa() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(APPROVED_BY_JUDGE), + buildPsaDocReviewCollection(PROCESSED_BY_ADMIN), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(APPROVED_BY_JUDGE), + buildDraftOrderDocumentReview(PROCESSED_BY_ADMIN), + buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2), TO_BE_REVIEWED) + ))) + .build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, null), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + null, null, null, + NO); + } + + private static Arguments withSixPsas() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_6, TO_BE_REVIEWED) + )) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_5, null), + YES); + } + + private static Arguments withSixDraftOrders() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo2(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_2, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_3, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED), + buildDraftOrderDocumentReview(DO_DOC_6, List.of(), TO_BE_REVIEWED) + )) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_1, List.of()), + buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_2, List.of()), + buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_3, List.of()), + buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_4, List.of()), + buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_5, List.of()), + // expectedWarningMessageToJudge + YES); + } + + private static Arguments withFiveReviewablePsas() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED), + buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED), + buildPsaDocReviewCollection(APPROVED_BY_JUDGE) + )) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, null), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_5, null), + NO); + } + + private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_5, TO_BE_REVIEWED, LocalDateTime.now()) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of()), + buildDraftOrderDocumentReview(DO_DOC_2, List.of()), + buildDraftOrderDocumentReview(DO_DOC_3, List.of()), + buildDraftOrderDocumentReview(DO_DOC_4, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), + buildDraftOrderDocumentReview(DO_DOC_5, List.of()) + )) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_4, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, List.of()), + // expectedWarningMessageToJudge + YES); + } + + private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate() { + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo2(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_1, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_5, List.of(), TO_BE_REVIEWED, LocalDateTime.now().minusDays(1)), + buildDraftOrderDocumentReview(DO_DOC_4, List.of()) + )) + ).build()) + .build(), + DraftOrdersReviewCollection.builder() + .value(applyHearingInfo1(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PSA_DOC_3, TO_BE_REVIEWED, LocalDateTime.now()), + buildPsaDocReviewCollection(PSA_DOC_4, TO_BE_REVIEWED, LocalDateTime.now()) + )) + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocumentReview(DO_DOC_1, List.of()), + buildDraftOrderDocumentReview(DO_DOC_2, List.of()) + )) + ).build()) + .build() + )) + .build(), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of()), + buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of()), + buildJudgeApproval("hearingServiceFormattedString2", PSA_DOC_2, List.of()), + // expectedWarningMessageToJudge + YES); + } + private static Stream provideDraftOrderData() { return Stream.of( withEmptyDraftOrdersWrapper(), withOneDraftOrderAndOnePsa(), withTwoDraftOrderAndZeroPsa(), withDifferentHearingInfo(), withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate(), withSameHearingInfoAndDocumentShouldBeSortedBySubmittedDate2(), - withSameHearingInfoAndDocumentShouldBeSortedByDocumentFilename() -// withProcessedDraftOrderAndPsa(), withSixPsas() -// withFiveReviewablePsas(), withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), -// withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate(), -// withSixDraftOrders() + withSameHearingInfoAndDocumentShouldBeSortedByDocumentFilename(), + withProcessedDraftOrderAndPsa(), + withSixPsas(), + withFiveReviewablePsas(), + withDraftOrdersAndPsaAndShouldOrderBySubmittedDate(), + withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubmittedDate(), + withSixDraftOrders() ); } } From 7426527b86e2df0d5910bba5ae287b06486edc44 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:32:45 +0000 Subject: [PATCH 079/336] check style fix --- .../ApproveDraftOrdersAboutToStartHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index a4dc52509f..787f94a67a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -70,10 +70,10 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .mapToInt(outstandingItem -> outstandingItem.getValue().getDraftOrderDocReviewCollection().stream() .filter(draftOrderDoc -> isJudgeReviewable(draftOrderDoc.getValue().getOrderStatus())) - .toList().size() + - outstandingItem.getValue().getPsaDocReviewCollection().stream() - .filter(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())) - .toList().size() + .toList().size() + + outstandingItem.getValue().getPsaDocReviewCollection().stream() + .filter(psa -> isJudgeReviewable(psa.getValue().getOrderStatus())) + .toList().size() ) .sum(); From 9572ed6589b87e2574e0e4c32170af56bfda6313 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:36:34 +0000 Subject: [PATCH 080/336] check style fix on SortKey --- .../model/ccd/draftorders/judgeapproval/SortKey.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java index 51a697e2ff..49deffc9a7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java @@ -44,10 +44,10 @@ public class SortKey implements Comparable { /** * Constructs a {@link SortKey} with the specified details. * - * @param hearingTime the hearing time, can be null. - * @param hearingDate the hearing date, can be null. + * @param hearingTime the hearing time, can be null. + * @param hearingDate the hearing date, can be null. * @param documentSubmittedDate the document submission date and time, can be null. - * @param documentFilename the filename of the document, can be null. + * @param documentFilename the filename of the document, can be null. */ public SortKey(String hearingTime, LocalDate hearingDate, LocalDateTime documentSubmittedDate, String documentFilename) { this.hearingTime = hearingTime; @@ -62,7 +62,7 @@ public SortKey(String hearingTime, LocalDate hearingDate, LocalDateTime document * * @param other the other {@link SortKey} to compare against. * @return a negative integer, zero, or a positive integer as this object is less than, - * equal to, or greater than the specified object. + * equal to, or greater than the specified object. */ @Override public int compareTo(SortKey other) { From e855fa84d80b254571c95fe3ae8123ad0c5b8b5c Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:12:17 +0000 Subject: [PATCH 081/336] Remove @Getter and @Setter --- .../model/ccd/draftorders/judgeapproval/SortKey.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java index 49deffc9a7..7f40b53a5f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/SortKey.java @@ -1,8 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.time.LocalDate; import java.time.LocalDateTime; @@ -32,8 +30,6 @@ * * @see Comparable */ -@Setter -@Getter @Data public class SortKey implements Comparable { private String hearingTime; From c76b9fc0a7079c1a23d3af2f46b34a16a3ceeca9 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:29:16 +0000 Subject: [PATCH 082/336] Add @JsonIgnore to getHasAttachment --- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index ecacb99055..5e0ef505dc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -48,6 +48,7 @@ public class JudgeApproval { @JsonIgnore private SortKey sortKey; + @JsonIgnore public YesOrNo getHasAttachment() { return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); } From ecdc3ade22de9f52b5783c32527d6291953be941 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 26 Nov 2024 13:21:05 +0000 Subject: [PATCH 083/336] WIP - populating status (setting to draftOrdersReviewCollection) --- ...pproveDraftOrdersAboutToSubmitHandler.java | 1 + .../review/DraftOrderDocumentReview.java | 3 +- .../draftorders/review/PsaDocumentReview.java | 4 +- .../judgeapproval/ApproveOrderService.java | 37 +++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java index c5c87827d6..831acf1f74 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java @@ -41,6 +41,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + approveOrderService.populateJudgeDecisions(draftOrdersWrapper, userAuthorisation); clearInputFields(draftOrdersWrapper); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 1eef409131..d6806a8f0b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -18,7 +19,7 @@ import java.util.List; @Builder -@Getter +@Data @NoArgsConstructor @AllArgsConstructor public class DraftOrderDocumentReview implements HasCaseDocument { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 1696951132..3dc53d6b54 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @Builder -@Getter +@Data @NoArgsConstructor @AllArgsConstructor public class PsaDocumentReview implements HasCaseDocument { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 737e039d73..be1ecba8da 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -4,21 +4,58 @@ import lombok.extern.slf4j.Slf4j; import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; +import static java.lang.String.format; + @Service @Slf4j @RequiredArgsConstructor public class ApproveOrderService { + private final IdamService idamService; + + public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { + for (int i = 1; i <= 5; i++) { + JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); + if (judgeApproval != null && judgeApproval.getJudgeDecision() == JudgeDecision.READY_TO_BE_SEALED) { + CaseDocument doc = judgeApproval.getDocument(); + if (doc == null) { + throw new IllegalArgumentException(format("Document is null for JudgeApproval at index %d with decision READY_TO_BE_SEALED. " + + "Please check the data integrity.", i)); + } + draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(d -> { + d.getValue().getDraftOrderDocReviewCollection().forEach(d1 -> { + if (doc.equals(d1.getValue().getDraftOrderDocument())) { + d1.getValue().setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + d1.getValue().setApprovalDate(LocalDate.now()); + d1.getValue().setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + } + }); + d.getValue().getPsaDocReviewCollection().forEach(d1 -> { + if (doc.equals(d1.getValue().getPsaDocument())) { + d1.getValue().setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + d1.getValue().setApprovalDate(LocalDate.now()); + d1.getValue().setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + } + }); + }); + } + } + } + /** * Builds a {@link DynamicList} representing the orders available for selection * based on the given {@link DraftOrdersWrapper}. Each order is represented as a From e95113acd1ae777ac356b253c6358844fadffcfa Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 26 Nov 2024 18:12:27 +0000 Subject: [PATCH 084/336] WIP - populating status (applying status to agreedDraftOrderCollection) --- .../judgeapproval/ApproveOrderService.java | 124 ++++++++++++++---- 1 file changed, 99 insertions(+), 25 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index be1ecba8da..e5dafacaee 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -7,18 +7,25 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDate; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static java.lang.String.format; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @Service @Slf4j @@ -27,35 +34,102 @@ public class ApproveOrderService { private final IdamService idamService; + /** + * Populates judge decisions for draft orders by iterating through a predefined range of indexes (1 to 5), + * resolving judge approvals, and updating the corresponding draft orders and PSA documents. + * + *

For each index, the method: + *

    + *
  1. Resolves the {@link JudgeApproval} object for the specified index.
    2. + *
  2. Validates the judge approval and ensures it contains a valid document.
    3. + *
  3. Updates the draft orders and PSA documents in the provided {@link DraftOrdersWrapper} based on the judge's decision.
    4. + *
+ * + * @param draftOrdersWrapper the wrapper object containing draft orders and PSA document collections to be updated + * @param userAuthorisation the authorisation token of the user, used to fetch the approving judge's details + * @throws IllegalArgumentException if a judge approval is found with a null document at a given index + */ public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { for (int i = 1; i <= 5; i++) { JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); - if (judgeApproval != null && judgeApproval.getJudgeDecision() == JudgeDecision.READY_TO_BE_SEALED) { - CaseDocument doc = judgeApproval.getDocument(); - if (doc == null) { - throw new IllegalArgumentException(format("Document is null for JudgeApproval at index %d with decision READY_TO_BE_SEALED. " - + "Please check the data integrity.", i)); - } - draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(d -> { - d.getValue().getDraftOrderDocReviewCollection().forEach(d1 -> { - if (doc.equals(d1.getValue().getDraftOrderDocument())) { - d1.getValue().setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - d1.getValue().setApprovalDate(LocalDate.now()); - d1.getValue().setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); - } - }); - d.getValue().getPsaDocReviewCollection().forEach(d1 -> { - if (doc.equals(d1.getValue().getPsaDocument())) { - d1.getValue().setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - d1.getValue().setApprovalDate(LocalDate.now()); - d1.getValue().setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); - } - }); - }); + if (isJudgeApprovalValid(judgeApproval)) { + CaseDocument targetDoc = validateJudgeApprovalDocument(judgeApproval, i); + updateDraftOrders(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); + } + } + } + + private boolean isJudgeApprovalValid(JudgeApproval judgeApproval) { + return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); + } + + private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { + CaseDocument doc = judgeApproval.getDocument(); + if (doc == null) { + throw new IllegalArgumentException(format( + "Document is null for JudgeApproval at index %d. Please check the data integrity.", index)); + } + return doc; + } + + private void updateDraftOrders(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(el -> { + if (el.getValue() != null) { + processDraftOrderDocReviewCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); + processPsaDocReviewCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, userAuthorisation); + } + }); + draftOrdersWrapper.getAgreedDraftOrderCollection().forEach(el -> { + if (el.getValue() != null) { + processAgreedDraftOrderCollection(el.getValue(), targetDoc); } + }); + } + + private void processDraftOrderDocReviewCollection(List docReviews, CaseDocument targetDoc, + JudgeApproval judgeApproval, String userAuthorisation) { + if (docReviews != null) { + docReviews.forEach(el -> { + if (targetDoc.equals(el.getValue().getDraftOrderDocument())) { + handleDraftOrderDocumentUpdate(el.getValue(), judgeApproval, userAuthorisation); + } + }); + } + } + + private void processPsaDocReviewCollection(List psaReviews, CaseDocument targetDoc, String userAuthorisation) { + if (psaReviews != null) { + psaReviews.forEach(el -> { + if (targetDoc.equals(el.getValue().getPsaDocument())) { + handlePsaDocumentUpdate(el.getValue(), userAuthorisation); + } + }); } } + private void processAgreedDraftOrderCollection(AgreedDraftOrder agreedDraftOrder, CaseDocument targetDoc) { + if (agreedDraftOrder != null + && (targetDoc.equals(agreedDraftOrder.getDraftOrder()) || targetDoc.equals(agreedDraftOrder.getPensionSharingAnnex()))) { + agreedDraftOrder.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + } + } + + private void handleDraftOrderDocumentUpdate(DraftOrderDocumentReview review, JudgeApproval judgeApproval, String userAuthorisation) { + if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { + review.setDraftOrderDocument(judgeApproval.getAmendedDocument()); + } + review.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + review.setApprovalDate(LocalDate.now()); + review.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + } + + private void handlePsaDocumentUpdate(PsaDocumentReview review, String userAuthorisation) { + review.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + review.setApprovalDate(LocalDate.now()); + review.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + } + /** * Builds a {@link DynamicList} representing the orders available for selection * based on the given {@link DraftOrdersWrapper}. Each order is represented as a @@ -100,11 +174,11 @@ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrap private static String getDocumentFileName(JudgeApproval judgeApproval) { String filename = null; - if (JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { + if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { filename = judgeApproval.getAmendedDocument() != null ? judgeApproval.getAmendedDocument().getDocumentFilename() : "Unknown Filename"; - } else if (JudgeDecision.READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { + } else if (READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { filename = judgeApproval.getDocument() != null ? judgeApproval.getDocument().getDocumentFilename() : "Unknown Filename"; From 6a3d42677510ef7e1d0b0484a9e196464ba09082 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 26 Nov 2024 18:37:54 +0000 Subject: [PATCH 085/336] Replace the existing PSA with the amended document --- .../judgeapproval/ApproveOrderService.java | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index e5dafacaee..f255d4f5d4 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -77,12 +77,12 @@ private void updateDraftOrders(DraftOrdersWrapper draftOrdersWrapper, CaseDocume draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(el -> { if (el.getValue() != null) { processDraftOrderDocReviewCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); - processPsaDocReviewCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, userAuthorisation); + processPsaDocReviewCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); } }); draftOrdersWrapper.getAgreedDraftOrderCollection().forEach(el -> { if (el.getValue() != null) { - processAgreedDraftOrderCollection(el.getValue(), targetDoc); + processAgreedDraftOrderCollection(el.getValue(), targetDoc, judgeApproval); } }); } @@ -98,23 +98,36 @@ private void processDraftOrderDocReviewCollection(List psaReviews, CaseDocument targetDoc, String userAuthorisation) { + private void processPsaDocReviewCollection(List psaReviews, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { if (psaReviews != null) { psaReviews.forEach(el -> { if (targetDoc.equals(el.getValue().getPsaDocument())) { - handlePsaDocumentUpdate(el.getValue(), userAuthorisation); + handlePsaDocumentUpdate(el.getValue(), judgeApproval, userAuthorisation); } }); } } - private void processAgreedDraftOrderCollection(AgreedDraftOrder agreedDraftOrder, CaseDocument targetDoc) { - if (agreedDraftOrder != null - && (targetDoc.equals(agreedDraftOrder.getDraftOrder()) || targetDoc.equals(agreedDraftOrder.getPensionSharingAnnex()))) { - agreedDraftOrder.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + private void processAgreedDraftOrderCollection(AgreedDraftOrder agreedDraftOrder, CaseDocument targetDoc, JudgeApproval judgeApproval) { + if (agreedDraftOrder == null + || (!targetDoc.equals(agreedDraftOrder.getDraftOrder()) && !targetDoc.equals(agreedDraftOrder.getPensionSharingAnnex()))) { + return; + } + + agreedDraftOrder.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + + if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { + CaseDocument amendedDocument = judgeApproval.getAmendedDocument(); + if (targetDoc.equals(agreedDraftOrder.getDraftOrder())) { + agreedDraftOrder.setDraftOrder(amendedDocument); + } else if (targetDoc.equals(agreedDraftOrder.getPensionSharingAnnex())) { + agreedDraftOrder.setPensionSharingAnnex(amendedDocument); + } } } + private void handleDraftOrderDocumentUpdate(DraftOrderDocumentReview review, JudgeApproval judgeApproval, String userAuthorisation) { if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { review.setDraftOrderDocument(judgeApproval.getAmendedDocument()); @@ -124,7 +137,10 @@ private void handleDraftOrderDocumentUpdate(DraftOrderDocumentReview review, Jud review.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } - private void handlePsaDocumentUpdate(PsaDocumentReview review, String userAuthorisation) { + private void handlePsaDocumentUpdate(PsaDocumentReview review, JudgeApproval judgeApproval, String userAuthorisation) { + if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { + review.setPsaDocument(judgeApproval.getAmendedDocument()); + } review.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); review.setApprovalDate(LocalDate.now()); review.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); From dc9e7c78a590c3ea2bdd090d2fa5984f04443f46 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 27 Nov 2024 12:04:38 +0000 Subject: [PATCH 086/336] Remove unused method. --- .../ccd/draftorders/review/DraftOrdersReview.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java index 5275be0012..4979d48fee 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java @@ -16,7 +16,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -44,17 +43,6 @@ public class DraftOrdersReview implements HasCaseDocument { @JsonProperty("psaDocReviewCollection") private List psaDocReviewCollection; - @JsonIgnore - public String getHearingId() { - DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String formattedDate = hearingDate != null ? hearingDate.format(dateFormatter) : "N/A"; - - return String.format("%s$$%s$$%s$$%s", formattedDate, - Objects.toString(hearingTime, "N/A"), - Objects.toString(hearingType, "N/A"), - Objects.toString(hearingJudge, "N/A")); - } - @JsonIgnore public List getDraftOrderDocReviewCollection() { if (this.draftOrderDocReviewCollection == null) { From e4ba47541e0971ffcf73721fb1f7dbe853d1410f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 27 Nov 2024 13:08:58 +0000 Subject: [PATCH 087/336] Introduced Approvable interface. --- .../model/ccd/Approvable.java | 18 ++++++ .../model/ccd/HasApprovable.java | 5 ++ .../review/DraftOrderDocReviewCollection.java | 11 +++- .../review/DraftOrderDocumentReview.java | 15 ++++- .../review/PsaDocReviewCollection.java | 11 +++- .../draftorders/review/PsaDocumentReview.java | 15 ++++- .../judgeapproval/ApproveOrderService.java | 60 ++++++------------- 7 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java new file mode 100644 index 0000000000..44268ceb04 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -0,0 +1,18 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; + +import java.time.LocalDate; + +public interface Approvable { + + boolean match(CaseDocument targetDoc); + + void setOrderStatus(OrderStatus orderStatus); + + void setApprovalDate(LocalDate localDate); + + void setApprovalJudge(String approvalJudge); + + void replaceDocument(CaseDocument amendedDocument); +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java new file mode 100644 index 0000000000..8592c46a90 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java @@ -0,0 +1,5 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +public interface HasApprovable { + Approvable getApprovable(); +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java index 752e08b2e5..2bce7bb169 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java @@ -1,10 +1,13 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -12,6 +15,12 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class DraftOrderDocReviewCollection implements HasCaseDocument { +public class DraftOrderDocReviewCollection implements HasCaseDocument, HasApprovable { private DraftOrderDocumentReview value; + + @JsonIgnore + @Override + public Approvable getApprovable() { + return value; + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 05c4008c3c..7653d5588d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -8,6 +8,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; @@ -17,12 +18,13 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.Optional; @Builder @Data @NoArgsConstructor @AllArgsConstructor -public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable { +public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Approvable { private CaseDocument draftOrderDocument; private OrderStatus orderStatus; @JsonSerialize(using = LocalDateTimeSerializer.class) @@ -45,4 +47,15 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable { private LocalDateTime reviewedDate; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; + + @Override + public void replaceDocument(CaseDocument amendedDocument) { + this.setDraftOrderDocument(amendedDocument); + } + + @Override + public boolean match(CaseDocument targetDoc) { + return Optional.ofNullable(targetDoc).map(CaseDocument::getDocumentUrl).equals(Optional.ofNullable(draftOrderDocument) + .map(CaseDocument::getDocumentUrl)); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index f2d4d5e440..a651cbb226 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -1,10 +1,13 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -12,6 +15,12 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class PsaDocReviewCollection implements HasCaseDocument { +public class PsaDocReviewCollection implements HasCaseDocument, HasApprovable { private PsaDocumentReview value; + + @JsonIgnore + @Override + public Approvable getApprovable() { + return value; + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index a458afd3e1..c58c87df37 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -8,6 +8,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; @@ -15,12 +16,13 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Optional; @Builder @Data @NoArgsConstructor @AllArgsConstructor -public class PsaDocumentReview implements HasCaseDocument, Reviewable { +public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvable { private CaseDocument psaDocument; private OrderStatus orderStatus; @JsonSerialize(using = LocalDateTimeSerializer.class) @@ -42,4 +44,15 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable { private LocalDateTime reviewedDate; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; + + @Override + public boolean match(CaseDocument targetDoc) { + return Optional.ofNullable(targetDoc).map(CaseDocument::getDocumentUrl).equals(Optional.ofNullable(psaDocument) + .map(CaseDocument::getDocumentUrl)); + } + + @Override + public void replaceDocument(CaseDocument amendedDocument) { + this.setPsaDocument(amendedDocument); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index f255d4f5d4..6bdcd0a1c2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -4,17 +4,15 @@ import lombok.extern.slf4j.Slf4j; import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -22,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; import static java.lang.String.format; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; @@ -76,8 +75,8 @@ private void updateDraftOrders(DraftOrdersWrapper draftOrdersWrapper, CaseDocume String userAuthorisation) { draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(el -> { if (el.getValue() != null) { - processDraftOrderDocReviewCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); - processPsaDocReviewCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); + processApprovableCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); + processApprovableCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); } }); draftOrdersWrapper.getAgreedDraftOrderCollection().forEach(el -> { @@ -87,26 +86,15 @@ private void updateDraftOrders(DraftOrdersWrapper draftOrdersWrapper, CaseDocume }); } - private void processDraftOrderDocReviewCollection(List docReviews, CaseDocument targetDoc, - JudgeApproval judgeApproval, String userAuthorisation) { - if (docReviews != null) { - docReviews.forEach(el -> { - if (targetDoc.equals(el.getValue().getDraftOrderDocument())) { - handleDraftOrderDocumentUpdate(el.getValue(), judgeApproval, userAuthorisation); - } - }); - } - } - - private void processPsaDocReviewCollection(List psaReviews, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { - if (psaReviews != null) { - psaReviews.forEach(el -> { - if (targetDoc.equals(el.getValue().getPsaDocument())) { - handlePsaDocumentUpdate(el.getValue(), judgeApproval, userAuthorisation); - } - }); - } + private void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + Optional.ofNullable(approvables) + .ifPresent(list -> + list.forEach(el -> Optional.ofNullable(el.getApprovable()) + .filter(approvable -> approvable.match(targetDoc)) + .ifPresent(approvable -> handleApprovable(approvable, judgeApproval, userAuthorisation)) + ) + ); } private void processAgreedDraftOrderCollection(AgreedDraftOrder agreedDraftOrder, CaseDocument targetDoc, JudgeApproval judgeApproval) { @@ -127,23 +115,13 @@ private void processAgreedDraftOrderCollection(AgreedDraftOrder agreedDraftOrder } } - - private void handleDraftOrderDocumentUpdate(DraftOrderDocumentReview review, JudgeApproval judgeApproval, String userAuthorisation) { - if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { - review.setDraftOrderDocument(judgeApproval.getAmendedDocument()); - } - review.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - review.setApprovalDate(LocalDate.now()); - review.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); - } - - private void handlePsaDocumentUpdate(PsaDocumentReview review, JudgeApproval judgeApproval, String userAuthorisation) { + private void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { - review.setPsaDocument(judgeApproval.getAmendedDocument()); + approvable.replaceDocument(judgeApproval.getAmendedDocument()); } - review.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - review.setApprovalDate(LocalDate.now()); - review.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + approvable.setApprovalDate(LocalDate.now()); + approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } /** From 4e9074751034a42314a611fb07517a8120f3df4b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 27 Nov 2024 14:17:42 +0000 Subject: [PATCH 088/336] Set AgreedDraftOrder to be Approvable. --- .../draftorders/agreed/AgreedDraftOrder.java | 41 ++++++++++++++- .../agreed/AgreedDraftOrderCollection.java | 11 +++- .../judgeapproval/ApproveOrderService.java | 51 +++++-------------- 3 files changed, 64 insertions(+), 39 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index bdb240447c..17aef8589d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -7,6 +7,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasSubmittedInfo; @@ -14,15 +15,17 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.Optional; @JsonIgnoreProperties(ignoreUnknown = true) @Data @Builder(toBuilder = true) @AllArgsConstructor @NoArgsConstructor -public class AgreedDraftOrder implements HasCaseDocument, HasSubmittedInfo { +public class AgreedDraftOrder implements HasCaseDocument, HasSubmittedInfo, Approvable { private OrderStatus orderStatus; private CaseDocument draftOrder; private CaseDocument pensionSharingAnnex; @@ -32,4 +35,40 @@ public class AgreedDraftOrder implements HasCaseDocument, HasSubmittedInfo { private LocalDateTime submittedDate; private YesOrNo resubmission; private List attachments; + + @Override + public boolean match(CaseDocument targetDoc) { + return Optional.ofNullable(targetDoc) + .map(CaseDocument::getDocumentUrl) + .filter(documentUrl -> + documentUrl.equals(Optional.ofNullable(draftOrder).map(CaseDocument::getDocumentUrl).orElse(null)) + || documentUrl.equals(Optional.ofNullable(pensionSharingAnnex).map(CaseDocument::getDocumentUrl).orElse(null)) + ) + .isPresent(); + } + + @Override + public void setApprovalDate(LocalDate localDate) { + // no approval date; Ignore it. + } + + @Override + public void setApprovalJudge(String approvalJudge) { + // no approval judge; Ignore it. + } + + @Override + public void replaceDocument(CaseDocument amendedDocument) { + if (this.draftOrder != null) { + this.draftOrder = amendedDocument; + } else if (this.pensionSharingAnnex != null) { + this.pensionSharingAnnex = amendedDocument; + } else { + throw new IllegalArgumentException( + "Failed to replace the document: No existing draft order or pension sharing annex is available to be replaced. " + + "Ensure the document to be amended corresponds to a valid existing document." + ); + } + } + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java index 52db790f34..510f361168 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java @@ -1,10 +1,13 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -12,6 +15,12 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class AgreedDraftOrderCollection implements HasCaseDocument { +public class AgreedDraftOrderCollection implements HasCaseDocument, HasApprovable { private AgreedDraftOrder value; + + @JsonIgnore + @Override + public Approvable getApprovable() { + return value; + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 6bdcd0a1c2..dd1965dd82 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -9,7 +9,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; @@ -51,14 +50,25 @@ public class ApproveOrderService { public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { for (int i = 1; i <= 5; i++) { JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); - if (isJudgeApprovalValid(judgeApproval)) { + if (isJudgeApproved(judgeApproval)) { CaseDocument targetDoc = validateJudgeApprovalDocument(judgeApproval, i); - updateDraftOrders(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); + populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); } } } - private boolean isJudgeApprovalValid(JudgeApproval judgeApproval) { + private void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(el -> { + if (el.getValue() != null) { + processApprovableCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); + processApprovableCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); + } + }); + processApprovableCollection(draftOrdersWrapper.getAgreedDraftOrderCollection(), targetDoc, judgeApproval, userAuthorisation); + } + + private boolean isJudgeApproved(JudgeApproval judgeApproval) { return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); } @@ -71,21 +81,6 @@ private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, return doc; } - private void updateDraftOrders(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { - draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(el -> { - if (el.getValue() != null) { - processApprovableCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); - processApprovableCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); - } - }); - draftOrdersWrapper.getAgreedDraftOrderCollection().forEach(el -> { - if (el.getValue() != null) { - processAgreedDraftOrderCollection(el.getValue(), targetDoc, judgeApproval); - } - }); - } - private void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { Optional.ofNullable(approvables) @@ -97,24 +92,6 @@ private void processApprovableCollection(List approvabl ); } - private void processAgreedDraftOrderCollection(AgreedDraftOrder agreedDraftOrder, CaseDocument targetDoc, JudgeApproval judgeApproval) { - if (agreedDraftOrder == null - || (!targetDoc.equals(agreedDraftOrder.getDraftOrder()) && !targetDoc.equals(agreedDraftOrder.getPensionSharingAnnex()))) { - return; - } - - agreedDraftOrder.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - - if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { - CaseDocument amendedDocument = judgeApproval.getAmendedDocument(); - if (targetDoc.equals(agreedDraftOrder.getDraftOrder())) { - agreedDraftOrder.setDraftOrder(amendedDocument); - } else if (targetDoc.equals(agreedDraftOrder.getPensionSharingAnnex())) { - agreedDraftOrder.setPensionSharingAnnex(amendedDocument); - } - } - } - private void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { approvable.replaceDocument(judgeApproval.getAmendedDocument()); From 316e62dd58a4cb339692a6962ddde9a074e98dfe Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 27 Nov 2024 15:59:24 +0000 Subject: [PATCH 089/336] Add test cases for those Approvable objects. --- .../agreed/AgreedDraftOrderTest.java | 83 +++++++++++++++++++ .../review/DraftOrderDocumentReviewTest.java | 52 ++++++++++++ .../review/PsaDocumentReviewTest.java | 52 ++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReviewTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReviewTest.java diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderTest.java new file mode 100644 index 0000000000..e5f1d028e5 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderTest.java @@ -0,0 +1,83 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; + +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class AgreedDraftOrderTest { + + private final AgreedDraftOrder underTest = new AgreedDraftOrder(); + + static Stream matchTestCases() { + CaseDocument doc1 = CaseDocument.builder().documentUrl("url1").build(); + CaseDocument doc2 = CaseDocument.builder().documentUrl("url2").build(); + CaseDocument doc3 = CaseDocument.builder().documentUrl("url3").build(); + + return Stream.of( + Arguments.of(doc1, doc1, doc2, true), // Target doc matches draft order + Arguments.of(doc2, doc1, doc2, true), // Target doc matches pension sharing annex + Arguments.of(doc3, doc1, doc2, false), // Target doc does not match either + Arguments.of(null, doc1, doc2, false) // Null target doc, should return false + ); + } + + @ParameterizedTest + @MethodSource("matchTestCases") + void testMatch(CaseDocument targetDoc, CaseDocument draftOrder, CaseDocument pensionSharingAnnex, boolean expectedResult) { + // Set the fields for the class under test + underTest.setDraftOrder(draftOrder); + underTest.setPensionSharingAnnex(pensionSharingAnnex); + + // Perform the test and assert the result + boolean result = underTest.match(targetDoc); + if (expectedResult) { + assertTrue(result); + } else { + assertFalse(result); + } + } + + static Stream replaceDocumentTestCases() { + CaseDocument doc1 = CaseDocument.builder().documentUrl("url1").build(); + CaseDocument doc2 = CaseDocument.builder().documentUrl("url2").build(); + CaseDocument doc3 = CaseDocument.builder().documentUrl("url3").build(); + + return Stream.of( + Arguments.of(doc1, doc1, doc2, doc1), // Replace draft order with doc1 + Arguments.of(doc2, null, doc2, doc2), // Replace pension sharing annex with doc2 + Arguments.of(doc3, doc1, null, doc3), // Replace draft order with doc3 when pensionSharingAnnex is null + Arguments.of(doc1, null, null, null) // Should throw IllegalArgumentException + ); + } + + @ParameterizedTest + @MethodSource("replaceDocumentTestCases") + void testReplaceDocument(CaseDocument amendedDocument, CaseDocument initialDraftOrder, CaseDocument initialPensionSharingAnnex, + CaseDocument expectedDocument) { + // Set the fields for the class under test + underTest.setDraftOrder(initialDraftOrder); + underTest.setPensionSharingAnnex(initialPensionSharingAnnex); + + // Perform the replace document operation + if (expectedDocument == null) { + assertThrows(IllegalArgumentException.class, () -> underTest.replaceDocument(amendedDocument)); + } else { + underTest.replaceDocument(amendedDocument); + // Assert the replaced document + if (initialDraftOrder != null) { + assertEquals(expectedDocument, underTest.getDraftOrder()); + } else { + assertEquals(expectedDocument, underTest.getPensionSharingAnnex()); + } + } + } + +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReviewTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReviewTest.java new file mode 100644 index 0000000000..e0533be6fa --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReviewTest.java @@ -0,0 +1,52 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; + +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DraftOrderDocumentReviewTest { + + private final DraftOrderDocumentReview underTest = new DraftOrderDocumentReview(); + + static Stream matchTestCases() { + CaseDocument doc1 = CaseDocument.builder().documentUrl("url1").build(); + CaseDocument doc2 = CaseDocument.builder().documentUrl("url2").build(); + CaseDocument doc3 = CaseDocument.builder().documentUrl("url3").build(); + + return Stream.of( + Arguments.of(doc1, doc1, true), // Target doc matches draft order document + Arguments.of(doc2, doc1, false), // Target doc does not match draft order document + Arguments.of(doc3, doc2, false), // Target doc does not match draft order document + Arguments.of(null, doc2, false) // Null target doc, should return false + ); + } + + @Test + void testReplaceDocument() { + // Given an amended document + CaseDocument amendedDocument = CaseDocument.builder().documentUrl("newUrl").build(); + + // Call replaceDocument to set the draftOrderDocument + underTest.replaceDocument(amendedDocument); + + // Assert that the draftOrderDocument was set to the amended document + assertEquals(amendedDocument, underTest.getDraftOrderDocument(), "The draftOrderDocument should be replaced with the amended document."); + } + + @ParameterizedTest + @MethodSource("matchTestCases") + void testMatch(CaseDocument targetDoc, CaseDocument draftOrderDocument, boolean expectedResult) { + // Set the initial draftOrderDocument in the underTest object + underTest.replaceDocument(draftOrderDocument); + + // Perform the match operation and assert the result + boolean result = underTest.match(targetDoc); + assertEquals(expectedResult, result, "The match result should be as expected."); + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReviewTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReviewTest.java new file mode 100644 index 0000000000..fb26a8221f --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReviewTest.java @@ -0,0 +1,52 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; + +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class PsaDocumentReviewTest { + + private final PsaDocumentReview underTest = new PsaDocumentReview(); + + static Stream matchTestCases() { + CaseDocument doc1 = CaseDocument.builder().documentUrl("url1").build(); + CaseDocument doc2 = CaseDocument.builder().documentUrl("url2").build(); + CaseDocument doc3 = CaseDocument.builder().documentUrl("url3").build(); + + return Stream.of( + Arguments.of(doc1, doc1, true), // Target doc matches psa document + Arguments.of(doc2, doc1, false), // Target doc does not match psa document + Arguments.of(doc3, doc2, false), // Target doc does not match psa document + Arguments.of(null, doc2, false) // Null target doc, should return false + ); + } + + @Test + void testReplaceDocument() { + // Given an amended document + CaseDocument amendedDocument = CaseDocument.builder().documentUrl("newUrl").build(); + + // Call replaceDocument to set the draftOrderDocument + underTest.replaceDocument(amendedDocument); + + // Assert that the draftOrderDocument was set to the amended document + assertEquals(amendedDocument, underTest.getPsaDocument(), "The psaDocument should be replaced with the amended document."); + } + + @ParameterizedTest + @MethodSource("matchTestCases") + void testMatch(CaseDocument targetDoc, CaseDocument psaDocument, boolean expectedResult) { + // Set the initial psaDocument in the underTest object + underTest.replaceDocument(psaDocument); + + // Perform the match operation and assert the result + boolean result = underTest.match(targetDoc); + assertEquals(expectedResult, result, "The match result should be as expected."); + } +} From ca5cef94ea054b137e42b1c2854f88d9aa535554 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 27 Nov 2024 22:33:35 +0000 Subject: [PATCH 090/336] Setting HearingInstruction --- .../model/ccd/Approvable.java | 4 +- .../model/ccd/DocumentMatcher.java | 6 + .../model/ccd/HasApprovable.java | 5 - .../ccd/HearingInstructionProcessable.java | 14 +++ .../agreed/AgreedDraftOrderCollection.java | 10 +- .../review/DraftOrderDocReviewCollection.java | 10 +- .../review/DraftOrderDocumentReview.java | 3 +- .../review/PsaDocReviewCollection.java | 10 +- .../draftorders/review/PsaDocumentReview.java | 3 +- .../judgeapproval/ApproveOrderService.java | 111 +++++++++++++++--- .../ApproveOrderServiceTest.java | 8 +- 11 files changed, 125 insertions(+), 59 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DocumentMatcher.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HearingInstructionProcessable.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index 44268ceb04..d5a2c36cf4 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -4,9 +4,7 @@ import java.time.LocalDate; -public interface Approvable { - - boolean match(CaseDocument targetDoc); +public interface Approvable extends DocumentMatcher { void setOrderStatus(OrderStatus orderStatus); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DocumentMatcher.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DocumentMatcher.java new file mode 100644 index 0000000000..81a480b74d --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DocumentMatcher.java @@ -0,0 +1,6 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +public interface DocumentMatcher { + + boolean match(CaseDocument targetDoc); +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java deleted file mode 100644 index 8592c46a90..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java +++ /dev/null @@ -1,5 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; - -public interface HasApprovable { - Approvable getApprovable(); -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HearingInstructionProcessable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HearingInstructionProcessable.java new file mode 100644 index 0000000000..9b384d0ff1 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HearingInstructionProcessable.java @@ -0,0 +1,14 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +public interface HearingInstructionProcessable extends DocumentMatcher { + + void setAnotherHearingToBeListed(YesOrNo yesOrNo); + + void setHearingType(String hearingType); + + void setAdditionalTime(String additionalTime); + + void setHearingTimeEstimate(String timeEstimate); + + void setOtherListingInstructions(String instructions); +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java index 510f361168..a8db2ea100 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java @@ -1,13 +1,10 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -15,12 +12,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class AgreedDraftOrderCollection implements HasCaseDocument, HasApprovable { +public class AgreedDraftOrderCollection implements HasCaseDocument { private AgreedDraftOrder value; - @JsonIgnore - @Override - public Approvable getApprovable() { - return value; - } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java index 2bce7bb169..1df98b5933 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java @@ -1,13 +1,10 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -15,12 +12,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class DraftOrderDocReviewCollection implements HasCaseDocument, HasApprovable { +public class DraftOrderDocReviewCollection implements HasCaseDocument { private DraftOrderDocumentReview value; - @JsonIgnore - @Override - public Approvable getApprovable() { - return value; - } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 7653d5588d..63ce4e3dd0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -11,6 +11,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; @@ -24,7 +25,7 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Approvable { +public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Approvable, HearingInstructionProcessable { private CaseDocument draftOrderDocument; private OrderStatus orderStatus; @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index a651cbb226..b05ac27959 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -1,13 +1,10 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -15,12 +12,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class PsaDocReviewCollection implements HasCaseDocument, HasApprovable { +public class PsaDocReviewCollection implements HasCaseDocument { private PsaDocumentReview value; - @JsonIgnore - @Override - public Approvable getApprovable() { - return value; - } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index c58c87df37..6a2f790f72 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -11,6 +11,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; @@ -22,7 +23,7 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvable { +public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvable, HearingInstructionProcessable { private CaseDocument psaDocument; private OrderStatus orderStatus; @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index dd1965dd82..83c203555a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -1,6 +1,7 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; @@ -8,10 +9,15 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -19,9 +25,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; import static java.lang.String.format; +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @@ -30,11 +38,13 @@ @RequiredArgsConstructor public class ApproveOrderService { + private static final String SEPARATOR = "#"; + private final IdamService idamService; /** * Populates judge decisions for draft orders by iterating through a predefined range of indexes (1 to 5), - * resolving judge approvals, and updating the corresponding draft orders and PSA documents. + * resolving judge approvals, and updating the corresponding draft orders and PSA documents statuses and hearing instructions. * *

For each index, the method: *

    @@ -59,13 +69,32 @@ public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String private void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { - draftOrdersWrapper.getDraftOrdersReviewCollection().forEach(el -> { - if (el.getValue() != null) { - processApprovableCollection(el.getValue().getDraftOrderDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); - processApprovableCollection(el.getValue().getPsaDocReviewCollection(), targetDoc, judgeApproval, userAuthorisation); - } - }); - processApprovableCollection(draftOrdersWrapper.getAgreedDraftOrderCollection(), targetDoc, judgeApproval, userAuthorisation); + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> collection.forEach(el -> { + if (el.getValue() != null) { + ofNullable(el.getValue().getDraftOrderDocReviewCollection()) + .ifPresent(draftOrderDocReviewCollection -> + processApprovableCollection(draftOrderDocReviewCollection.stream().map(DraftOrderDocReviewCollection::getValue) + .toList(), targetDoc, judgeApproval, userAuthorisation) + ); + + ofNullable(el.getValue().getPsaDocReviewCollection()) + .ifPresent(psaDocReviewCollection -> + processApprovableCollection(psaDocReviewCollection.stream().map(PsaDocReviewCollection::getValue) + .toList(), targetDoc, judgeApproval, userAuthorisation) + ); + } + })); + + ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) + .ifPresent(agreedDraftOrderCollections -> + processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue) + .toList(), targetDoc, judgeApproval, userAuthorisation) + ); + + ofNullable(draftOrdersWrapper.getHearingInstruction()) + .map(HearingInstruction::getAnotherHearingRequestCollection) + .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); } private boolean isJudgeApproved(JudgeApproval judgeApproval) { @@ -75,17 +104,16 @@ private boolean isJudgeApproved(JudgeApproval judgeApproval) { private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { CaseDocument doc = judgeApproval.getDocument(); if (doc == null) { - throw new IllegalArgumentException(format( - "Document is null for JudgeApproval at index %d. Please check the data integrity.", index)); + throw new IllegalArgumentException(format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index)); } return doc; } - private void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, + private void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { - Optional.ofNullable(approvables) + ofNullable(approvables) .ifPresent(list -> - list.forEach(el -> Optional.ofNullable(el.getApprovable()) + list.forEach(el -> ofNullable(el) .filter(approvable -> approvable.match(targetDoc)) .ifPresent(approvable -> handleApprovable(approvable, judgeApproval, userAuthorisation)) ) @@ -101,6 +129,53 @@ private void handleApprovable(Approvable approvable, JudgeApproval judgeApproval approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } + @SneakyThrows + private void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { + String[] splitResult = ofNullable(anotherHearingRequest) + .map(AnotherHearingRequest::getWhichOrder) + .map(DynamicList::getValueCode) + .map(valueCode -> valueCode.split(SEPARATOR)) + .orElseThrow(() -> new IllegalStateException("Required value is missing: " + anotherHearingRequest)); + + String orderIndex = splitResult[1]; + + JudgeApproval judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) + .invoke(draftOrdersWrapper); + CaseDocument targetDoc = judgeApproval.getDocument(); + + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> collection.forEach(el -> { + if (el.getValue() != null) { + ofNullable(el.getValue().getDraftOrderDocReviewCollection()) + .ifPresent(draftOrderDocReviewCollection -> + processHearingInstruction(draftOrderDocReviewCollection.stream().map(DraftOrderDocReviewCollection::getValue).toList(), + targetDoc, anotherHearingRequest) + ); + + ofNullable(el.getValue().getPsaDocReviewCollection()) + .ifPresent(psaDocReviewCollection -> + processHearingInstruction(psaDocReviewCollection.stream().map(PsaDocReviewCollection::getValue).toList(), + targetDoc, anotherHearingRequest) + ); + } + })); + } + + private void processHearingInstruction(List hip, + CaseDocument targetDoc, + AnotherHearingRequest anotherHearingRequest) { + ofNullable(hip) + .ifPresent(list -> list.forEach(el -> { + if (el.match(targetDoc)) { + el.setAnotherHearingToBeListed(YesOrNo.YES); + el.setHearingType(anotherHearingRequest.getTypeOfHearing().name()); + el.setAdditionalTime(anotherHearingRequest.getAdditionalTime()); + el.setHearingTimeEstimate(anotherHearingRequest.getTimeEstimate().getValue()); + el.setOtherListingInstructions(anotherHearingRequest.getAnyOtherListingInstructions()); + } + })); + } + /** * Builds a {@link DynamicList} representing the orders available for selection * based on the given {@link DraftOrdersWrapper}. Each order is represented as a @@ -130,8 +205,8 @@ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrap for (int i = 1; i <= 5; i++) { JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); if (judgeApproval != null) { - String codePrefix = JudgeApprovalDocType.DRAFT_ORDER == judgeApproval.getDocType() ? "draftOrder" : "psa"; - String code = codePrefix + "_" + i; + String codePrefix = DRAFT_ORDER == judgeApproval.getDocType() ? DRAFT_ORDER.name() : PSA.name(); + String code = codePrefix + SEPARATOR + i; String filename = getDocumentFileName(judgeApproval); if (!StringUtils.isEmpty(filename)) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index f26b3f3cc3..1830cc740b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -31,8 +31,8 @@ class ApproveOrderServiceTest { @ParameterizedTest @CsvSource({ - "1, READY_TO_BE_SEALED, draftOrder_1, DraftDocument1.pdf", - "2, JUDGE_NEEDS_TO_MAKE_CHANGES, draftOrder_2, AmendedDraftDocument2.pdf", + "1, READY_TO_BE_SEALED, DRAFT_ORDER#1, DraftDocument1.pdf", + "2, JUDGE_NEEDS_TO_MAKE_CHANGES, DRAFT_ORDER#2, AmendedDraftDocument2.pdf", "3, REVIEW_LATER, , " }) void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decision, String expectedCode, String expectedLabel) { @@ -75,10 +75,10 @@ void testBuildWhichOrderDynamicListMultipleItems() { List listItems = dynamicList.getListItems(); // Additional checks to validate correct elements - assertEquals("draftOrder_" + 1, listItems.get(0).getCode()); + assertEquals("DRAFT_ORDER#" + 1, listItems.get(0).getCode()); assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); - assertEquals("psa_" + 3, listItems.get(1).getCode()); + assertEquals("PSA#" + 3, listItems.get(1).getCode()); assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); } From 509cf5b6d8129674efa4bfcd5ac990dbdb55a8d7 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 27 Nov 2024 22:36:55 +0000 Subject: [PATCH 091/336] Add test case. --- ...veDraftOrdersAboutToSubmitHandlerTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java index 6cca87e68f..9db350df00 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java @@ -17,6 +17,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @@ -59,4 +60,23 @@ void shouldClearObjectsWhichAreForCapturingInputPurpose() { assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval4()).isNull(); assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval5()).isNull(); } + + @Test + void shouldInvokeApprovalServicePopulateJudgeDecisions() { + DraftOrdersWrapper draftOrdersWrapper = null; + FinremCaseData caseData = FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper = DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder().build()) + .judgeApproval1(JudgeApproval.builder().build()) + .judgeApproval2(JudgeApproval.builder().build()) + .judgeApproval3(JudgeApproval.builder().build()) + .judgeApproval4(JudgeApproval.builder().build()) + .judgeApproval5(JudgeApproval.builder().build()) + .build()) + .build(); + + handler.handle(FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + verify(approveOrderService).populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); + } } From dd85472decd9e9aa00a3b606dd728b9cbdc10dbd Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 10:56:57 +0000 Subject: [PATCH 092/336] Add unit test --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 83c203555a..690e4068be 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -97,7 +97,7 @@ private void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDo .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); } - private boolean isJudgeApproved(JudgeApproval judgeApproval) { + protected boolean isJudgeApproved(JudgeApproval judgeApproval) { return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 1830cc740b..32db64011f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -4,7 +4,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -15,6 +17,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import java.util.List; +import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -22,6 +25,8 @@ import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @ExtendWith(MockitoExtension.class) class ApproveOrderServiceTest { @@ -158,4 +163,19 @@ void testResolveJudgeApproval() { assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, -1)); } + @ParameterizedTest + @MethodSource("provideJudgeApprovalTestCases") + void testIsJudgeApproved(JudgeDecision judgeDecision, boolean expectedApproval) { + boolean result = underTest.isJudgeApproved(JudgeApproval.builder().judgeDecision(judgeDecision).build()); + assertEquals(expectedApproval, result); + } + + private static Stream provideJudgeApprovalTestCases() { + return Stream.of( + Arguments.of(READY_TO_BE_SEALED, true), + Arguments.of(JUDGE_NEEDS_TO_MAKE_CHANGES, true), + Arguments.of(null, false) + ); + } + } From 8b2b9c54b50a10a16df1eb5349c955c14a0738e1 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 12:11:05 +0000 Subject: [PATCH 093/336] Fixing typeOfHearing --- .../ccd/draftorders/judgeapproval/AnotherHearingRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java index 0b70993286..3ea941b2ef 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/AnotherHearingRequest.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTypeDirection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; @JsonIgnoreProperties(ignoreUnknown = true) @Builder @@ -18,7 +18,7 @@ public class AnotherHearingRequest { private DynamicList whichOrder; - private HearingTypeDirection typeOfHearing; + private InterimTypeOfHearing typeOfHearing; private HearingTimeDirection timeEstimate; From 6d8c9515d80a7b096ce4830322f9c1ea127388c4 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 15:57:41 +0000 Subject: [PATCH 094/336] More test cases. --- .../judgeapproval/ApproveOrderService.java | 4 +- .../ApproveOrderServiceTest.java | 90 +++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 690e4068be..5e8cb5824a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -101,7 +101,7 @@ protected boolean isJudgeApproved(JudgeApproval judgeApproval) { return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); } - private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { + protected CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { CaseDocument doc = judgeApproval.getDocument(); if (doc == null) { throw new IllegalArgumentException(format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index)); @@ -161,7 +161,7 @@ private void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, An })); } - private void processHearingInstruction(List hip, + protected void processHearingInstruction(List hip, CaseDocument targetDoc, AnotherHearingRequest anotherHearingRequest) { ofNullable(hip) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 32db64011f..b937d83d44 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -12,16 +12,26 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import java.util.List; import java.util.stream.Stream; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; @@ -178,4 +188,84 @@ private static Stream provideJudgeApprovalTestCases() { ); } + @ParameterizedTest + @MethodSource("provideValidateJudgeApprovalDocumentTestData") + void testValidateJudgeApprovalDocument(JudgeApproval judgeApproval, int index, boolean expectException) { + if (expectException) { + IllegalArgumentException exception = assertThrows( + IllegalArgumentException.class, + () -> underTest.validateJudgeApprovalDocument(judgeApproval, index) + ); + assertEquals( + String.format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index), + exception.getMessage() + ); + } else { + CaseDocument result = assertDoesNotThrow(() -> underTest.validateJudgeApprovalDocument(judgeApproval, index)); + assertNotNull(result); + assertSame(judgeApproval.getDocument(), result); + } + } + + static Stream provideValidateJudgeApprovalDocumentTestData() { + JudgeApproval validApproval = mock(JudgeApproval.class); + CaseDocument validDoc = mock(CaseDocument.class); + when(validApproval.getDocument()).thenReturn(validDoc); + + JudgeApproval invalidApproval = mock(JudgeApproval.class); + when(invalidApproval.getDocument()).thenReturn(null); + + return Stream.of( + Arguments.of(validApproval, 0, false), // Valid case: should not throw exception + Arguments.of(invalidApproval, 1, true) // Invalid case: should throw exception + ); + } + + @ParameterizedTest + @MethodSource("provideHearingInstructionTestData") + void testProcessHearingInstruction(List draftOrderDocumentReviews, + CaseDocument targetDoc, + AnotherHearingRequest anotherHearingRequest) { + underTest.processHearingInstruction(draftOrderDocumentReviews, targetDoc, anotherHearingRequest); + + if (draftOrderDocumentReviews != null) { + for (DraftOrderDocumentReview element : draftOrderDocumentReviews) { + if (element.match(targetDoc)) { + assertEquals(YesOrNo.YES, element.getAnotherHearingToBeListed()); + assertEquals(anotherHearingRequest.getTypeOfHearing().name(), element.getHearingType()); + assertEquals(anotherHearingRequest.getAdditionalTime(), element.getAdditionalTime()); + assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), element.getHearingTimeEstimate()); + assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), element.getOtherListingInstructions()); + } else { + assertNull(element.getAnotherHearingToBeListed()); + assertNull(element.getHearingType()); + assertNull(element.getAdditionalTime()); + assertNull(element.getHearingTimeEstimate()); + assertNull(element.getOtherListingInstructions()); + } + } + } + } + + static Stream provideHearingInstructionTestData() { + DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); + CaseDocument targetDoc = mock(CaseDocument.class); + when(matchingElement.match(targetDoc)).thenReturn(true); + + DraftOrderDocumentReview nonMatchingElement = spy(DraftOrderDocumentReview.class); + when(nonMatchingElement.match(targetDoc)).thenReturn(false); + + AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); + when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); + when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); + when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); + when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); + + return Stream.of( + Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), + Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), + Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), + Arguments.of(null, targetDoc, anotherHearingRequest)/* + ); + } } From 4dad099e6181cd7171dfdfbbad840d135212ea0d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 15:58:28 +0000 Subject: [PATCH 095/336] syntax fix --- .../service/judgeapproval/ApproveOrderServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index b937d83d44..39aa83b55b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -265,7 +265,7 @@ static Stream provideHearingInstructionTestData() { Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), - Arguments.of(null, targetDoc, anotherHearingRequest)/* + Arguments.of(null, targetDoc, anotherHearingRequest) ); } } From b747f284d0b41db19e6a50bba4b5e9e951b70175 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 16:04:14 +0000 Subject: [PATCH 096/336] update unit tests --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 55 ++++++++++++++++++- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 5e8cb5824a..8e02483554 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -120,7 +120,7 @@ private void processApprovableCollection(List approvables, ); } - private void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { + protected void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { approvable.replaceDocument(judgeApproval.getAmendedDocument()); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 39aa83b55b..1c933e518d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -19,6 +19,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import java.util.List; @@ -222,8 +223,8 @@ static Stream provideValidateJudgeApprovalDocumentTestData() { } @ParameterizedTest - @MethodSource("provideHearingInstructionTestData") - void testProcessHearingInstruction(List draftOrderDocumentReviews, + @MethodSource("provideHearingInstructionTestData_DraftOrderDocumentReview") + void testProcessDraftOrderDocumentReview(List draftOrderDocumentReviews, CaseDocument targetDoc, AnotherHearingRequest anotherHearingRequest) { underTest.processHearingInstruction(draftOrderDocumentReviews, targetDoc, anotherHearingRequest); @@ -247,7 +248,7 @@ void testProcessHearingInstruction(List draftOrderDocu } } - static Stream provideHearingInstructionTestData() { + static Stream provideHearingInstructionTestData_DraftOrderDocumentReview() { DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); CaseDocument targetDoc = mock(CaseDocument.class); when(matchingElement.match(targetDoc)).thenReturn(true); @@ -268,4 +269,52 @@ static Stream provideHearingInstructionTestData() { Arguments.of(null, targetDoc, anotherHearingRequest) ); } + + @ParameterizedTest + @MethodSource("provideHearingInstructionTestData_PsaDocumentReview") + void testProcessPsaDocumentReview(List psaDocumentReviews, + CaseDocument targetDoc, + AnotherHearingRequest anotherHearingRequest) { + underTest.processHearingInstruction(psaDocumentReviews, targetDoc, anotherHearingRequest); + + if (psaDocumentReviews != null) { + for (PsaDocumentReview element : psaDocumentReviews) { + if (element.match(targetDoc)) { + assertEquals(YesOrNo.YES, element.getAnotherHearingToBeListed()); + assertEquals(anotherHearingRequest.getTypeOfHearing().name(), element.getHearingType()); + assertEquals(anotherHearingRequest.getAdditionalTime(), element.getAdditionalTime()); + assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), element.getHearingTimeEstimate()); + assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), element.getOtherListingInstructions()); + } else { + assertNull(element.getAnotherHearingToBeListed()); + assertNull(element.getHearingType()); + assertNull(element.getAdditionalTime()); + assertNull(element.getHearingTimeEstimate()); + assertNull(element.getOtherListingInstructions()); + } + } + } + } + + static Stream provideHearingInstructionTestData_PsaDocumentReview() { + PsaDocumentReview matchingElement = spy(PsaDocumentReview.class); + CaseDocument targetDoc = mock(CaseDocument.class); + when(matchingElement.match(targetDoc)).thenReturn(true); + + PsaDocumentReview nonMatchingElement = spy(PsaDocumentReview.class); + when(nonMatchingElement.match(targetDoc)).thenReturn(false); + + AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); + when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); + when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); + when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); + when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); + + return Stream.of( + Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), + Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), + Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), + Arguments.of(null, targetDoc, anotherHearingRequest) + ); + } } From 1e93295019f3505c0064ba22d0138ab8fe4797c5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 16:30:01 +0000 Subject: [PATCH 097/336] increase test coverage. --- .../ApproveOrderServiceTest.java | 138 +++++++++++------- 1 file changed, 85 insertions(+), 53 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 1c933e518d..a9092ccdff 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -8,10 +8,13 @@ import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; @@ -21,7 +24,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; +import java.time.LocalDate; import java.util.List; import java.util.stream.Stream; @@ -31,13 +36,18 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; @ExtendWith(MockitoExtension.class) class ApproveOrderServiceTest { @@ -45,6 +55,9 @@ class ApproveOrderServiceTest { @InjectMocks private ApproveOrderService underTest; + @Mock + private IdamService idamService;; + @ParameterizedTest @CsvSource({ "1, READY_TO_BE_SEALED, DRAFT_ORDER#1, DraftDocument1.pdf", @@ -223,32 +236,48 @@ static Stream provideValidateJudgeApprovalDocumentTestData() { } @ParameterizedTest - @MethodSource("provideHearingInstructionTestData_DraftOrderDocumentReview") - void testProcessDraftOrderDocumentReview(List draftOrderDocumentReviews, + @MethodSource("provideHearingInstructionTestData") + void testProcessHearingInstruction(List hearingInstructionProcessables, CaseDocument targetDoc, AnotherHearingRequest anotherHearingRequest) { - underTest.processHearingInstruction(draftOrderDocumentReviews, targetDoc, anotherHearingRequest); + underTest.processHearingInstruction(hearingInstructionProcessables, targetDoc, anotherHearingRequest); - if (draftOrderDocumentReviews != null) { - for (DraftOrderDocumentReview element : draftOrderDocumentReviews) { + if (hearingInstructionProcessables != null) { + for (HearingInstructionProcessable element : hearingInstructionProcessables) { if (element.match(targetDoc)) { - assertEquals(YesOrNo.YES, element.getAnotherHearingToBeListed()); - assertEquals(anotherHearingRequest.getTypeOfHearing().name(), element.getHearingType()); - assertEquals(anotherHearingRequest.getAdditionalTime(), element.getAdditionalTime()); - assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), element.getHearingTimeEstimate()); - assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), element.getOtherListingInstructions()); + if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { + assertEquals(YesOrNo.YES, draftOrderDocumentReview.getAnotherHearingToBeListed()); + assertEquals(anotherHearingRequest.getTypeOfHearing().name(), draftOrderDocumentReview.getHearingType()); + assertEquals(anotherHearingRequest.getAdditionalTime(), draftOrderDocumentReview.getAdditionalTime()); + assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), draftOrderDocumentReview.getHearingTimeEstimate()); + assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), draftOrderDocumentReview.getOtherListingInstructions()); + } else if (element instanceof PsaDocumentReview psaDocumentReview) { + assertEquals(YesOrNo.YES, psaDocumentReview.getAnotherHearingToBeListed()); + assertEquals(anotherHearingRequest.getTypeOfHearing().name(), psaDocumentReview.getHearingType()); + assertEquals(anotherHearingRequest.getAdditionalTime(), psaDocumentReview.getAdditionalTime()); + assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), psaDocumentReview.getHearingTimeEstimate()); + assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), psaDocumentReview.getOtherListingInstructions()); + } } else { - assertNull(element.getAnotherHearingToBeListed()); - assertNull(element.getHearingType()); - assertNull(element.getAdditionalTime()); - assertNull(element.getHearingTimeEstimate()); - assertNull(element.getOtherListingInstructions()); + if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { + assertNull(draftOrderDocumentReview.getAnotherHearingToBeListed()); + assertNull(draftOrderDocumentReview.getHearingType()); + assertNull(draftOrderDocumentReview.getAdditionalTime()); + assertNull(draftOrderDocumentReview.getHearingTimeEstimate()); + assertNull(draftOrderDocumentReview.getOtherListingInstructions()); + } else if (element instanceof PsaDocumentReview psaDocumentReview) { + assertNull(psaDocumentReview.getAnotherHearingToBeListed()); + assertNull(psaDocumentReview.getHearingType()); + assertNull(psaDocumentReview.getAdditionalTime()); + assertNull(psaDocumentReview.getHearingTimeEstimate()); + assertNull(psaDocumentReview.getOtherListingInstructions()); + } } } } } - static Stream provideHearingInstructionTestData_DraftOrderDocumentReview() { + static Stream provideHearingInstructionTestData() { DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); CaseDocument targetDoc = mock(CaseDocument.class); when(matchingElement.match(targetDoc)).thenReturn(true); @@ -262,59 +291,62 @@ static Stream provideHearingInstructionTestData_DraftOrderDocumentRev when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); - return Stream.of( + Stream r1 = Stream.of( Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), Arguments.of(null, targetDoc, anotherHearingRequest) ); + + PsaDocumentReview matchingElement1 = spy(PsaDocumentReview.class); + when(matchingElement1.match(targetDoc)).thenReturn(true); + + PsaDocumentReview nonMatchingElement1 = spy(PsaDocumentReview.class); + when(nonMatchingElement1.match(targetDoc)).thenReturn(false); + + Stream r2 = Stream.of( + Arguments.of(List.of(matchingElement1), targetDoc, anotherHearingRequest), + Arguments.of(List.of(nonMatchingElement1), targetDoc, anotherHearingRequest), + Arguments.of(List.of(matchingElement1, nonMatchingElement1), targetDoc, anotherHearingRequest), + Arguments.of(null, targetDoc, anotherHearingRequest) + ); + return Stream.concat(r1, r2); } @ParameterizedTest - @MethodSource("provideHearingInstructionTestData_PsaDocumentReview") - void testProcessPsaDocumentReview(List psaDocumentReviews, - CaseDocument targetDoc, - AnotherHearingRequest anotherHearingRequest) { - underTest.processHearingInstruction(psaDocumentReviews, targetDoc, anotherHearingRequest); + @MethodSource("provideApprovableTestData") + void testHandleApprovable(Approvable approvable, JudgeApproval judgeApproval, boolean documentReplaced) { + String mockJudgeName = "Judge TestName"; + when(idamService.getIdamFullName(any())).thenReturn(mockJudgeName); - if (psaDocumentReviews != null) { - for (PsaDocumentReview element : psaDocumentReviews) { - if (element.match(targetDoc)) { - assertEquals(YesOrNo.YES, element.getAnotherHearingToBeListed()); - assertEquals(anotherHearingRequest.getTypeOfHearing().name(), element.getHearingType()); - assertEquals(anotherHearingRequest.getAdditionalTime(), element.getAdditionalTime()); - assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), element.getHearingTimeEstimate()); - assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), element.getOtherListingInstructions()); - } else { - assertNull(element.getAnotherHearingToBeListed()); - assertNull(element.getHearingType()); - assertNull(element.getAdditionalTime()); - assertNull(element.getHearingTimeEstimate()); - assertNull(element.getOtherListingInstructions()); - } - } + underTest.handleApprovable(approvable, judgeApproval, AUTH_TOKEN); + + verify(approvable).setOrderStatus(APPROVED_BY_JUDGE); + verify(approvable).setApprovalDate(LocalDate.now()); + verify(approvable).setApprovalJudge(mockJudgeName); + + if (documentReplaced) { + verify(approvable).replaceDocument(judgeApproval.getAmendedDocument()); + } else { + verify(approvable, never()).replaceDocument(any()); } } - static Stream provideHearingInstructionTestData_PsaDocumentReview() { - PsaDocumentReview matchingElement = spy(PsaDocumentReview.class); - CaseDocument targetDoc = mock(CaseDocument.class); - when(matchingElement.match(targetDoc)).thenReturn(true); + static Stream provideApprovableTestData() { + CaseDocument amendedDocument = mock(CaseDocument.class); - PsaDocumentReview nonMatchingElement = spy(PsaDocumentReview.class); - when(nonMatchingElement.match(targetDoc)).thenReturn(false); + JudgeApproval judgeNeedsChanges = mock(JudgeApproval.class); + when(judgeNeedsChanges.getJudgeDecision()).thenReturn(JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES); + when(judgeNeedsChanges.getAmendedDocument()).thenReturn(amendedDocument); - AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); - when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); - when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); - when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); - when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); + JudgeApproval judgeApproves = mock(JudgeApproval.class); + when(judgeApproves.getJudgeDecision()).thenReturn(READY_TO_BE_SEALED); return Stream.of( - Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), - Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), - Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), - Arguments.of(null, targetDoc, anotherHearingRequest) + Arguments.of(mock(PsaDocumentReview.class), judgeNeedsChanges, true), + Arguments.of(mock(PsaDocumentReview.class), judgeApproves, false), + Arguments.of(mock(DraftOrderDocumentReview.class), judgeNeedsChanges, true), + Arguments.of(mock(DraftOrderDocumentReview.class), judgeApproves, false) ); } } From d5f96e6663a8f04e0bfa1f3b7e03bf0ab72eaa81 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 16:40:58 +0000 Subject: [PATCH 098/336] update test --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 41 ++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 8e02483554..5b87bb82d2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -109,7 +109,7 @@ protected CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval return doc; } - private void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, + protected void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { ofNullable(approvables) .ifPresent(list -> diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index a9092ccdff..43501f724d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -37,9 +37,12 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; @@ -56,7 +59,43 @@ class ApproveOrderServiceTest { private ApproveOrderService underTest; @Mock - private IdamService idamService;; + private IdamService idamService; + + @ParameterizedTest + @MethodSource("provideApprovableCollections") + void testProcessApprovableCollection(List approvables, + CaseDocument targetDoc, + JudgeApproval judgeApproval, + int expectedHandledCount) { + // Mock the method to count calls to handleApprovable + ApproveOrderService spyService = spy(underTest); + lenient().doNothing().when(spyService).handleApprovable(any(), any(), any()); + + spyService.processApprovableCollection(approvables, targetDoc, judgeApproval, AUTH_TOKEN); + + // Verify the number of handleApprovable invocations + verify(spyService, times(expectedHandledCount)) + .handleApprovable(any(Approvable.class), eq(judgeApproval), eq(AUTH_TOKEN)); + } + + private static Stream provideApprovableCollections() { + CaseDocument targetDoc = mock(CaseDocument.class); + JudgeApproval judgeApproval = mock(JudgeApproval.class); + + Approvable matchingApprovable = mock(Approvable.class); + when(matchingApprovable.match(targetDoc)).thenReturn(true); + + Approvable nonMatchingApprovable = mock(Approvable.class); + when(nonMatchingApprovable.match(targetDoc)).thenReturn(false); + + return Stream.of( + Arguments.of(List.of(matchingApprovable), targetDoc, judgeApproval, 1), + Arguments.of(List.of(nonMatchingApprovable), targetDoc, judgeApproval, 0), + Arguments.of(List.of(matchingApprovable, nonMatchingApprovable), targetDoc, judgeApproval, 1), + Arguments.of(null, targetDoc, judgeApproval, 0), + Arguments.of(List.of(), targetDoc, judgeApproval, 0) + ); + } @ParameterizedTest @CsvSource({ From 9d804ee30a2702a374a4f04837e2eb7f53dbd615 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 18:36:15 +0000 Subject: [PATCH 099/336] more test case. --- .../judgeapproval/ApproveOrderService.java | 4 +- .../ApproveOrderServiceTest.java | 51 ++++++++++++++++--- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 5b87bb82d2..734be2fec9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -38,7 +38,7 @@ @RequiredArgsConstructor public class ApproveOrderService { - private static final String SEPARATOR = "#"; + protected static final String SEPARATOR = "#"; private final IdamService idamService; @@ -130,7 +130,7 @@ protected void handleApprovable(Approvable approvable, JudgeApproval judgeApprov } @SneakyThrows - private void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { + protected void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { String[] splitResult = ofNullable(anotherHearingRequest) .map(AnotherHearingRequest::getWhichOrder) .map(DynamicList::getValueCode) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 43501f724d..f6ee3dea63 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -7,8 +7,10 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -22,6 +24,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -30,6 +34,7 @@ import java.util.List; import java.util.stream.Stream; +import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -37,6 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; @@ -51,10 +57,14 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService.SEPARATOR; @ExtendWith(MockitoExtension.class) class ApproveOrderServiceTest { + private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); + + @Spy @InjectMocks private ApproveOrderService underTest; @@ -68,14 +78,12 @@ void testProcessApprovableCollection(List approvables, JudgeApproval judgeApproval, int expectedHandledCount) { // Mock the method to count calls to handleApprovable - ApproveOrderService spyService = spy(underTest); - lenient().doNothing().when(spyService).handleApprovable(any(), any(), any()); + lenient().doNothing().when(underTest).handleApprovable(any(), any(), any()); - spyService.processApprovableCollection(approvables, targetDoc, judgeApproval, AUTH_TOKEN); + underTest.processApprovableCollection(approvables, targetDoc, judgeApproval, AUTH_TOKEN); // Verify the number of handleApprovable invocations - verify(spyService, times(expectedHandledCount)) - .handleApprovable(any(Approvable.class), eq(judgeApproval), eq(AUTH_TOKEN)); + verify(underTest, times(expectedHandledCount)).handleApprovable(any(Approvable.class), eq(judgeApproval), eq(AUTH_TOKEN)); } private static Stream provideApprovableCollections() { @@ -250,7 +258,7 @@ void testValidateJudgeApprovalDocument(JudgeApproval judgeApproval, int index, b () -> underTest.validateJudgeApprovalDocument(judgeApproval, index) ); assertEquals( - String.format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index), + format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index), exception.getMessage() ); } else { @@ -388,4 +396,35 @@ static Stream provideApprovableTestData() { Arguments.of(mock(DraftOrderDocumentReview.class), judgeApproves, false) ); } + + @ParameterizedTest + @MethodSource("provideProcessHearingInstructionData") + void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, + boolean invokeProcessHearingInstructionExpected) { + underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); + + // Verify the method call on processHearingInstruction + // Capture the arguments passed to processHearingInstruction + verify(underTest, times(invokeProcessHearingInstructionExpected ? 2 : 0)) + .processHearingInstruction( + anyList(), // Matcher for List type + eq(TARGET_DOC), // Matcher for CaseDocument + ArgumentMatchers.any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest + ); + } + + static Stream provideProcessHearingInstructionData() { + return Stream.of( + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) + .build(), + true + ) + ); + } } From 557b1ed07563f4555c6ea337299462af656e9180 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 18:37:57 +0000 Subject: [PATCH 100/336] revert --- .../reform/finrem/caseorchestration/OrchestrationConstants.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java index ea8a8c4972..fe7b164d7f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/OrchestrationConstants.java @@ -64,5 +64,4 @@ public class OrchestrationConstants { "If you are applying for variation order, please upload the order you are varying"; public static final String CONSENT_OTHER_DOC_LABEL_VALUE = "Upload other order documentation related to your application"; - } From e5004492cddd57db251edb871d03d3143ebc9b31 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 18:39:31 +0000 Subject: [PATCH 101/336] Revert blank lines change. --- .../ccd/draftorders/agreed/AgreedDraftOrderCollection.java | 1 - .../ccd/draftorders/review/DraftOrderDocReviewCollection.java | 1 - .../model/ccd/draftorders/review/PsaDocReviewCollection.java | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java index a8db2ea100..52db790f34 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java @@ -14,5 +14,4 @@ @NoArgsConstructor public class AgreedDraftOrderCollection implements HasCaseDocument { private AgreedDraftOrder value; - } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java index 1df98b5933..752e08b2e5 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java @@ -14,5 +14,4 @@ @NoArgsConstructor public class DraftOrderDocReviewCollection implements HasCaseDocument { private DraftOrderDocumentReview value; - } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index b05ac27959..46f4680b05 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -13,6 +13,5 @@ @AllArgsConstructor @NoArgsConstructor public class PsaDocReviewCollection implements HasCaseDocument { - private PsaDocumentReview value; - + private PsaDocumentReview value;0 } From 061e75cf14ef40e5e558060c4b49924a979f2d42 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 18:39:46 +0000 Subject: [PATCH 102/336] typo --- .../model/ccd/draftorders/review/PsaDocReviewCollection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index 46f4680b05..f2d4d5e440 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -13,5 +13,5 @@ @AllArgsConstructor @NoArgsConstructor public class PsaDocReviewCollection implements HasCaseDocument { - private PsaDocumentReview value;0 + private PsaDocumentReview value; } From 0ea85a25cc37e7c14c2bcd66b39e4cff93a9b7d6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 18:52:10 +0000 Subject: [PATCH 103/336] NPE fix and update test case. --- .../judgeapproval/ApproveOrderService.java | 33 +++++++++---------- .../ApproveOrderServiceTest.java | 10 ++++++ 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 734be2fec9..1de1397e02 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -141,24 +141,23 @@ protected void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, JudgeApproval judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) .invoke(draftOrdersWrapper); - CaseDocument targetDoc = judgeApproval.getDocument(); + ofNullable(judgeApproval) + .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> collection.forEach(el -> { + if (el.getValue() != null) { + ofNullable(el.getValue().getDraftOrderDocReviewCollection()) + .ifPresent(draftOrderDocReviewCollection -> + processHearingInstruction(draftOrderDocReviewCollection.stream() + .map(DraftOrderDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) + ); - ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> collection.forEach(el -> { - if (el.getValue() != null) { - ofNullable(el.getValue().getDraftOrderDocReviewCollection()) - .ifPresent(draftOrderDocReviewCollection -> - processHearingInstruction(draftOrderDocReviewCollection.stream().map(DraftOrderDocReviewCollection::getValue).toList(), - targetDoc, anotherHearingRequest) - ); - - ofNullable(el.getValue().getPsaDocReviewCollection()) - .ifPresent(psaDocReviewCollection -> - processHearingInstruction(psaDocReviewCollection.stream().map(PsaDocReviewCollection::getValue).toList(), - targetDoc, anotherHearingRequest) - ); - } - })); + ofNullable(el.getValue().getPsaDocReviewCollection()) + .ifPresent(psaDocReviewCollection -> + processHearingInstruction(psaDocReviewCollection.stream() + .map(PsaDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) + ); + } + }))); } protected void processHearingInstruction(List hip, diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index f6ee3dea63..dc610cb120 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -424,6 +424,16 @@ static Stream provideProcessHearingInstructionData() { .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) .build(), true + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) + .build(), + false ) ); } From ffcc535de5991de47ed8afb2e9adacf498f3d808 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 18:52:53 +0000 Subject: [PATCH 104/336] tidy up --- .../service/judgeapproval/ApproveOrderServiceTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index dc610cb120..a6bab310fa 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; @@ -409,7 +408,7 @@ void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, Anoth .processHearingInstruction( anyList(), // Matcher for List type eq(TARGET_DOC), // Matcher for CaseDocument - ArgumentMatchers.any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest + any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest ); } From 5ec76a6708278d3ab312bec34c45fd81688fcf0d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 19:04:18 +0000 Subject: [PATCH 105/336] Test case to cover throwing exception --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 46 ++++++++++++++----- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 1de1397e02..f627161098 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -135,7 +135,7 @@ protected void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, .map(AnotherHearingRequest::getWhichOrder) .map(DynamicList::getValueCode) .map(valueCode -> valueCode.split(SEPARATOR)) - .orElseThrow(() -> new IllegalStateException("Required value is missing: " + anotherHearingRequest)); + .orElseThrow(() -> new IllegalStateException("Missing selected value in AnotherHearingRequest.whichOrder")); String orderIndex = splitResult[1]; diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index a6bab310fa..155e38b5cc 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -399,17 +399,22 @@ static Stream provideApprovableTestData() { @ParameterizedTest @MethodSource("provideProcessHearingInstructionData") void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, - boolean invokeProcessHearingInstructionExpected) { - underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); - - // Verify the method call on processHearingInstruction - // Capture the arguments passed to processHearingInstruction - verify(underTest, times(invokeProcessHearingInstructionExpected ? 2 : 0)) - .processHearingInstruction( - anyList(), // Matcher for List type - eq(TARGET_DOC), // Matcher for CaseDocument - any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest + boolean invokeProcessHearingInstructionExpected, boolean illegalStateExceptionExpected) { + if (!illegalStateExceptionExpected) { + underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); + verify(underTest, times(invokeProcessHearingInstructionExpected ? 2 : 0)) + .processHearingInstruction( + anyList(), // Matcher for List type + eq(TARGET_DOC), // Matcher for CaseDocument + any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest + ); + } else { + IllegalStateException exception = assertThrows( + IllegalStateException.class, + () -> underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest) ); + assertEquals("Missing selected value in AnotherHearingRequest.whichOrder", exception.getMessage()); + } } static Stream provideProcessHearingInstructionData() { @@ -422,7 +427,7 @@ static Stream provideProcessHearingInstructionData() { AnotherHearingRequest.builder() .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) .build(), - true + true, false ), Arguments.of( DraftOrdersWrapper.builder() @@ -432,7 +437,24 @@ static Stream provideProcessHearingInstructionData() { AnotherHearingRequest.builder() .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) .build(), - false + false, false + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) + .build(), + false, false + ), + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().build()).build()) + .build(), + false, true ) ); } From 5a6360c451605e308b8df19a90e5848ec7488322 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 23:52:03 +0000 Subject: [PATCH 106/336] update test case --- .../judgeapproval/ApproveOrderService.java | 19 +++++-- .../ApproveOrderServiceTest.java | 55 ++++++++++++++++--- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index f627161098..712e1f1451 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -1,7 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; @@ -25,6 +24,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; import static java.lang.String.format; import static java.util.Optional.ofNullable; @@ -129,18 +129,29 @@ protected void handleApprovable(Approvable approvable, JudgeApproval judgeApprov approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } - @SneakyThrows protected void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { String[] splitResult = ofNullable(anotherHearingRequest) .map(AnotherHearingRequest::getWhichOrder) .map(DynamicList::getValueCode) .map(valueCode -> valueCode.split(SEPARATOR)) .orElseThrow(() -> new IllegalStateException("Missing selected value in AnotherHearingRequest.whichOrder")); + if (splitResult.length != 2) { + String valueCode = Optional.of(anotherHearingRequest) + .map(AnotherHearingRequest::getWhichOrder) + .map(DynamicList::getValueCode) + .orElse(null); + throw new IllegalStateException(format("Unexpected selected value in AnotherHearingRequest.whichOrder: %s", valueCode)); + } String orderIndex = splitResult[1]; - JudgeApproval judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) - .invoke(draftOrdersWrapper); + JudgeApproval judgeApproval = null; + try { + judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) + .invoke(draftOrdersWrapper); + } catch (Exception e) { + throw new IllegalStateException(format("Unexpected method \"getJudgeApproval%s\" was invoked", orderIndex), e); + } ofNullable(judgeApproval) .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) .ifPresent(collection -> collection.forEach(el -> { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 155e38b5cc..458831fc4b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -399,10 +399,10 @@ static Stream provideApprovableTestData() { @ParameterizedTest @MethodSource("provideProcessHearingInstructionData") void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, - boolean invokeProcessHearingInstructionExpected, boolean illegalStateExceptionExpected) { - if (!illegalStateExceptionExpected) { + boolean processHearingInstructionInvokedExpected, String expectedIllegalStateExceptionMessage) { + if (expectedIllegalStateExceptionMessage == null) { underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); - verify(underTest, times(invokeProcessHearingInstructionExpected ? 2 : 0)) + verify(underTest, times(processHearingInstructionInvokedExpected ? 2 : 0)) .processHearingInstruction( anyList(), // Matcher for List type eq(TARGET_DOC), // Matcher for CaseDocument @@ -413,12 +413,13 @@ void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, Anoth IllegalStateException.class, () -> underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest) ); - assertEquals("Missing selected value in AnotherHearingRequest.whichOrder", exception.getMessage()); + assertEquals(expectedIllegalStateExceptionMessage, exception.getMessage()); } } static Stream provideProcessHearingInstructionData() { return Stream.of( + // happy path 1 Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) @@ -427,8 +428,20 @@ static Stream provideProcessHearingInstructionData() { AnotherHearingRequest.builder() .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) .build(), - true, false + true, null ), + // happy path 2 + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) + .build(), + true, null + ), + // missing corresponding judgeApproval when a draft order in whichOrder selected Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) @@ -437,8 +450,9 @@ static Stream provideProcessHearingInstructionData() { AnotherHearingRequest.builder() .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) .build(), - false, false + false, null ), + // missing corresponding judgeApproval when a PSA in whichOrder selected Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) @@ -447,14 +461,39 @@ static Stream provideProcessHearingInstructionData() { AnotherHearingRequest.builder() .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) .build(), - false, false + false, null ), + // missing draftOrdersReviewCollection in DraftOrdersWrapper + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) + .build(), + false, null + ), + // missing whichOrder Arguments.of( DraftOrdersWrapper.builder().build(), AnotherHearingRequest.builder() .whichOrder(DynamicList.builder().value(DynamicListElement.builder().build()).build()) .build(), - false, true + false, "Missing selected value in AnotherHearingRequest.whichOrder" + ), + // unexpected code value + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code("XXX").build()).build()) + .build(), + false, "Unexpected selected value in AnotherHearingRequest.whichOrder: XXX" + ), + // unexpected code value 2 + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s6", SEPARATOR)).build()).build()) + .build(), + false, "Unexpected method \"getJudgeApproval6\" was invoked" ) ); } From 488d3344329ca6a35b0edccf62b20bbe39a3fdf6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 28 Nov 2024 23:54:22 +0000 Subject: [PATCH 107/336] use SEPARATOR --- .../service/judgeapproval/ApproveOrderServiceTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 458831fc4b..37214640fe 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -106,8 +106,8 @@ private static Stream provideApprovableCollections() { @ParameterizedTest @CsvSource({ - "1, READY_TO_BE_SEALED, DRAFT_ORDER#1, DraftDocument1.pdf", - "2, JUDGE_NEEDS_TO_MAKE_CHANGES, DRAFT_ORDER#2, AmendedDraftDocument2.pdf", + "1, READY_TO_BE_SEALED, DRAFT_ORDER" + SEPARATOR + "1, DraftDocument1.pdf", + "2, JUDGE_NEEDS_TO_MAKE_CHANGES, DRAFT_ORDER" + SEPARATOR + "2, AmendedDraftDocument2.pdf", "3, REVIEW_LATER, , " }) void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decision, String expectedCode, String expectedLabel) { @@ -150,10 +150,10 @@ void testBuildWhichOrderDynamicListMultipleItems() { List listItems = dynamicList.getListItems(); // Additional checks to validate correct elements - assertEquals("DRAFT_ORDER#" + 1, listItems.get(0).getCode()); + assertEquals("DRAFT_ORDER" + SEPARATOR + 1, listItems.get(0).getCode()); assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); - assertEquals("PSA#" + 3, listItems.get(1).getCode()); + assertEquals("PSA" + SEPARATOR + 3, listItems.get(1).getCode()); assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); } From e33c9d9480468b6169cabfb845d3ac9bd54c786d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 00:01:46 +0000 Subject: [PATCH 108/336] increase coverage --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 712e1f1451..fc7668921b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -228,7 +228,7 @@ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrap return DynamicList.builder().listItems(listItems).build(); } - private static String getDocumentFileName(JudgeApproval judgeApproval) { + protected static String getDocumentFileName(JudgeApproval judgeApproval) { String filename = null; if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { filename = judgeApproval.getAmendedDocument() != null diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 37214640fe..16a5fec09f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -497,4 +497,44 @@ static Stream provideProcessHearingInstructionData() { ) ); } + + @ParameterizedTest + @MethodSource("provideGetDocumentFileNameData") + void testGetDocumentFileName(JudgeApproval judgeApproval, String expectedFilename) { + String actualFilename = ApproveOrderService.getDocumentFileName(judgeApproval); + assertEquals(expectedFilename, actualFilename); + } + + private static Stream provideGetDocumentFileNameData() { + CaseDocument amendedDocument = CaseDocument.builder().documentFilename("AmendedDoc.pdf").build(); + CaseDocument originalDocument = CaseDocument.builder().documentFilename("OriginalDoc.pdf").build(); + + return Stream.of( + // Scenario 1: Judge needs to make changes, and amended document exists + Arguments.of( + JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).amendedDocument(amendedDocument).build(), + "AmendedDoc.pdf" + ), + // Scenario 2: Judge needs to make changes, but no amended document + Arguments.of( + JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), + "Unknown Filename" + ), + // Scenario 3: Ready to be sealed, and original document exists + Arguments.of( + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).document(originalDocument).build(), + "OriginalDoc.pdf" + ), + // Scenario 4: Ready to be sealed, but no original document + Arguments.of( + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + "Unknown Filename" + ), + // Scenario 5: No judge decision provided + Arguments.of( + JudgeApproval.builder().build(), + null + ) + ); + } } From 6889ef7cf740085b4acb8840be572fda01f48e0b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 00:14:54 +0000 Subject: [PATCH 109/336] update test case --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index fc7668921b..aa682923e8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -67,7 +67,7 @@ public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String } } - private void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + protected void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) .ifPresent(collection -> collection.forEach(el -> { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 16a5fec09f..80a0920500 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -54,7 +54,9 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService.SEPARATOR; @@ -244,6 +246,8 @@ private static Stream provideJudgeApprovalTestCases() { return Stream.of( Arguments.of(READY_TO_BE_SEALED, true), Arguments.of(JUDGE_NEEDS_TO_MAKE_CHANGES, true), + Arguments.of(LEGAL_REP_NEEDS_TO_MAKE_CHANGE, false), + Arguments.of(REVIEW_LATER, false), Arguments.of(null, false) ); } @@ -537,4 +541,61 @@ private static Stream provideGetDocumentFileNameData() { ) ); } + + @ParameterizedTest + @MethodSource("providePopulateJudgeDecisionsData") + void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, + int expectedPopulateJudgeDecisionInvoked) { + // Act + underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); + + // Verify if `populateJudgeDecision` is invoked the expected number of times + verify(underTest, times(expectedPopulateJudgeDecisionInvoked)) + .populateJudgeDecision( + eq(draftOrdersWrapper), // Matcher for DraftOrdersWrapper + any(CaseDocument.class), // Matcher for CaseDocument + any(JudgeApproval.class), // Matcher for JudgeApproval + eq(AUTH_TOKEN) // Matcher for String userAuthorisation + ); + + } + + static Stream providePopulateJudgeDecisionsData() { + return Stream.of( + // Happy path: judge approval exists for all iterations + Arguments.of( + DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval3(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .build(), + 5 + ), + // Partial approval: only some approvals exist + Arguments.of( + DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) + .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .build(), + 2 + ), + // No approvals: no judge approvals exist + Arguments.of( + DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) + .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) + .build(), + 0 // Expected number of calls to populateJudgeDecision + ), + // No approvals: no judge approvals exist + Arguments.of( + DraftOrdersWrapper.builder().build(), + 0 // Expected number of calls to populateJudgeDecision + ) + ); + } + } From 45e46383d57f0c6cce8bb07948f6a1574727a678 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 00:33:52 +0000 Subject: [PATCH 110/336] increase test coverage --- .../judgeapproval/ApproveOrderService.java | 2 +- .../ApproveOrderServiceTest.java | 55 +++++++++++++++---- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index aa682923e8..61e292f95a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -68,7 +68,7 @@ public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String } protected void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { + String userAuthorisation) { ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) .ifPresent(collection -> collection.forEach(el -> { if (el.getValue() != null) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 80a0920500..44edfd6ec0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -20,6 +20,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; @@ -546,18 +548,10 @@ private static Stream provideGetDocumentFileNameData() { @MethodSource("providePopulateJudgeDecisionsData") void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expectedPopulateJudgeDecisionInvoked) { - // Act underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); - // Verify if `populateJudgeDecision` is invoked the expected number of times - verify(underTest, times(expectedPopulateJudgeDecisionInvoked)) - .populateJudgeDecision( - eq(draftOrdersWrapper), // Matcher for DraftOrdersWrapper - any(CaseDocument.class), // Matcher for CaseDocument - any(JudgeApproval.class), // Matcher for JudgeApproval - eq(AUTH_TOKEN) // Matcher for String userAuthorisation - ); - + verify(underTest, times(expectedPopulateJudgeDecisionInvoked)).populateJudgeDecision(eq(draftOrdersWrapper), any(CaseDocument.class), + any(JudgeApproval.class), eq(AUTH_TOKEN)); } static Stream providePopulateJudgeDecisionsData() { @@ -598,4 +592,45 @@ static Stream providePopulateJudgeDecisionsData() { ); } + @ParameterizedTest + @MethodSource("providePopulateJudgeDecisionData") + void testPopulateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + int expectHearingInvocationCount) { + lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + + underTest.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); + + verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + } + + static Stream providePopulateJudgeDecisionData() { + CaseDocument targetDoc = CaseDocument.builder().build(); + return Stream.of( + Arguments.of( + DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder() + .anotherHearingRequestCollection(List.of( + AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() + )) + .build()) + .build(), + targetDoc, + JudgeApproval.builder().build(), + 1 + ), + Arguments.of( + DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder() + .anotherHearingRequestCollection(List.of( + AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build(), + AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() + )) + .build()) + .build(), + targetDoc, + JudgeApproval.builder().build(), + 2 + ) + ); + } } From 44cd277ac749aa913f56a436adf3751fee8551cc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 00:38:23 +0000 Subject: [PATCH 111/336] Renaming --- .../judgeapproval/ApproveOrderServiceTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 44edfd6ec0..ec82b96307 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -593,8 +593,8 @@ static Stream providePopulateJudgeDecisionsData() { } @ParameterizedTest - @MethodSource("providePopulateJudgeDecisionData") - void testPopulateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + @MethodSource("provideShouldInvokeProcessHearingInstructionData") + void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, int expectHearingInvocationCount) { lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); @@ -603,9 +603,17 @@ void testPopulateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocume verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); } - static Stream providePopulateJudgeDecisionData() { + static Stream provideShouldInvokeProcessHearingInstructionData() { CaseDocument targetDoc = CaseDocument.builder().build(); return Stream.of( + Arguments.of( + DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder().build()) + .build(), + targetDoc, + JudgeApproval.builder().build(), + 0 + ), Arguments.of( DraftOrdersWrapper.builder() .hearingInstruction(HearingInstruction.builder() From 8c879e7e2642a022eb589386dabc325a3148a334 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 10:59:44 +0000 Subject: [PATCH 112/336] Bug fix --- .../judgeapproval/ApproveOrderService.java | 14 ++--- .../ApproveOrderServiceTest.java | 63 +++++++++++++++---- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 61e292f95a..41c22b8599 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -74,23 +74,23 @@ protected void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, Case if (el.getValue() != null) { ofNullable(el.getValue().getDraftOrderDocReviewCollection()) .ifPresent(draftOrderDocReviewCollection -> - processApprovableCollection(draftOrderDocReviewCollection.stream().map(DraftOrderDocReviewCollection::getValue) - .toList(), targetDoc, judgeApproval, userAuthorisation) + draftOrderDocReviewCollection.forEach(draftOrderDocReview -> processApprovableCollection( + List.of(draftOrderDocReview.getValue()), targetDoc, judgeApproval, userAuthorisation)) ); ofNullable(el.getValue().getPsaDocReviewCollection()) .ifPresent(psaDocReviewCollection -> - processApprovableCollection(psaDocReviewCollection.stream().map(PsaDocReviewCollection::getValue) - .toList(), targetDoc, judgeApproval, userAuthorisation) + psaDocReviewCollection.forEach(psaDocReview -> processApprovableCollection(List.of(psaDocReview.getValue()), targetDoc, + judgeApproval, userAuthorisation)) ); + } })); ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) .ifPresent(agreedDraftOrderCollections -> - processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue) - .toList(), targetDoc, judgeApproval, userAuthorisation) - ); + processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue).toList(), targetDoc, + judgeApproval, userAuthorisation)); ofNullable(draftOrdersWrapper.getHearingInstruction()) .map(HearingInstruction::getAnotherHearingRequestCollection) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index ec82b96307..76f1ea2ee9 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -1,6 +1,5 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -19,6 +18,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; @@ -42,9 +43,11 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -124,7 +127,7 @@ void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decisi // Assert if (expectedCode == null) { - Assertions.assertTrue(dynamicList.getListItems().isEmpty()); + assertTrue(dynamicList.getListItems().isEmpty()); } else { assertEquals(1, dynamicList.getListItems().size()); DynamicListElement element = dynamicList.getListItems().get(0); @@ -594,24 +597,21 @@ static Stream providePopulateJudgeDecisionsData() { @ParameterizedTest @MethodSource("provideShouldInvokeProcessHearingInstructionData") - void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { - lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); - underTest.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); + underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().build(), AUTH_TOKEN); - verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); } static Stream provideShouldInvokeProcessHearingInstructionData() { - CaseDocument targetDoc = CaseDocument.builder().build(); return Stream.of( Arguments.of( DraftOrdersWrapper.builder() .hearingInstruction(HearingInstruction.builder().build()) .build(), - targetDoc, - JudgeApproval.builder().build(), 0 ), Arguments.of( @@ -622,8 +622,6 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { )) .build()) .build(), - targetDoc, - JudgeApproval.builder().build(), 1 ), Arguments.of( @@ -635,10 +633,49 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { )) .build()) .build(), - targetDoc, - JudgeApproval.builder().build(), 2 ) ); } + + @ParameterizedTest + @MethodSource("provideShouldInvokeProcessApprovableCollectionData") + void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, + List agreedDraftOrders) { + CaseDocument targetDoc = CaseDocument.builder().build(); + JudgeApproval judgeApproval = mock(JudgeApproval.class); + + lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + lenient().doNothing().when(underTest).processApprovableCollection(any(), eq(targetDoc), eq(judgeApproval), eq(AUTH_TOKEN) ); + + underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), judgeApproval, AUTH_TOKEN); + + verify(underTest, times(agreedDraftOrders.isEmpty() ? 0 : 1)) + .processApprovableCollection(agreedDraftOrders, targetDoc, judgeApproval, AUTH_TOKEN); + } + + static Stream provideShouldInvokeProcessApprovableCollectionData() { + List agreedDraftOrders0 = List.of(AgreedDraftOrder.builder().build()); + List agreedDraftOrders1 = List.of(AgreedDraftOrder.builder().build(), AgreedDraftOrder.builder().build()); + return Stream.of( + Arguments.of( + DraftOrdersWrapper.builder() + .agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDraftOrders0.get(0)).build() + )) + .build(), + agreedDraftOrders0 + ), + Arguments.of( + DraftOrdersWrapper.builder() + .agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), + AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() + )) + .build(), + agreedDraftOrders1 + ), + Arguments.of(DraftOrdersWrapper.builder() .build(), List.of()) + ); + } } From 720835e4102970afa0c69b34d7026e70aa3ca892 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 11:45:08 +0000 Subject: [PATCH 113/336] checkstyle --- .../service/judgeapproval/ApproveOrderServiceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 76f1ea2ee9..d2456d5ddc 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -646,7 +646,7 @@ void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapp JudgeApproval judgeApproval = mock(JudgeApproval.class); lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); - lenient().doNothing().when(underTest).processApprovableCollection(any(), eq(targetDoc), eq(judgeApproval), eq(AUTH_TOKEN) ); + lenient().doNothing().when(underTest).processApprovableCollection(any(), eq(targetDoc), eq(judgeApproval), eq(AUTH_TOKEN)); underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), judgeApproval, AUTH_TOKEN); @@ -675,7 +675,7 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { .build(), agreedDraftOrders1 ), - Arguments.of(DraftOrdersWrapper.builder() .build(), List.of()) + Arguments.of(DraftOrdersWrapper.builder().build(), List.of()) ); } } From 072d95e0c2c8b430274b2c05becea5702584d81a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 11:58:17 +0000 Subject: [PATCH 114/336] Fix test case. --- .../service/judgeapproval/ApproveOrderServiceTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index d2456d5ddc..4c86bb308d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -47,7 +47,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -599,7 +598,7 @@ static Stream providePopulateJudgeDecisionsData() { @MethodSource("provideShouldInvokeProcessHearingInstructionData") void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { - doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().build(), AUTH_TOKEN); From 8b500767f38234fd4fc4a22fc4fc2999f6b15d29 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 14:43:27 +0000 Subject: [PATCH 115/336] Update test case --- .../judgeapproval/ApproveOrderService.java | 10 ++-- .../ApproveOrderServiceTest.java | 52 +++++++++++++++---- 2 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 41c22b8599..5cfa3cceb5 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -74,15 +74,13 @@ protected void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, Case if (el.getValue() != null) { ofNullable(el.getValue().getDraftOrderDocReviewCollection()) .ifPresent(draftOrderDocReviewCollection -> - draftOrderDocReviewCollection.forEach(draftOrderDocReview -> processApprovableCollection( - List.of(draftOrderDocReview.getValue()), targetDoc, judgeApproval, userAuthorisation)) - ); + processApprovableCollection(draftOrderDocReviewCollection.stream().map(DraftOrderDocReviewCollection::getValue).toList(), + targetDoc, judgeApproval, userAuthorisation)); ofNullable(el.getValue().getPsaDocReviewCollection()) .ifPresent(psaDocReviewCollection -> - psaDocReviewCollection.forEach(psaDocReview -> processApprovableCollection(List.of(psaDocReview.getValue()), targetDoc, - judgeApproval, userAuthorisation)) - ); + processApprovableCollection(psaDocReviewCollection.stream().map(PsaDocReviewCollection::getValue).toList(), targetDoc, + judgeApproval, userAuthorisation)); } })); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 4c86bb308d..f1a9b7cf4b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -25,6 +25,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; @@ -548,8 +549,7 @@ private static Stream provideGetDocumentFileNameData() { @ParameterizedTest @MethodSource("providePopulateJudgeDecisionsData") - void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, - int expectedPopulateJudgeDecisionInvoked) { + void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expectedPopulateJudgeDecisionInvoked) { underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); verify(underTest, times(expectedPopulateJudgeDecisionInvoked)).populateJudgeDecision(eq(draftOrdersWrapper), any(CaseDocument.class), @@ -596,8 +596,7 @@ static Stream providePopulateJudgeDecisionsData() { @ParameterizedTest @MethodSource("provideShouldInvokeProcessHearingInstructionData") - void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, - int expectHearingInvocationCount) { + void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().build(), AUTH_TOKEN); @@ -640,7 +639,8 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { @ParameterizedTest @MethodSource("provideShouldInvokeProcessApprovableCollectionData") void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, - List agreedDraftOrders) { + List agreedDraftOrders, + List draftOrderDocumentReviews) { CaseDocument targetDoc = CaseDocument.builder().build(); JudgeApproval judgeApproval = mock(JudgeApproval.class); @@ -649,21 +649,55 @@ void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapp underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), judgeApproval, AUTH_TOKEN); - verify(underTest, times(agreedDraftOrders.isEmpty() ? 0 : 1)) + verify(underTest, times(agreedDraftOrders == null ? 0 : 1)) .processApprovableCollection(agreedDraftOrders, targetDoc, judgeApproval, AUTH_TOKEN); + verify(underTest, times(draftOrderDocumentReviews == null ? 0 : 1)) + .processApprovableCollection(draftOrderDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); } static Stream provideShouldInvokeProcessApprovableCollectionData() { List agreedDraftOrders0 = List.of(AgreedDraftOrder.builder().build()); List agreedDraftOrders1 = List.of(AgreedDraftOrder.builder().build(), AgreedDraftOrder.builder().build()); + List draftOrderDocumentReviews0 = List.of(DraftOrderDocumentReview.builder().build()); + List draftOrderDocumentReviews1 = List.of(DraftOrderDocumentReview.builder().build(), + DraftOrderDocumentReview.builder().build()); return Stream.of( + // Only DraftOrdersReview + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews0.get(0)).build() + )) + .build()).build() + )) + .build(), + null, + draftOrderDocumentReviews0 + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build(), + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() + )) + .build()).build() + )) + .build(), + null, + draftOrderDocumentReviews1 + ), + // Only AgreedDraftOrder Arguments.of( DraftOrdersWrapper.builder() .agreedDraftOrderCollection(List.of( AgreedDraftOrderCollection.builder().value(agreedDraftOrders0.get(0)).build() )) .build(), - agreedDraftOrders0 + agreedDraftOrders0, null ), Arguments.of( DraftOrdersWrapper.builder() @@ -672,9 +706,9 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() )) .build(), - agreedDraftOrders1 + agreedDraftOrders1, null ), - Arguments.of(DraftOrdersWrapper.builder().build(), List.of()) + Arguments.of(DraftOrdersWrapper.builder().build(), null, null) ); } } From 3d578c78ac1956e316a87da4d17923d81ea06bcf Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 15:16:30 +0000 Subject: [PATCH 116/336] tidy up --- .../judgeapproval/ApproveOrderService.java | 20 +-- .../ApproveOrderServiceTest.java | 120 ++++++++++++++++-- 2 files changed, 119 insertions(+), 21 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 5cfa3cceb5..27ad1a5dc2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -70,20 +70,14 @@ public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String protected void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> collection.forEach(el -> { - if (el.getValue() != null) { - ofNullable(el.getValue().getDraftOrderDocReviewCollection()) - .ifPresent(draftOrderDocReviewCollection -> - processApprovableCollection(draftOrderDocReviewCollection.stream().map(DraftOrderDocReviewCollection::getValue).toList(), - targetDoc, judgeApproval, userAuthorisation)); + .ifPresent(collection -> processApprovableCollection(collection.stream() + .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) + .toList(), targetDoc, judgeApproval, userAuthorisation)); - ofNullable(el.getValue().getPsaDocReviewCollection()) - .ifPresent(psaDocReviewCollection -> - processApprovableCollection(psaDocReviewCollection.stream().map(PsaDocReviewCollection::getValue).toList(), targetDoc, - judgeApproval, userAuthorisation)); - - } - })); + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> processApprovableCollection(collection.stream() + .flatMap(c -> c.getValue().getPsaDocReviewCollection().stream().map(PsaDocReviewCollection::getValue)) + .toList(), targetDoc, judgeApproval, userAuthorisation)); ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) .ifPresent(agreedDraftOrderCollections -> diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index f1a9b7cf4b..8dc5063e38 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -29,6 +29,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -640,7 +641,8 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { @MethodSource("provideShouldInvokeProcessApprovableCollectionData") void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, List agreedDraftOrders, - List draftOrderDocumentReviews) { + List draftOrderDocumentReviews, + List psaDocumentReviews) { CaseDocument targetDoc = CaseDocument.builder().build(); JudgeApproval judgeApproval = mock(JudgeApproval.class); @@ -653,6 +655,8 @@ void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapp .processApprovableCollection(agreedDraftOrders, targetDoc, judgeApproval, AUTH_TOKEN); verify(underTest, times(draftOrderDocumentReviews == null ? 0 : 1)) .processApprovableCollection(draftOrderDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); + verify(underTest, times(psaDocumentReviews == null ? 0 : 1)) + .processApprovableCollection(psaDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); } static Stream provideShouldInvokeProcessApprovableCollectionData() { @@ -661,7 +665,53 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { List draftOrderDocumentReviews0 = List.of(DraftOrderDocumentReview.builder().build()); List draftOrderDocumentReviews1 = List.of(DraftOrderDocumentReview.builder().build(), DraftOrderDocumentReview.builder().build()); + List psaDocumentReviews0 = List.of(PsaDocumentReview.builder().build()); + List psaDocumentReviews1 = List.of(PsaDocumentReview.builder().build(), PsaDocumentReview.builder().build()); + return Stream.of( + // Only PsaDocumentReview + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() + )) + .build()).build() + )) + .build(), + null, null, psaDocumentReviews0 + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build(), + PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() + )) + .build()).build() + )) + .build(), + null, null, psaDocumentReviews1 + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build() + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() + )) + .build()).build() + )) + .build(), + null, null, psaDocumentReviews1 + ), // Only DraftOrdersReview Arguments.of( DraftOrdersWrapper.builder() @@ -673,8 +723,7 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { .build()).build() )) .build(), - null, - draftOrderDocumentReviews0 + null, draftOrderDocumentReviews0, null ), Arguments.of( DraftOrdersWrapper.builder() @@ -687,8 +736,24 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { .build()).build() )) .build(), - null, - draftOrderDocumentReviews1 + null, draftOrderDocumentReviews1, null + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() + )) + .build()).build() + )) + .build(), + null, draftOrderDocumentReviews1, null ), // Only AgreedDraftOrder Arguments.of( @@ -697,7 +762,7 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { AgreedDraftOrderCollection.builder().value(agreedDraftOrders0.get(0)).build() )) .build(), - agreedDraftOrders0, null + agreedDraftOrders0, null, null ), Arguments.of( DraftOrdersWrapper.builder() @@ -706,9 +771,48 @@ static Stream provideShouldInvokeProcessApprovableCollectionData() { AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() )) .build(), - agreedDraftOrders1, null + agreedDraftOrders1, null, null + ), + // Mixed Cases + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() + )) + .build()).build() + )) + .agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), + AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() + )) + .build(), + agreedDraftOrders1, draftOrderDocumentReviews1, null + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() + )) + .build()).build() + )) + .agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), + AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() + )) + .build(), + agreedDraftOrders1, null, psaDocumentReviews0 ), - Arguments.of(DraftOrdersWrapper.builder().build(), null, null) + // Empty case + Arguments.of(DraftOrdersWrapper.builder().build(), null, null, null) ); } } From ccbec3c237712d05ec370c8ccaa92c9f5c9d2efd Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 15:35:50 +0000 Subject: [PATCH 117/336] Remove static --- .../service/judgeapproval/ApproveOrderService.java | 2 +- .../service/judgeapproval/ApproveOrderServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 27ad1a5dc2..3bd699284d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -220,7 +220,7 @@ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrap return DynamicList.builder().listItems(listItems).build(); } - protected static String getDocumentFileName(JudgeApproval judgeApproval) { + protected String getDocumentFileName(JudgeApproval judgeApproval) { String filename = null; if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { filename = judgeApproval.getAmendedDocument() != null diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 8dc5063e38..077a6f4dd2 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -511,7 +511,7 @@ static Stream provideProcessHearingInstructionData() { @ParameterizedTest @MethodSource("provideGetDocumentFileNameData") void testGetDocumentFileName(JudgeApproval judgeApproval, String expectedFilename) { - String actualFilename = ApproveOrderService.getDocumentFileName(judgeApproval); + String actualFilename = underTest.getDocumentFileName(judgeApproval); assertEquals(expectedFilename, actualFilename); } From 8cd48028c624e4db95d0325aabfcc1639e0eaeea Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 16:02:41 +0000 Subject: [PATCH 118/336] Add field: changesRequestedByJudge --- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 63dea557be..841c472292 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -47,6 +47,10 @@ public class JudgeApproval { @JsonProperty("isFinalOrder") private YesOrNo isFinalOrder; + + @JsonProperty("changesRequestedByJudge") + private String changesRequestedByJudge; + @JsonIgnore private SortKey sortKey; From 5f9cd9e418f52c73daa6a51a45ff156c014c5906 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 29 Nov 2024 16:53:25 +0000 Subject: [PATCH 119/336] wording fix. --- ...ApproveDraftOrdersAboutToStartHandler.java | 2 + .../judgeapproval/JudgeApproval.java | 2 + .../judgeapproval/JudgeApprovalDocType.java | 10 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 96 ++++++++++--------- 4 files changed, 63 insertions(+), 47 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 3aef9d057b..1743ebc3a7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -128,6 +128,7 @@ private List getReviewableItems(List .map(a -> JudgeApproval.builder() .docType(DRAFT_ORDER) .title(DRAFT_ORDER.getTitle()) + .titleInJudgeDecisionMessage(DRAFT_ORDER.getDescription()) .hearingInfo(hearingInfo) .document(a.getDraftOrderDocument()) .attachments(a.getAttachments()) @@ -144,6 +145,7 @@ private List getReviewableItems(List .map(a -> JudgeApproval.builder() .docType(PSA) .title(PSA.getTitle()) + .titleInJudgeDecisionMessage(PSA.getDescription()) .hearingInfo(hearingInfo) .document(a.getPsaDocument()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 63dea557be..43fd2a0a22 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -28,6 +28,8 @@ public class JudgeApproval { private String title; + private String titleInJudgeDecisionMessage; + private String hearingInfo; private YesOrNo hasAttachment; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java index ee19eba18f..8e68469829 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApprovalDocType.java @@ -5,13 +5,17 @@ @Getter public enum JudgeApprovalDocType { - DRAFT_ORDER("Draft Order"), + DRAFT_ORDER("Draft Order", "draft order"), + + PSA("Pension Sharing Annex", "PSA"); - PSA("Pension Sharing Annex"); private final String title; - JudgeApprovalDocType(String title) { + private final String description; + + JudgeApprovalDocType(String title, String description) { this.title = title; + this.description = description; } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 386db150e0..1cfce0c0c6 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -22,6 +22,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -46,6 +47,8 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; @@ -164,6 +167,8 @@ void handle_withVariousDraftOrdersWrapperData( var actual = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (i + 1)).invoke(draftOrdersWrapper); var expected = expectedJudgeApproval.get(i).orElse(null); if (expected != null && actual != null) { + assertEquals(expected.getTitle(), actual.getTitle()); + assertEquals(expected.getTitleInJudgeDecisionMessage(), actual.getTitleInJudgeDecisionMessage()); assertEquals(expected.getDocument(), actual.getDocument()); assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); if (expected.getHasAttachment() == YES) { @@ -268,9 +273,12 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus or .build(); } - private static JudgeApproval buildJudgeApproval(String hearingInfo, CaseDocument document, + private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, + String hearingInfo, CaseDocument document, List attachments) { return JudgeApproval.builder().hearingInfo(hearingInfo) + .title(docType.getTitle()) + .titleInJudgeDecisionMessage(docType.getDescription()) .document(document) .attachments(attachments) .hasAttachment(YesOrNo.forValue(attachments != null && !attachments.isEmpty())) @@ -301,8 +309,8 @@ private static Arguments withOneDraftOrderAndOnePsa() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), null, null, null, NO); } @@ -321,8 +329,8 @@ private static Arguments withTwoDraftOrderAndZeroPsa() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), null, null, null, NO); } @@ -349,9 +357,9 @@ private static Arguments withDifferentHearingInfo() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), - buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), null, null, NO); } @@ -376,9 +384,9 @@ private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmitted .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), null, null, NO); } @@ -403,9 +411,9 @@ private static Arguments withSameHearingInfoAndDocumentShouldBeSortedBySubmitted .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), null, null, NO); } @@ -430,9 +438,9 @@ private static Arguments withSameHearingInfoAndDocumentShouldBeSortedByDocumentF .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), null, null, NO); } @@ -457,8 +465,8 @@ private static Arguments withProcessedDraftOrderAndPsa() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, null), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_2, null), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_2, List.of(DO_ATTACHMENT_2)), null, null, null, NO); } @@ -481,11 +489,11 @@ private static Arguments withSixPsas() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_5, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_2, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_3, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_4, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_5, null), YES); } @@ -507,11 +515,11 @@ private static Arguments withSixDraftOrders() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_1, List.of()), - buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_2, List.of()), - buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_3, List.of()), - buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_4, List.of()), - buildJudgeApproval("hearingServiceFormattedString2", DO_DOC_5, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_1, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_2, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_3, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_4, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_5, List.of()), // expectedWarningMessageToJudge YES); } @@ -534,11 +542,11 @@ private static Arguments withFiveReviewablePsas() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, null), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_5, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_2, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_3, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_4, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_5, null), NO); } @@ -566,11 +574,11 @@ private static Arguments withDraftOrdersAndPsaAndShouldOrderBySubmittedDate() { .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_2, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_4, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_1, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_2, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_4, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_3, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_4, List.of()), // expectedWarningMessageToJudge YES); } @@ -605,11 +613,11 @@ private static Arguments withDraftOrdersAndPsaAndShouldOrderByHearingAndThenSubm .build() )) .build(), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_3, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", PSA_DOC_4, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_1, List.of()), - buildJudgeApproval("hearingServiceFormattedString1", DO_DOC_2, List.of()), - buildJudgeApproval("hearingServiceFormattedString2", PSA_DOC_2, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_3, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_4, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of()), + buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_2, List.of()), + buildJudgeApproval(PSA, "hearingServiceFormattedString2", PSA_DOC_2, List.of()), // expectedWarningMessageToJudge YES); } From ee2ebc439cf8da8e91a9a6949c01badc32dcfa32 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 2 Dec 2024 18:12:34 +0000 Subject: [PATCH 120/336] Added refusedOrderCollection --- .../model/ccd/draftorders/review/DraftOrderDocumentReview.java | 1 + .../model/ccd/wrapper/DraftOrdersWrapper.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 63ce4e3dd0..8d9be60e4e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -38,6 +38,7 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap @JsonSerialize(using = LocalDateSerializer.class) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private LocalDate approvalDate; + private LocalDate refusedDate; private YesOrNo finalOrder; private YesOrNo anotherHearingToBeListed; private String hearingType; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index a0d03e2000..51f08b7dd0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -43,7 +43,8 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("draftOrdersReviewCollection") private List draftOrdersReviewCollection; - + @JsonProperty("refusedOrdersCollection") + private List refusedOrdersCollection; @JsonProperty("agreedDraftOrderCollection") private List agreedDraftOrderCollection; @JsonProperty("suggestedDraftOrderCollection") From 751c137885fc2da1757ff9a82e92768f7b36fc75 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:23:23 +0000 Subject: [PATCH 121/336] Separate methods into JudgeApprovalResolver and refactor code --- .../judgeapproval/ApproveOrderService.java | 135 ++-------------- .../judgeapproval/JudgeApprovalResolver.java | 147 ++++++++++++++++++ 2 files changed, 156 insertions(+), 126 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 3bd699284d..96281aa242 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -1,33 +1,18 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.time.LocalDate; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Optional; import static java.lang.String.format; -import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; @@ -35,12 +20,15 @@ @Service @Slf4j -@RequiredArgsConstructor public class ApproveOrderService { protected static final String SEPARATOR = "#"; - private final IdamService idamService; + private final JudgeApprovalResolver judgeApprovalResolver; + + public ApproveOrderService(JudgeApprovalResolver judgeApprovalResolver) { + this.judgeApprovalResolver = judgeApprovalResolver; + } /** * Populates judge decisions for draft orders by iterating through a predefined range of indexes (1 to 5), @@ -60,40 +48,12 @@ public class ApproveOrderService { public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { for (int i = 1; i <= 5; i++) { JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); - if (isJudgeApproved(judgeApproval)) { - CaseDocument targetDoc = validateJudgeApprovalDocument(judgeApproval, i); - populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); - } + CaseDocument targetDoc = validateJudgeApprovalDocument(judgeApproval, i); + judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); } } - protected void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { - ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> processApprovableCollection(collection.stream() - .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) - .toList(), targetDoc, judgeApproval, userAuthorisation)); - - ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> processApprovableCollection(collection.stream() - .flatMap(c -> c.getValue().getPsaDocReviewCollection().stream().map(PsaDocReviewCollection::getValue)) - .toList(), targetDoc, judgeApproval, userAuthorisation)); - - ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) - .ifPresent(agreedDraftOrderCollections -> - processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue).toList(), targetDoc, - judgeApproval, userAuthorisation)); - - ofNullable(draftOrdersWrapper.getHearingInstruction()) - .map(HearingInstruction::getAnotherHearingRequestCollection) - .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); - } - - protected boolean isJudgeApproved(JudgeApproval judgeApproval) { - return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); - } - - protected CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { + private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { CaseDocument doc = judgeApproval.getDocument(); if (doc == null) { throw new IllegalArgumentException(format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index)); @@ -101,83 +61,6 @@ protected CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval return doc; } - protected void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { - ofNullable(approvables) - .ifPresent(list -> - list.forEach(el -> ofNullable(el) - .filter(approvable -> approvable.match(targetDoc)) - .ifPresent(approvable -> handleApprovable(approvable, judgeApproval, userAuthorisation)) - ) - ); - } - - protected void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { - if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { - approvable.replaceDocument(judgeApproval.getAmendedDocument()); - } - approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - approvable.setApprovalDate(LocalDate.now()); - approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); - } - - protected void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { - String[] splitResult = ofNullable(anotherHearingRequest) - .map(AnotherHearingRequest::getWhichOrder) - .map(DynamicList::getValueCode) - .map(valueCode -> valueCode.split(SEPARATOR)) - .orElseThrow(() -> new IllegalStateException("Missing selected value in AnotherHearingRequest.whichOrder")); - if (splitResult.length != 2) { - String valueCode = Optional.of(anotherHearingRequest) - .map(AnotherHearingRequest::getWhichOrder) - .map(DynamicList::getValueCode) - .orElse(null); - throw new IllegalStateException(format("Unexpected selected value in AnotherHearingRequest.whichOrder: %s", valueCode)); - } - - String orderIndex = splitResult[1]; - - JudgeApproval judgeApproval = null; - try { - judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) - .invoke(draftOrdersWrapper); - } catch (Exception e) { - throw new IllegalStateException(format("Unexpected method \"getJudgeApproval%s\" was invoked", orderIndex), e); - } - ofNullable(judgeApproval) - .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> collection.forEach(el -> { - if (el.getValue() != null) { - ofNullable(el.getValue().getDraftOrderDocReviewCollection()) - .ifPresent(draftOrderDocReviewCollection -> - processHearingInstruction(draftOrderDocReviewCollection.stream() - .map(DraftOrderDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) - ); - - ofNullable(el.getValue().getPsaDocReviewCollection()) - .ifPresent(psaDocReviewCollection -> - processHearingInstruction(psaDocReviewCollection.stream() - .map(PsaDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) - ); - } - }))); - } - - protected void processHearingInstruction(List hip, - CaseDocument targetDoc, - AnotherHearingRequest anotherHearingRequest) { - ofNullable(hip) - .ifPresent(list -> list.forEach(el -> { - if (el.match(targetDoc)) { - el.setAnotherHearingToBeListed(YesOrNo.YES); - el.setHearingType(anotherHearingRequest.getTypeOfHearing().name()); - el.setAdditionalTime(anotherHearingRequest.getAdditionalTime()); - el.setHearingTimeEstimate(anotherHearingRequest.getTimeEstimate().getValue()); - el.setOtherListingInstructions(anotherHearingRequest.getAnyOtherListingInstructions()); - } - })); - } - /** * Builds a {@link DynamicList} representing the orders available for selection * based on the given {@link DraftOrdersWrapper}. Each order is represented as a @@ -220,7 +103,7 @@ public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrap return DynamicList.builder().listItems(listItems).build(); } - protected String getDocumentFileName(JudgeApproval judgeApproval) { + private String getDocumentFileName(JudgeApproval judgeApproval) { String filename = null; if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { filename = judgeApproval.getAmendedDocument() != null diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java new file mode 100644 index 0000000000..bd80b2cfd5 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -0,0 +1,147 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; + +import java.time.LocalDate; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import static java.lang.String.format; +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; + +@Component +class JudgeApprovalResolver { + + private static final String SEPARATOR = "#"; + + private final IdamService idamService; + + JudgeApprovalResolver(IdamService idamService) { + this.idamService = idamService; + } + + void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> processApprovableCollection(collection.stream() + .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) + .toList(), targetDoc, judgeApproval, userAuthorisation)); + + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> processApprovableCollection(collection.stream() + .flatMap(c -> c.getValue().getPsaDocReviewCollection().stream().map(PsaDocReviewCollection::getValue)) + .toList(), targetDoc, judgeApproval, userAuthorisation)); + + ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) + .ifPresent(agreedDraftOrderCollections -> + processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue).toList(), targetDoc, + judgeApproval, userAuthorisation)); + + if (isJudgeApproved(judgeApproval)) { + ofNullable(draftOrdersWrapper.getHearingInstruction()) + .map(HearingInstruction::getAnotherHearingRequestCollection) + .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); + } + } + + void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + ofNullable(approvables) + .ifPresent(list -> + list.forEach(el -> ofNullable(el) + .filter(approvable -> approvable.match(targetDoc)) + .ifPresent(approvable -> handleApprovable(approvable, judgeApproval, userAuthorisation)) + ) + ); + } + + void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { + if (isJudgeApproved(judgeApproval)) { + if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { + approvable.replaceDocument(judgeApproval.getAmendedDocument()); + } + approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + approvable.setApprovalDate(LocalDate.now()); + approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + } + } + + private boolean isJudgeApproved(JudgeApproval judgeApproval) { + return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); + } + + void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { + String[] splitResult = ofNullable(anotherHearingRequest) + .map(AnotherHearingRequest::getWhichOrder) + .map(DynamicList::getValueCode) + .map(valueCode -> valueCode.split(SEPARATOR)) + .orElseThrow(() -> new IllegalStateException("Missing selected value in AnotherHearingRequest.whichOrder")); + if (splitResult.length != 2) { + String valueCode = Optional.of(anotherHearingRequest) + .map(AnotherHearingRequest::getWhichOrder) + .map(DynamicList::getValueCode) + .orElse(null); + throw new IllegalStateException(format("Unexpected selected value in AnotherHearingRequest.whichOrder: %s", valueCode)); + } + + String orderIndex = splitResult[1]; + + JudgeApproval judgeApproval = null; + try { + judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) + .invoke(draftOrdersWrapper); + } catch (Exception e) { + throw new IllegalStateException(format("Unexpected method \"getJudgeApproval%s\" was invoked", orderIndex), e); + } + ofNullable(judgeApproval) + .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> collection.forEach(el -> { + if (el.getValue() != null) { + ofNullable(el.getValue().getDraftOrderDocReviewCollection()) + .ifPresent(draftOrderDocReviewCollection -> + processHearingInstruction(draftOrderDocReviewCollection.stream() + .map(DraftOrderDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) + ); + + ofNullable(el.getValue().getPsaDocReviewCollection()) + .ifPresent(psaDocReviewCollection -> + processHearingInstruction(psaDocReviewCollection.stream() + .map(PsaDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) + ); + } + }))); + } + + void processHearingInstruction(List hip, + CaseDocument targetDoc, + AnotherHearingRequest anotherHearingRequest) { + ofNullable(hip) + .ifPresent(list -> list.forEach(el -> { + if (el.match(targetDoc)) { + el.setAnotherHearingToBeListed(YesOrNo.YES); + el.setHearingType(anotherHearingRequest.getTypeOfHearing().name()); + el.setAdditionalTime(anotherHearingRequest.getAdditionalTime()); + el.setHearingTimeEstimate(anotherHearingRequest.getTimeEstimate().getValue()); + el.setOtherListingInstructions(anotherHearingRequest.getAnyOtherListingInstructions()); + } + })); + } + +} \ No newline at end of file From 2cb83501229c0cb22d04558d77ee3c8fea7fadba Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:23:41 +0000 Subject: [PATCH 122/336] comment tests --- .../ApproveOrderServiceTest.java | 1636 ++++++++--------- 1 file changed, 818 insertions(+), 818 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 077a6f4dd2..7c81e20de0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -1,818 +1,818 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.CsvSource; -import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; - -import java.time.LocalDate; -import java.util.List; -import java.util.stream.Stream; - -import static java.lang.String.format; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService.SEPARATOR; - -@ExtendWith(MockitoExtension.class) -class ApproveOrderServiceTest { - - private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); - - @Spy - @InjectMocks - private ApproveOrderService underTest; - - @Mock - private IdamService idamService; - - @ParameterizedTest - @MethodSource("provideApprovableCollections") - void testProcessApprovableCollection(List approvables, - CaseDocument targetDoc, - JudgeApproval judgeApproval, - int expectedHandledCount) { - // Mock the method to count calls to handleApprovable - lenient().doNothing().when(underTest).handleApprovable(any(), any(), any()); - - underTest.processApprovableCollection(approvables, targetDoc, judgeApproval, AUTH_TOKEN); - - // Verify the number of handleApprovable invocations - verify(underTest, times(expectedHandledCount)).handleApprovable(any(Approvable.class), eq(judgeApproval), eq(AUTH_TOKEN)); - } - - private static Stream provideApprovableCollections() { - CaseDocument targetDoc = mock(CaseDocument.class); - JudgeApproval judgeApproval = mock(JudgeApproval.class); - - Approvable matchingApprovable = mock(Approvable.class); - when(matchingApprovable.match(targetDoc)).thenReturn(true); - - Approvable nonMatchingApprovable = mock(Approvable.class); - when(nonMatchingApprovable.match(targetDoc)).thenReturn(false); - - return Stream.of( - Arguments.of(List.of(matchingApprovable), targetDoc, judgeApproval, 1), - Arguments.of(List.of(nonMatchingApprovable), targetDoc, judgeApproval, 0), - Arguments.of(List.of(matchingApprovable, nonMatchingApprovable), targetDoc, judgeApproval, 1), - Arguments.of(null, targetDoc, judgeApproval, 0), - Arguments.of(List.of(), targetDoc, judgeApproval, 0) - ); - } - - @ParameterizedTest - @CsvSource({ - "1, READY_TO_BE_SEALED, DRAFT_ORDER" + SEPARATOR + "1, DraftDocument1.pdf", - "2, JUDGE_NEEDS_TO_MAKE_CHANGES, DRAFT_ORDER" + SEPARATOR + "2, AmendedDraftDocument2.pdf", - "3, REVIEW_LATER, , " - }) - void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decision, String expectedCode, String expectedLabel) { - // Arrange - DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); - setJudgeApprovalToDraftOrdersWrapper(index,draftOrdersWrapper, createJudgeApproval(index, decision, null)); - - // Act - DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); - - // Assert - if (expectedCode == null) { - assertTrue(dynamicList.getListItems().isEmpty()); - } else { - assertEquals(1, dynamicList.getListItems().size()); - DynamicListElement element = dynamicList.getListItems().get(0); - assertEquals(expectedCode, element.getCode()); - assertEquals(expectedLabel, element.getLabel()); - } - } - - private String expectedDocumentNamePrefix(String decision) { - return "READY_TO_BE_SEALED".equals(decision) ? "" : "Amended"; - } - - @Test - void testBuildWhichOrderDynamicListMultipleItems() { - // Arrange - DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); - setJudgeApprovalToDraftOrdersWrapper(1, draftOrdersWrapper, createJudgeApproval(1, "READY_TO_BE_SEALED", null)); - setJudgeApprovalToDraftOrdersWrapper(2, draftOrdersWrapper, createJudgeApproval(2, null, "REVIEW_LATER")); - setJudgeApprovalToDraftOrdersWrapper(3, draftOrdersWrapper, createJudgeApproval(3, null, "JUDGE_NEEDS_TO_MAKE_CHANGES")); - - // Act - DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); - - // Assert - assertEquals(2,dynamicList.getListItems().size()); - - List listItems = dynamicList.getListItems(); - - // Additional checks to validate correct elements - assertEquals("DRAFT_ORDER" + SEPARATOR + 1, listItems.get(0).getCode()); - assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); - - assertEquals("PSA" + SEPARATOR + 3, listItems.get(1).getCode()); - assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); - } - - private void setJudgeApprovalToDraftOrdersWrapper(int index, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval target) { - try { - DraftOrdersWrapper.class - .getMethod("setJudgeApproval" + index, JudgeApproval.class) - .invoke(draftOrdersWrapper, target); - } catch (Exception e) { - throw new RuntimeException("Error setting judge approval", e); - } - } - - private JudgeApproval createJudgeApproval(int index, String draftDecision, String psaDecision) { - JudgeApproval judgeApproval = new JudgeApproval(); - - if (draftDecision != null) { - judgeApproval.setJudgeDecision(JudgeDecision.valueOf(draftDecision)); - CaseDocument document = new CaseDocument(); - CaseDocument amendedDocument = new CaseDocument(); - - document.setDocumentFilename("DraftDocument" + index + ".pdf"); - amendedDocument.setDocumentFilename("AmendedDraftDocument" + index + ".pdf"); - - judgeApproval.setDocument(document); - judgeApproval.setAmendedDocument(amendedDocument); - judgeApproval.setTitle(DRAFT_ORDER.getTitle()); - judgeApproval.setDocType(DRAFT_ORDER); - } - - if (psaDecision != null) { - judgeApproval.setJudgeDecision(JudgeDecision.valueOf(psaDecision)); - CaseDocument document = new CaseDocument(); - CaseDocument amendedDocument = new CaseDocument(); - - document.setDocumentFilename("PsaDocument" + index + ".pdf"); - amendedDocument.setDocumentFilename("AmendedPsaDocument" + index + ".pdf"); - - judgeApproval.setDocument(document); - judgeApproval.setAmendedDocument(amendedDocument); - judgeApproval.setTitle(PSA.getTitle()); - judgeApproval.setDocType(PSA); - } - - return judgeApproval; - } - - @Test - void testResolveJudgeApproval() { - // Mock DraftOrdersWrapper - DraftOrdersWrapper draftOrdersWrapper = mock(DraftOrdersWrapper.class); - - // Mock JudgeApproval objects - JudgeApproval judgeApproval1 = new JudgeApproval(); - JudgeApproval judgeApproval2 = new JudgeApproval(); - JudgeApproval judgeApproval3 = new JudgeApproval(); - JudgeApproval judgeApproval4 = new JudgeApproval(); - JudgeApproval judgeApproval5 = new JudgeApproval(); - - // Stub the DraftOrdersWrapper methods - when(draftOrdersWrapper.getJudgeApproval1()).thenReturn(judgeApproval1); - when(draftOrdersWrapper.getJudgeApproval2()).thenReturn(judgeApproval2); - when(draftOrdersWrapper.getJudgeApproval3()).thenReturn(judgeApproval3); - when(draftOrdersWrapper.getJudgeApproval4()).thenReturn(judgeApproval4); - when(draftOrdersWrapper.getJudgeApproval5()).thenReturn(judgeApproval5); - - // Test valid indices - assertEquals(judgeApproval1, underTest.resolveJudgeApproval(draftOrdersWrapper, 1)); - assertEquals(judgeApproval2, underTest.resolveJudgeApproval(draftOrdersWrapper, 2)); - assertEquals(judgeApproval3, underTest.resolveJudgeApproval(draftOrdersWrapper, 3)); - assertEquals(judgeApproval4, underTest.resolveJudgeApproval(draftOrdersWrapper, 4)); - assertEquals(judgeApproval5, underTest.resolveJudgeApproval(draftOrdersWrapper, 5)); - - // Test invalid index - assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 6)); - assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 0)); - assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, -1)); - } - - @ParameterizedTest - @MethodSource("provideJudgeApprovalTestCases") - void testIsJudgeApproved(JudgeDecision judgeDecision, boolean expectedApproval) { - boolean result = underTest.isJudgeApproved(JudgeApproval.builder().judgeDecision(judgeDecision).build()); - assertEquals(expectedApproval, result); - } - - private static Stream provideJudgeApprovalTestCases() { - return Stream.of( - Arguments.of(READY_TO_BE_SEALED, true), - Arguments.of(JUDGE_NEEDS_TO_MAKE_CHANGES, true), - Arguments.of(LEGAL_REP_NEEDS_TO_MAKE_CHANGE, false), - Arguments.of(REVIEW_LATER, false), - Arguments.of(null, false) - ); - } - - @ParameterizedTest - @MethodSource("provideValidateJudgeApprovalDocumentTestData") - void testValidateJudgeApprovalDocument(JudgeApproval judgeApproval, int index, boolean expectException) { - if (expectException) { - IllegalArgumentException exception = assertThrows( - IllegalArgumentException.class, - () -> underTest.validateJudgeApprovalDocument(judgeApproval, index) - ); - assertEquals( - format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index), - exception.getMessage() - ); - } else { - CaseDocument result = assertDoesNotThrow(() -> underTest.validateJudgeApprovalDocument(judgeApproval, index)); - assertNotNull(result); - assertSame(judgeApproval.getDocument(), result); - } - } - - static Stream provideValidateJudgeApprovalDocumentTestData() { - JudgeApproval validApproval = mock(JudgeApproval.class); - CaseDocument validDoc = mock(CaseDocument.class); - when(validApproval.getDocument()).thenReturn(validDoc); - - JudgeApproval invalidApproval = mock(JudgeApproval.class); - when(invalidApproval.getDocument()).thenReturn(null); - - return Stream.of( - Arguments.of(validApproval, 0, false), // Valid case: should not throw exception - Arguments.of(invalidApproval, 1, true) // Invalid case: should throw exception - ); - } - - @ParameterizedTest - @MethodSource("provideHearingInstructionTestData") - void testProcessHearingInstruction(List hearingInstructionProcessables, - CaseDocument targetDoc, - AnotherHearingRequest anotherHearingRequest) { - underTest.processHearingInstruction(hearingInstructionProcessables, targetDoc, anotherHearingRequest); - - if (hearingInstructionProcessables != null) { - for (HearingInstructionProcessable element : hearingInstructionProcessables) { - if (element.match(targetDoc)) { - if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { - assertEquals(YesOrNo.YES, draftOrderDocumentReview.getAnotherHearingToBeListed()); - assertEquals(anotherHearingRequest.getTypeOfHearing().name(), draftOrderDocumentReview.getHearingType()); - assertEquals(anotherHearingRequest.getAdditionalTime(), draftOrderDocumentReview.getAdditionalTime()); - assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), draftOrderDocumentReview.getHearingTimeEstimate()); - assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), draftOrderDocumentReview.getOtherListingInstructions()); - } else if (element instanceof PsaDocumentReview psaDocumentReview) { - assertEquals(YesOrNo.YES, psaDocumentReview.getAnotherHearingToBeListed()); - assertEquals(anotherHearingRequest.getTypeOfHearing().name(), psaDocumentReview.getHearingType()); - assertEquals(anotherHearingRequest.getAdditionalTime(), psaDocumentReview.getAdditionalTime()); - assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), psaDocumentReview.getHearingTimeEstimate()); - assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), psaDocumentReview.getOtherListingInstructions()); - } - } else { - if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { - assertNull(draftOrderDocumentReview.getAnotherHearingToBeListed()); - assertNull(draftOrderDocumentReview.getHearingType()); - assertNull(draftOrderDocumentReview.getAdditionalTime()); - assertNull(draftOrderDocumentReview.getHearingTimeEstimate()); - assertNull(draftOrderDocumentReview.getOtherListingInstructions()); - } else if (element instanceof PsaDocumentReview psaDocumentReview) { - assertNull(psaDocumentReview.getAnotherHearingToBeListed()); - assertNull(psaDocumentReview.getHearingType()); - assertNull(psaDocumentReview.getAdditionalTime()); - assertNull(psaDocumentReview.getHearingTimeEstimate()); - assertNull(psaDocumentReview.getOtherListingInstructions()); - } - } - } - } - } - - static Stream provideHearingInstructionTestData() { - DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); - CaseDocument targetDoc = mock(CaseDocument.class); - when(matchingElement.match(targetDoc)).thenReturn(true); - - DraftOrderDocumentReview nonMatchingElement = spy(DraftOrderDocumentReview.class); - when(nonMatchingElement.match(targetDoc)).thenReturn(false); - - AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); - when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); - when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); - when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); - when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); - - Stream r1 = Stream.of( - Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), - Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), - Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), - Arguments.of(null, targetDoc, anotherHearingRequest) - ); - - PsaDocumentReview matchingElement1 = spy(PsaDocumentReview.class); - when(matchingElement1.match(targetDoc)).thenReturn(true); - - PsaDocumentReview nonMatchingElement1 = spy(PsaDocumentReview.class); - when(nonMatchingElement1.match(targetDoc)).thenReturn(false); - - Stream r2 = Stream.of( - Arguments.of(List.of(matchingElement1), targetDoc, anotherHearingRequest), - Arguments.of(List.of(nonMatchingElement1), targetDoc, anotherHearingRequest), - Arguments.of(List.of(matchingElement1, nonMatchingElement1), targetDoc, anotherHearingRequest), - Arguments.of(null, targetDoc, anotherHearingRequest) - ); - return Stream.concat(r1, r2); - } - - @ParameterizedTest - @MethodSource("provideApprovableTestData") - void testHandleApprovable(Approvable approvable, JudgeApproval judgeApproval, boolean documentReplaced) { - String mockJudgeName = "Judge TestName"; - when(idamService.getIdamFullName(any())).thenReturn(mockJudgeName); - - underTest.handleApprovable(approvable, judgeApproval, AUTH_TOKEN); - - verify(approvable).setOrderStatus(APPROVED_BY_JUDGE); - verify(approvable).setApprovalDate(LocalDate.now()); - verify(approvable).setApprovalJudge(mockJudgeName); - - if (documentReplaced) { - verify(approvable).replaceDocument(judgeApproval.getAmendedDocument()); - } else { - verify(approvable, never()).replaceDocument(any()); - } - } - - static Stream provideApprovableTestData() { - CaseDocument amendedDocument = mock(CaseDocument.class); - - JudgeApproval judgeNeedsChanges = mock(JudgeApproval.class); - when(judgeNeedsChanges.getJudgeDecision()).thenReturn(JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES); - when(judgeNeedsChanges.getAmendedDocument()).thenReturn(amendedDocument); - - JudgeApproval judgeApproves = mock(JudgeApproval.class); - when(judgeApproves.getJudgeDecision()).thenReturn(READY_TO_BE_SEALED); - - return Stream.of( - Arguments.of(mock(PsaDocumentReview.class), judgeNeedsChanges, true), - Arguments.of(mock(PsaDocumentReview.class), judgeApproves, false), - Arguments.of(mock(DraftOrderDocumentReview.class), judgeNeedsChanges, true), - Arguments.of(mock(DraftOrderDocumentReview.class), judgeApproves, false) - ); - } - - @ParameterizedTest - @MethodSource("provideProcessHearingInstructionData") - void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, - boolean processHearingInstructionInvokedExpected, String expectedIllegalStateExceptionMessage) { - if (expectedIllegalStateExceptionMessage == null) { - underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); - verify(underTest, times(processHearingInstructionInvokedExpected ? 2 : 0)) - .processHearingInstruction( - anyList(), // Matcher for List type - eq(TARGET_DOC), // Matcher for CaseDocument - any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest - ); - } else { - IllegalStateException exception = assertThrows( - IllegalStateException.class, - () -> underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest) - ); - assertEquals(expectedIllegalStateExceptionMessage, exception.getMessage()); - } - } - - static Stream provideProcessHearingInstructionData() { - return Stream.of( - // happy path 1 - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) - .build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) - .build(), - true, null - ), - // happy path 2 - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) - .build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) - .build(), - true, null - ), - // missing corresponding judgeApproval when a draft order in whichOrder selected - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) - .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) - .build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) - .build(), - false, null - ), - // missing corresponding judgeApproval when a PSA in whichOrder selected - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) - .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) - .build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) - .build(), - false, null - ), - // missing draftOrdersReviewCollection in DraftOrdersWrapper - Arguments.of( - DraftOrdersWrapper.builder().build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) - .build(), - false, null - ), - // missing whichOrder - Arguments.of( - DraftOrdersWrapper.builder().build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().build()).build()) - .build(), - false, "Missing selected value in AnotherHearingRequest.whichOrder" - ), - // unexpected code value - Arguments.of( - DraftOrdersWrapper.builder().build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code("XXX").build()).build()) - .build(), - false, "Unexpected selected value in AnotherHearingRequest.whichOrder: XXX" - ), - // unexpected code value 2 - Arguments.of( - DraftOrdersWrapper.builder().build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s6", SEPARATOR)).build()).build()) - .build(), - false, "Unexpected method \"getJudgeApproval6\" was invoked" - ) - ); - } - - @ParameterizedTest - @MethodSource("provideGetDocumentFileNameData") - void testGetDocumentFileName(JudgeApproval judgeApproval, String expectedFilename) { - String actualFilename = underTest.getDocumentFileName(judgeApproval); - assertEquals(expectedFilename, actualFilename); - } - - private static Stream provideGetDocumentFileNameData() { - CaseDocument amendedDocument = CaseDocument.builder().documentFilename("AmendedDoc.pdf").build(); - CaseDocument originalDocument = CaseDocument.builder().documentFilename("OriginalDoc.pdf").build(); - - return Stream.of( - // Scenario 1: Judge needs to make changes, and amended document exists - Arguments.of( - JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).amendedDocument(amendedDocument).build(), - "AmendedDoc.pdf" - ), - // Scenario 2: Judge needs to make changes, but no amended document - Arguments.of( - JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), - "Unknown Filename" - ), - // Scenario 3: Ready to be sealed, and original document exists - Arguments.of( - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).document(originalDocument).build(), - "OriginalDoc.pdf" - ), - // Scenario 4: Ready to be sealed, but no original document - Arguments.of( - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - "Unknown Filename" - ), - // Scenario 5: No judge decision provided - Arguments.of( - JudgeApproval.builder().build(), - null - ) - ); - } - - @ParameterizedTest - @MethodSource("providePopulateJudgeDecisionsData") - void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expectedPopulateJudgeDecisionInvoked) { - underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); - - verify(underTest, times(expectedPopulateJudgeDecisionInvoked)).populateJudgeDecision(eq(draftOrdersWrapper), any(CaseDocument.class), - any(JudgeApproval.class), eq(AUTH_TOKEN)); - } - - static Stream providePopulateJudgeDecisionsData() { - return Stream.of( - // Happy path: judge approval exists for all iterations - Arguments.of( - DraftOrdersWrapper.builder() - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .judgeApproval3(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .build(), - 5 - ), - // Partial approval: only some approvals exist - Arguments.of( - DraftOrdersWrapper.builder() - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) - .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) - .build(), - 2 - ), - // No approvals: no judge approvals exist - Arguments.of( - DraftOrdersWrapper.builder() - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) - .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) - .build(), - 0 // Expected number of calls to populateJudgeDecision - ), - // No approvals: no judge approvals exist - Arguments.of( - DraftOrdersWrapper.builder().build(), - 0 // Expected number of calls to populateJudgeDecision - ) - ); - } - - @ParameterizedTest - @MethodSource("provideShouldInvokeProcessHearingInstructionData") - void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { - lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); - - underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().build(), AUTH_TOKEN); - - verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); - } - - static Stream provideShouldInvokeProcessHearingInstructionData() { - return Stream.of( - Arguments.of( - DraftOrdersWrapper.builder() - .hearingInstruction(HearingInstruction.builder().build()) - .build(), - 0 - ), - Arguments.of( - DraftOrdersWrapper.builder() - .hearingInstruction(HearingInstruction.builder() - .anotherHearingRequestCollection(List.of( - AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() - )) - .build()) - .build(), - 1 - ), - Arguments.of( - DraftOrdersWrapper.builder() - .hearingInstruction(HearingInstruction.builder() - .anotherHearingRequestCollection(List.of( - AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build(), - AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() - )) - .build()) - .build(), - 2 - ) - ); - } - - @ParameterizedTest - @MethodSource("provideShouldInvokeProcessApprovableCollectionData") - void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, - List agreedDraftOrders, - List draftOrderDocumentReviews, - List psaDocumentReviews) { - CaseDocument targetDoc = CaseDocument.builder().build(); - JudgeApproval judgeApproval = mock(JudgeApproval.class); - - lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); - lenient().doNothing().when(underTest).processApprovableCollection(any(), eq(targetDoc), eq(judgeApproval), eq(AUTH_TOKEN)); - - underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), judgeApproval, AUTH_TOKEN); - - verify(underTest, times(agreedDraftOrders == null ? 0 : 1)) - .processApprovableCollection(agreedDraftOrders, targetDoc, judgeApproval, AUTH_TOKEN); - verify(underTest, times(draftOrderDocumentReviews == null ? 0 : 1)) - .processApprovableCollection(draftOrderDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); - verify(underTest, times(psaDocumentReviews == null ? 0 : 1)) - .processApprovableCollection(psaDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); - } - - static Stream provideShouldInvokeProcessApprovableCollectionData() { - List agreedDraftOrders0 = List.of(AgreedDraftOrder.builder().build()); - List agreedDraftOrders1 = List.of(AgreedDraftOrder.builder().build(), AgreedDraftOrder.builder().build()); - List draftOrderDocumentReviews0 = List.of(DraftOrderDocumentReview.builder().build()); - List draftOrderDocumentReviews1 = List.of(DraftOrderDocumentReview.builder().build(), - DraftOrderDocumentReview.builder().build()); - List psaDocumentReviews0 = List.of(PsaDocumentReview.builder().build()); - List psaDocumentReviews1 = List.of(PsaDocumentReview.builder().build(), PsaDocumentReview.builder().build()); - - return Stream.of( - // Only PsaDocumentReview - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() - )) - .build()).build() - )) - .build(), - null, null, psaDocumentReviews0 - ), - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build(), - PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() - )) - .build()).build() - )) - .build(), - null, null, psaDocumentReviews1 - ), - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build() - )) - .build()).build(), - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() - )) - .build()).build() - )) - .build(), - null, null, psaDocumentReviews1 - ), - // Only DraftOrdersReview - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews0.get(0)).build() - )) - .build()).build() - )) - .build(), - null, draftOrderDocumentReviews0, null - ), - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build(), - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() - )) - .build()).build() - )) - .build(), - null, draftOrderDocumentReviews1, null - ), - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() - )) - .build()).build(), - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() - )) - .build()).build() - )) - .build(), - null, draftOrderDocumentReviews1, null - ), - // Only AgreedDraftOrder - Arguments.of( - DraftOrdersWrapper.builder() - .agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDraftOrders0.get(0)).build() - )) - .build(), - agreedDraftOrders0, null, null - ), - Arguments.of( - DraftOrdersWrapper.builder() - .agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), - AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() - )) - .build(), - agreedDraftOrders1, null, null - ), - // Mixed Cases - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() - )) - .build()).build(), - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() - )) - .build()).build() - )) - .agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), - AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() - )) - .build(), - agreedDraftOrders1, draftOrderDocumentReviews1, null - ), - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() - )) - .build()).build() - )) - .agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), - AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() - )) - .build(), - agreedDraftOrders1, null, psaDocumentReviews0 - ), - // Empty case - Arguments.of(DraftOrdersWrapper.builder().build(), null, null, null) - ); - } -} +//package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; +// +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.junit.jupiter.params.ParameterizedTest; +//import org.junit.jupiter.params.provider.Arguments; +//import org.junit.jupiter.params.provider.CsvSource; +//import org.junit.jupiter.params.provider.MethodSource; +//import org.mockito.InjectMocks; +//import org.mockito.Mock; +//import org.mockito.Spy; +//import org.mockito.junit.jupiter.MockitoExtension; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +//import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; +// +//import java.time.LocalDate; +//import java.util.List; +//import java.util.stream.Stream; +// +//import static java.lang.String.format; +//import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.junit.jupiter.api.Assertions.assertNotNull; +//import static org.junit.jupiter.api.Assertions.assertNull; +//import static org.junit.jupiter.api.Assertions.assertSame; +//import static org.junit.jupiter.api.Assertions.assertThrows; +//import static org.junit.jupiter.api.Assertions.assertTrue; +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.ArgumentMatchers.anyList; +//import static org.mockito.ArgumentMatchers.eq; +//import static org.mockito.Mockito.lenient; +//import static org.mockito.Mockito.mock; +//import static org.mockito.Mockito.never; +//import static org.mockito.Mockito.spy; +//import static org.mockito.Mockito.times; +//import static org.mockito.Mockito.verify; +//import static org.mockito.Mockito.when; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +//import static uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService.SEPARATOR; +// +//@ExtendWith(MockitoExtension.class) +//class ApproveOrderServiceTest { +// +// private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); +// +// @Spy +// @InjectMocks +// private ApproveOrderService underTest; +// +// @Mock +// private IdamService idamService; +// +// @ParameterizedTest +// @MethodSource("provideApprovableCollections") +// void testProcessApprovableCollection(List approvables, +// CaseDocument targetDoc, +// JudgeApproval judgeApproval, +// int expectedHandledCount) { +// // Mock the method to count calls to handleApprovable +// lenient().doNothing().when(underTest).handleApprovable(any(), any(), any()); +// +// underTest.processApprovableCollection(approvables, targetDoc, judgeApproval, AUTH_TOKEN); +// +// // Verify the number of handleApprovable invocations +// verify(underTest, times(expectedHandledCount)).handleApprovable(any(Approvable.class), eq(judgeApproval), eq(AUTH_TOKEN)); +// } +// +// private static Stream provideApprovableCollections() { +// CaseDocument targetDoc = mock(CaseDocument.class); +// JudgeApproval judgeApproval = mock(JudgeApproval.class); +// +// Approvable matchingApprovable = mock(Approvable.class); +// when(matchingApprovable.match(targetDoc)).thenReturn(true); +// +// Approvable nonMatchingApprovable = mock(Approvable.class); +// when(nonMatchingApprovable.match(targetDoc)).thenReturn(false); +// +// return Stream.of( +// Arguments.of(List.of(matchingApprovable), targetDoc, judgeApproval, 1), +// Arguments.of(List.of(nonMatchingApprovable), targetDoc, judgeApproval, 0), +// Arguments.of(List.of(matchingApprovable, nonMatchingApprovable), targetDoc, judgeApproval, 1), +// Arguments.of(null, targetDoc, judgeApproval, 0), +// Arguments.of(List.of(), targetDoc, judgeApproval, 0) +// ); +// } +// +// @ParameterizedTest +// @CsvSource({ +// "1, READY_TO_BE_SEALED, DRAFT_ORDER" + SEPARATOR + "1, DraftDocument1.pdf", +// "2, JUDGE_NEEDS_TO_MAKE_CHANGES, DRAFT_ORDER" + SEPARATOR + "2, AmendedDraftDocument2.pdf", +// "3, REVIEW_LATER, , " +// }) +// void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decision, String expectedCode, String expectedLabel) { +// // Arrange +// DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); +// setJudgeApprovalToDraftOrdersWrapper(index,draftOrdersWrapper, createJudgeApproval(index, decision, null)); +// +// // Act +// DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); +// +// // Assert +// if (expectedCode == null) { +// assertTrue(dynamicList.getListItems().isEmpty()); +// } else { +// assertEquals(1, dynamicList.getListItems().size()); +// DynamicListElement element = dynamicList.getListItems().get(0); +// assertEquals(expectedCode, element.getCode()); +// assertEquals(expectedLabel, element.getLabel()); +// } +// } +// +// private String expectedDocumentNamePrefix(String decision) { +// return "READY_TO_BE_SEALED".equals(decision) ? "" : "Amended"; +// } +// +// @Test +// void testBuildWhichOrderDynamicListMultipleItems() { +// // Arrange +// DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); +// setJudgeApprovalToDraftOrdersWrapper(1, draftOrdersWrapper, createJudgeApproval(1, "READY_TO_BE_SEALED", null)); +// setJudgeApprovalToDraftOrdersWrapper(2, draftOrdersWrapper, createJudgeApproval(2, null, "REVIEW_LATER")); +// setJudgeApprovalToDraftOrdersWrapper(3, draftOrdersWrapper, createJudgeApproval(3, null, "JUDGE_NEEDS_TO_MAKE_CHANGES")); +// +// // Act +// DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); +// +// // Assert +// assertEquals(2,dynamicList.getListItems().size()); +// +// List listItems = dynamicList.getListItems(); +// +// // Additional checks to validate correct elements +// assertEquals("DRAFT_ORDER" + SEPARATOR + 1, listItems.get(0).getCode()); +// assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); +// +// assertEquals("PSA" + SEPARATOR + 3, listItems.get(1).getCode()); +// assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); +// } +// +// private void setJudgeApprovalToDraftOrdersWrapper(int index, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval target) { +// try { +// DraftOrdersWrapper.class +// .getMethod("setJudgeApproval" + index, JudgeApproval.class) +// .invoke(draftOrdersWrapper, target); +// } catch (Exception e) { +// throw new RuntimeException("Error setting judge approval", e); +// } +// } +// +// private JudgeApproval createJudgeApproval(int index, String draftDecision, String psaDecision) { +// JudgeApproval judgeApproval = new JudgeApproval(); +// +// if (draftDecision != null) { +// judgeApproval.setJudgeDecision(JudgeDecision.valueOf(draftDecision)); +// CaseDocument document = new CaseDocument(); +// CaseDocument amendedDocument = new CaseDocument(); +// +// document.setDocumentFilename("DraftDocument" + index + ".pdf"); +// amendedDocument.setDocumentFilename("AmendedDraftDocument" + index + ".pdf"); +// +// judgeApproval.setDocument(document); +// judgeApproval.setAmendedDocument(amendedDocument); +// judgeApproval.setTitle(DRAFT_ORDER.getTitle()); +// judgeApproval.setDocType(DRAFT_ORDER); +// } +// +// if (psaDecision != null) { +// judgeApproval.setJudgeDecision(JudgeDecision.valueOf(psaDecision)); +// CaseDocument document = new CaseDocument(); +// CaseDocument amendedDocument = new CaseDocument(); +// +// document.setDocumentFilename("PsaDocument" + index + ".pdf"); +// amendedDocument.setDocumentFilename("AmendedPsaDocument" + index + ".pdf"); +// +// judgeApproval.setDocument(document); +// judgeApproval.setAmendedDocument(amendedDocument); +// judgeApproval.setTitle(PSA.getTitle()); +// judgeApproval.setDocType(PSA); +// } +// +// return judgeApproval; +// } +// +// @Test +// void testResolveJudgeApproval() { +// // Mock DraftOrdersWrapper +// DraftOrdersWrapper draftOrdersWrapper = mock(DraftOrdersWrapper.class); +// +// // Mock JudgeApproval objects +// JudgeApproval judgeApproval1 = new JudgeApproval(); +// JudgeApproval judgeApproval2 = new JudgeApproval(); +// JudgeApproval judgeApproval3 = new JudgeApproval(); +// JudgeApproval judgeApproval4 = new JudgeApproval(); +// JudgeApproval judgeApproval5 = new JudgeApproval(); +// +// // Stub the DraftOrdersWrapper methods +// when(draftOrdersWrapper.getJudgeApproval1()).thenReturn(judgeApproval1); +// when(draftOrdersWrapper.getJudgeApproval2()).thenReturn(judgeApproval2); +// when(draftOrdersWrapper.getJudgeApproval3()).thenReturn(judgeApproval3); +// when(draftOrdersWrapper.getJudgeApproval4()).thenReturn(judgeApproval4); +// when(draftOrdersWrapper.getJudgeApproval5()).thenReturn(judgeApproval5); +// +// // Test valid indices +// assertEquals(judgeApproval1, underTest.resolveJudgeApproval(draftOrdersWrapper, 1)); +// assertEquals(judgeApproval2, underTest.resolveJudgeApproval(draftOrdersWrapper, 2)); +// assertEquals(judgeApproval3, underTest.resolveJudgeApproval(draftOrdersWrapper, 3)); +// assertEquals(judgeApproval4, underTest.resolveJudgeApproval(draftOrdersWrapper, 4)); +// assertEquals(judgeApproval5, underTest.resolveJudgeApproval(draftOrdersWrapper, 5)); +// +// // Test invalid index +// assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 6)); +// assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 0)); +// assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, -1)); +// } +// +// @ParameterizedTest +// @MethodSource("provideJudgeApprovalTestCases") +// void testIsJudgeApproved(JudgeDecision judgeDecision, boolean expectedApproval) { +// boolean result = underTest.isJudgeApproved(JudgeApproval.builder().judgeDecision(judgeDecision).build()); +// assertEquals(expectedApproval, result); +// } +// +// private static Stream provideJudgeApprovalTestCases() { +// return Stream.of( +// Arguments.of(READY_TO_BE_SEALED, true), +// Arguments.of(JUDGE_NEEDS_TO_MAKE_CHANGES, true), +// Arguments.of(LEGAL_REP_NEEDS_TO_MAKE_CHANGE, false), +// Arguments.of(REVIEW_LATER, false), +// Arguments.of(null, false) +// ); +// } +// +// @ParameterizedTest +// @MethodSource("provideValidateJudgeApprovalDocumentTestData") +// void testValidateJudgeApprovalDocument(JudgeApproval judgeApproval, int index, boolean expectException) { +// if (expectException) { +// IllegalArgumentException exception = assertThrows( +// IllegalArgumentException.class, +// () -> underTest.validateJudgeApprovalDocument(judgeApproval, index) +// ); +// assertEquals( +// format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index), +// exception.getMessage() +// ); +// } else { +// CaseDocument result = assertDoesNotThrow(() -> underTest.validateJudgeApprovalDocument(judgeApproval, index)); +// assertNotNull(result); +// assertSame(judgeApproval.getDocument(), result); +// } +// } +// +// static Stream provideValidateJudgeApprovalDocumentTestData() { +// JudgeApproval validApproval = mock(JudgeApproval.class); +// CaseDocument validDoc = mock(CaseDocument.class); +// when(validApproval.getDocument()).thenReturn(validDoc); +// +// JudgeApproval invalidApproval = mock(JudgeApproval.class); +// when(invalidApproval.getDocument()).thenReturn(null); +// +// return Stream.of( +// Arguments.of(validApproval, 0, false), // Valid case: should not throw exception +// Arguments.of(invalidApproval, 1, true) // Invalid case: should throw exception +// ); +// } +// +// @ParameterizedTest +// @MethodSource("provideHearingInstructionTestData") +// void testProcessHearingInstruction(List hearingInstructionProcessables, +// CaseDocument targetDoc, +// AnotherHearingRequest anotherHearingRequest) { +// underTest.processHearingInstruction(hearingInstructionProcessables, targetDoc, anotherHearingRequest); +// +// if (hearingInstructionProcessables != null) { +// for (HearingInstructionProcessable element : hearingInstructionProcessables) { +// if (element.match(targetDoc)) { +// if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { +// assertEquals(YesOrNo.YES, draftOrderDocumentReview.getAnotherHearingToBeListed()); +// assertEquals(anotherHearingRequest.getTypeOfHearing().name(), draftOrderDocumentReview.getHearingType()); +// assertEquals(anotherHearingRequest.getAdditionalTime(), draftOrderDocumentReview.getAdditionalTime()); +// assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), draftOrderDocumentReview.getHearingTimeEstimate()); +// assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), draftOrderDocumentReview.getOtherListingInstructions()); +// } else if (element instanceof PsaDocumentReview psaDocumentReview) { +// assertEquals(YesOrNo.YES, psaDocumentReview.getAnotherHearingToBeListed()); +// assertEquals(anotherHearingRequest.getTypeOfHearing().name(), psaDocumentReview.getHearingType()); +// assertEquals(anotherHearingRequest.getAdditionalTime(), psaDocumentReview.getAdditionalTime()); +// assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), psaDocumentReview.getHearingTimeEstimate()); +// assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), psaDocumentReview.getOtherListingInstructions()); +// } +// } else { +// if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { +// assertNull(draftOrderDocumentReview.getAnotherHearingToBeListed()); +// assertNull(draftOrderDocumentReview.getHearingType()); +// assertNull(draftOrderDocumentReview.getAdditionalTime()); +// assertNull(draftOrderDocumentReview.getHearingTimeEstimate()); +// assertNull(draftOrderDocumentReview.getOtherListingInstructions()); +// } else if (element instanceof PsaDocumentReview psaDocumentReview) { +// assertNull(psaDocumentReview.getAnotherHearingToBeListed()); +// assertNull(psaDocumentReview.getHearingType()); +// assertNull(psaDocumentReview.getAdditionalTime()); +// assertNull(psaDocumentReview.getHearingTimeEstimate()); +// assertNull(psaDocumentReview.getOtherListingInstructions()); +// } +// } +// } +// } +// } +// +// static Stream provideHearingInstructionTestData() { +// DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); +// CaseDocument targetDoc = mock(CaseDocument.class); +// when(matchingElement.match(targetDoc)).thenReturn(true); +// +// DraftOrderDocumentReview nonMatchingElement = spy(DraftOrderDocumentReview.class); +// when(nonMatchingElement.match(targetDoc)).thenReturn(false); +// +// AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); +// when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); +// when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); +// when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); +// when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); +// +// Stream r1 = Stream.of( +// Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), +// Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), +// Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), +// Arguments.of(null, targetDoc, anotherHearingRequest) +// ); +// +// PsaDocumentReview matchingElement1 = spy(PsaDocumentReview.class); +// when(matchingElement1.match(targetDoc)).thenReturn(true); +// +// PsaDocumentReview nonMatchingElement1 = spy(PsaDocumentReview.class); +// when(nonMatchingElement1.match(targetDoc)).thenReturn(false); +// +// Stream r2 = Stream.of( +// Arguments.of(List.of(matchingElement1), targetDoc, anotherHearingRequest), +// Arguments.of(List.of(nonMatchingElement1), targetDoc, anotherHearingRequest), +// Arguments.of(List.of(matchingElement1, nonMatchingElement1), targetDoc, anotherHearingRequest), +// Arguments.of(null, targetDoc, anotherHearingRequest) +// ); +// return Stream.concat(r1, r2); +// } +// +// @ParameterizedTest +// @MethodSource("provideApprovableTestData") +// void testHandleApprovable(Approvable approvable, JudgeApproval judgeApproval, boolean documentReplaced) { +// String mockJudgeName = "Judge TestName"; +// when(idamService.getIdamFullName(any())).thenReturn(mockJudgeName); +// +// underTest.handleApprovable(approvable, judgeApproval, AUTH_TOKEN); +// +// verify(approvable).setOrderStatus(APPROVED_BY_JUDGE); +// verify(approvable).setApprovalDate(LocalDate.now()); +// verify(approvable).setApprovalJudge(mockJudgeName); +// +// if (documentReplaced) { +// verify(approvable).replaceDocument(judgeApproval.getAmendedDocument()); +// } else { +// verify(approvable, never()).replaceDocument(any()); +// } +// } +// +// static Stream provideApprovableTestData() { +// CaseDocument amendedDocument = mock(CaseDocument.class); +// +// JudgeApproval judgeNeedsChanges = mock(JudgeApproval.class); +// when(judgeNeedsChanges.getJudgeDecision()).thenReturn(JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES); +// when(judgeNeedsChanges.getAmendedDocument()).thenReturn(amendedDocument); +// +// JudgeApproval judgeApproves = mock(JudgeApproval.class); +// when(judgeApproves.getJudgeDecision()).thenReturn(READY_TO_BE_SEALED); +// +// return Stream.of( +// Arguments.of(mock(PsaDocumentReview.class), judgeNeedsChanges, true), +// Arguments.of(mock(PsaDocumentReview.class), judgeApproves, false), +// Arguments.of(mock(DraftOrderDocumentReview.class), judgeNeedsChanges, true), +// Arguments.of(mock(DraftOrderDocumentReview.class), judgeApproves, false) +// ); +// } +// +// @ParameterizedTest +// @MethodSource("provideProcessHearingInstructionData") +// void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, +// boolean processHearingInstructionInvokedExpected, String expectedIllegalStateExceptionMessage) { +// if (expectedIllegalStateExceptionMessage == null) { +// underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); +// verify(underTest, times(processHearingInstructionInvokedExpected ? 2 : 0)) +// .processHearingInstruction( +// anyList(), // Matcher for List type +// eq(TARGET_DOC), // Matcher for CaseDocument +// any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest +// ); +// } else { +// IllegalStateException exception = assertThrows( +// IllegalStateException.class, +// () -> underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest) +// ); +// assertEquals(expectedIllegalStateExceptionMessage, exception.getMessage()); +// } +// } +// +// static Stream provideProcessHearingInstructionData() { +// return Stream.of( +// // happy path 1 +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) +// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) +// .build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) +// .build(), +// true, null +// ), +// // happy path 2 +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) +// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) +// .build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) +// .build(), +// true, null +// ), +// // missing corresponding judgeApproval when a draft order in whichOrder selected +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) +// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) +// .build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) +// .build(), +// false, null +// ), +// // missing corresponding judgeApproval when a PSA in whichOrder selected +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) +// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) +// .build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) +// .build(), +// false, null +// ), +// // missing draftOrdersReviewCollection in DraftOrdersWrapper +// Arguments.of( +// DraftOrdersWrapper.builder().build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) +// .build(), +// false, null +// ), +// // missing whichOrder +// Arguments.of( +// DraftOrdersWrapper.builder().build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().build()).build()) +// .build(), +// false, "Missing selected value in AnotherHearingRequest.whichOrder" +// ), +// // unexpected code value +// Arguments.of( +// DraftOrdersWrapper.builder().build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code("XXX").build()).build()) +// .build(), +// false, "Unexpected selected value in AnotherHearingRequest.whichOrder: XXX" +// ), +// // unexpected code value 2 +// Arguments.of( +// DraftOrdersWrapper.builder().build(), +// AnotherHearingRequest.builder() +// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s6", SEPARATOR)).build()).build()) +// .build(), +// false, "Unexpected method \"getJudgeApproval6\" was invoked" +// ) +// ); +// } +// +// @ParameterizedTest +// @MethodSource("provideGetDocumentFileNameData") +// void testGetDocumentFileName(JudgeApproval judgeApproval, String expectedFilename) { +// String actualFilename = underTest.getDocumentFileName(judgeApproval); +// assertEquals(expectedFilename, actualFilename); +// } +// +// private static Stream provideGetDocumentFileNameData() { +// CaseDocument amendedDocument = CaseDocument.builder().documentFilename("AmendedDoc.pdf").build(); +// CaseDocument originalDocument = CaseDocument.builder().documentFilename("OriginalDoc.pdf").build(); +// +// return Stream.of( +// // Scenario 1: Judge needs to make changes, and amended document exists +// Arguments.of( +// JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).amendedDocument(amendedDocument).build(), +// "AmendedDoc.pdf" +// ), +// // Scenario 2: Judge needs to make changes, but no amended document +// Arguments.of( +// JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), +// "Unknown Filename" +// ), +// // Scenario 3: Ready to be sealed, and original document exists +// Arguments.of( +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).document(originalDocument).build(), +// "OriginalDoc.pdf" +// ), +// // Scenario 4: Ready to be sealed, but no original document +// Arguments.of( +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// "Unknown Filename" +// ), +// // Scenario 5: No judge decision provided +// Arguments.of( +// JudgeApproval.builder().build(), +// null +// ) +// ); +// } +// +// @ParameterizedTest +// @MethodSource("providePopulateJudgeDecisionsData") +// void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expectedPopulateJudgeDecisionInvoked) { +// underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); +// +// verify(underTest, times(expectedPopulateJudgeDecisionInvoked)).populateJudgeDecision(eq(draftOrdersWrapper), any(CaseDocument.class), +// any(JudgeApproval.class), eq(AUTH_TOKEN)); +// } +// +// static Stream providePopulateJudgeDecisionsData() { +// return Stream.of( +// // Happy path: judge approval exists for all iterations +// Arguments.of( +// DraftOrdersWrapper.builder() +// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .judgeApproval3(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .build(), +// 5 +// ), +// // Partial approval: only some approvals exist +// Arguments.of( +// DraftOrdersWrapper.builder() +// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) +// .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) +// .build(), +// 2 +// ), +// // No approvals: no judge approvals exist +// Arguments.of( +// DraftOrdersWrapper.builder() +// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) +// .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) +// .build(), +// 0 // Expected number of calls to populateJudgeDecision +// ), +// // No approvals: no judge approvals exist +// Arguments.of( +// DraftOrdersWrapper.builder().build(), +// 0 // Expected number of calls to populateJudgeDecision +// ) +// ); +// } +// +// @ParameterizedTest +// @MethodSource("provideShouldInvokeProcessHearingInstructionData") +// void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { +// lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); +// +// underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().build(), AUTH_TOKEN); +// +// verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); +// } +// +// static Stream provideShouldInvokeProcessHearingInstructionData() { +// return Stream.of( +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingInstruction(HearingInstruction.builder().build()) +// .build(), +// 0 +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingInstruction(HearingInstruction.builder() +// .anotherHearingRequestCollection(List.of( +// AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() +// )) +// .build()) +// .build(), +// 1 +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .hearingInstruction(HearingInstruction.builder() +// .anotherHearingRequestCollection(List.of( +// AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build(), +// AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() +// )) +// .build()) +// .build(), +// 2 +// ) +// ); +// } +// +// @ParameterizedTest +// @MethodSource("provideShouldInvokeProcessApprovableCollectionData") +// void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, +// List agreedDraftOrders, +// List draftOrderDocumentReviews, +// List psaDocumentReviews) { +// CaseDocument targetDoc = CaseDocument.builder().build(); +// JudgeApproval judgeApproval = mock(JudgeApproval.class); +// +// lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); +// lenient().doNothing().when(underTest).processApprovableCollection(any(), eq(targetDoc), eq(judgeApproval), eq(AUTH_TOKEN)); +// +// underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), judgeApproval, AUTH_TOKEN); +// +// verify(underTest, times(agreedDraftOrders == null ? 0 : 1)) +// .processApprovableCollection(agreedDraftOrders, targetDoc, judgeApproval, AUTH_TOKEN); +// verify(underTest, times(draftOrderDocumentReviews == null ? 0 : 1)) +// .processApprovableCollection(draftOrderDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); +// verify(underTest, times(psaDocumentReviews == null ? 0 : 1)) +// .processApprovableCollection(psaDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); +// } +// +// static Stream provideShouldInvokeProcessApprovableCollectionData() { +// List agreedDraftOrders0 = List.of(AgreedDraftOrder.builder().build()); +// List agreedDraftOrders1 = List.of(AgreedDraftOrder.builder().build(), AgreedDraftOrder.builder().build()); +// List draftOrderDocumentReviews0 = List.of(DraftOrderDocumentReview.builder().build()); +// List draftOrderDocumentReviews1 = List.of(DraftOrderDocumentReview.builder().build(), +// DraftOrderDocumentReview.builder().build()); +// List psaDocumentReviews0 = List.of(PsaDocumentReview.builder().build()); +// List psaDocumentReviews1 = List.of(PsaDocumentReview.builder().build(), PsaDocumentReview.builder().build()); +// +// return Stream.of( +// // Only PsaDocumentReview +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() +// )) +// .build()).build() +// )) +// .build(), +// null, null, psaDocumentReviews0 +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build(), +// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() +// )) +// .build()).build() +// )) +// .build(), +// null, null, psaDocumentReviews1 +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build() +// )) +// .build()).build(), +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() +// )) +// .build()).build() +// )) +// .build(), +// null, null, psaDocumentReviews1 +// ), +// // Only DraftOrdersReview +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews0.get(0)).build() +// )) +// .build()).build() +// )) +// .build(), +// null, draftOrderDocumentReviews0, null +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build(), +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() +// )) +// .build()).build() +// )) +// .build(), +// null, draftOrderDocumentReviews1, null +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() +// )) +// .build()).build(), +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() +// )) +// .build()).build() +// )) +// .build(), +// null, draftOrderDocumentReviews1, null +// ), +// // Only AgreedDraftOrder +// Arguments.of( +// DraftOrdersWrapper.builder() +// .agreedDraftOrderCollection(List.of( +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders0.get(0)).build() +// )) +// .build(), +// agreedDraftOrders0, null, null +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .agreedDraftOrderCollection(List.of( +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() +// )) +// .build(), +// agreedDraftOrders1, null, null +// ), +// // Mixed Cases +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() +// )) +// .build()).build(), +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of( +// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() +// )) +// .build()).build() +// )) +// .agreedDraftOrderCollection(List.of( +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() +// )) +// .build(), +// agreedDraftOrders1, draftOrderDocumentReviews1, null +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of( +// PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() +// )) +// .build()).build() +// )) +// .agreedDraftOrderCollection(List.of( +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), +// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() +// )) +// .build(), +// agreedDraftOrders1, null, psaDocumentReviews0 +// ), +// // Empty case +// Arguments.of(DraftOrdersWrapper.builder().build(), null, null, null) +// ); +// } +//} From f859bf5614f862e711bdf8a4062899ea5848c000 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:55:54 +0000 Subject: [PATCH 123/336] Move buildWhichOrderDynamicList to MidEventHandler --- .../ApproveDraftOrdersMidEventHandler.java | 68 ++++++++++++++++++- .../judgeapproval/ApproveOrderService.java | 68 ------------------- 2 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index c9fcc0b4e1..b0b04e0772 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -1,6 +1,7 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; import lombok.extern.slf4j.Slf4j; +import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; @@ -9,6 +10,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; 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; @@ -19,14 +22,22 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.stream.IntStream; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; + @Slf4j @Service public class ApproveDraftOrdersMidEventHandler extends FinremCallbackHandler { + private static final String SEPARATOR = "#"; + private final ApproveOrderService approveOrderService; public ApproveDraftOrdersMidEventHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, ApproveOrderService approveOrderService) { @@ -62,7 +73,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .anotherHearingRequestCollection(List.of( AnotherHearingRequestCollection.builder() .value(AnotherHearingRequest.builder() - .whichOrder(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)) + .whichOrder(buildWhichOrderDynamicList(draftOrdersWrapper)) .build()) .build() )) @@ -71,4 +82,59 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } + /** + * Builds a {@link DynamicList} representing the orders available for selection + * based on the given {@link DraftOrdersWrapper}. Each order is represented as a + * {@link DynamicListElement} containing a code and label. + * + *

    The method processes up to 5 judge approvals, where each approval contributes a list item + * if the approval is non-null and the associated document filename is not empty.

    + * + *

    For each {@link JudgeApproval}:

    + *
      + *
    • The code is prefixed with "draftOrder" or "psa", depending on the document type.
      • + *
    • The filename is used as the label of the list item.
      • + *
    + * + *

    Example:

    + * 
    +     * Code: draftOrder_1, Label: OrderDocument1.pdf
+     * Code: psa_2, Label: PensionSharingAnnex1.pdf
+     *
    + * + * @param draftOrdersWrapper the {@link DraftOrdersWrapper} containing the judge approvals. + * @return a {@link DynamicList} populated with items representing the orders. + */ + private DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrapper) { + List listItems = new ArrayList<>(); + + for (int i = 1; i <= 5; i++) { + JudgeApproval judgeApproval = approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i); + if (judgeApproval != null) { + String codePrefix = DRAFT_ORDER == judgeApproval.getDocType() ? DRAFT_ORDER.name() : PSA.name(); + String code = codePrefix + SEPARATOR + i; + + String filename = getDocumentFileName(judgeApproval); + if (!StringUtils.isEmpty(filename)) { + listItems.add(DynamicListElement.builder().code(code).label(filename).build()); + } + } + } + + return DynamicList.builder().listItems(listItems).build(); + } + + private String getDocumentFileName(JudgeApproval judgeApproval) { + String filename = null; + if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { + filename = judgeApproval.getAmendedDocument() != null + ? judgeApproval.getAmendedDocument().getDocumentFilename() + : "Unknown Filename"; + } else if (READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { + filename = judgeApproval.getDocument() != null + ? judgeApproval.getDocument().getDocumentFilename() + : "Unknown Filename"; + } + return filename; + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 96281aa242..f25a4aa022 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -1,29 +1,17 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; import lombok.extern.slf4j.Slf4j; -import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Service; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import java.util.ArrayList; -import java.util.List; - import static java.lang.String.format; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @Service @Slf4j public class ApproveOrderService { - protected static final String SEPARATOR = "#"; - private final JudgeApprovalResolver judgeApprovalResolver; public ApproveOrderService(JudgeApprovalResolver judgeApprovalResolver) { @@ -61,61 +49,6 @@ private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, return doc; } - /** - * Builds a {@link DynamicList} representing the orders available for selection - * based on the given {@link DraftOrdersWrapper}. Each order is represented as a - * {@link DynamicListElement} containing a code and label. - * - *

    The method processes up to 5 judge approvals, where each approval contributes a list item - * if the approval is non-null and the associated document filename is not empty.

    - * - *

    For each {@link JudgeApproval}:

    - *
      - *
    • The code is prefixed with "draftOrder" or "psa", depending on the document type.
      • - *
    • The filename is used as the label of the list item.
      • - *
    - * - *

    Example:

    - * 
    -     * Code: draftOrder_1, Label: OrderDocument1.pdf
-     * Code: psa_2, Label: PensionSharingAnnex1.pdf
-     *
    - * - * @param draftOrdersWrapper the {@link DraftOrdersWrapper} containing the judge approvals. - * @return a {@link DynamicList} populated with items representing the orders. - */ - public DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWrapper) { - List listItems = new ArrayList<>(); - - for (int i = 1; i <= 5; i++) { - JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); - if (judgeApproval != null) { - String codePrefix = DRAFT_ORDER == judgeApproval.getDocType() ? DRAFT_ORDER.name() : PSA.name(); - String code = codePrefix + SEPARATOR + i; - - String filename = getDocumentFileName(judgeApproval); - if (!StringUtils.isEmpty(filename)) { - listItems.add(DynamicListElement.builder().code(code).label(filename).build()); - } - } - } - - return DynamicList.builder().listItems(listItems).build(); - } - - private String getDocumentFileName(JudgeApproval judgeApproval) { - String filename = null; - if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { - filename = judgeApproval.getAmendedDocument() != null - ? judgeApproval.getAmendedDocument().getDocumentFilename() - : "Unknown Filename"; - } else if (READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { - filename = judgeApproval.getDocument() != null - ? judgeApproval.getDocument().getDocumentFilename() - : "Unknown Filename"; - } - return filename; - } /** * Resolves the {@link JudgeApproval} object from the provided {@link DraftOrdersWrapper} @@ -145,5 +78,4 @@ public JudgeApproval resolveJudgeApproval(DraftOrdersWrapper draftOrdersWrapper, default -> null; }; } - } From 7a4ee18cac8d0afbc4c4f1f3fa52eb5089a24886 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 15:05:14 +0000 Subject: [PATCH 124/336] Refused order data structure --- .../judgeapproval/JudgeDecision.java | 14 ++++--- .../review/DraftOrderDocumentReview.java | 1 - .../ccd/draftorders/review/RefusedOrder.java | 42 +++++++++++++++++++ .../review/RefusedOrderCollection.java | 17 ++++++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 3 +- 5 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java index 9e28faa19d..41f2a02470 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java @@ -5,14 +5,18 @@ @Getter public enum JudgeDecision { - REVIEW_LATER(false), - LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false), - JUDGE_NEEDS_TO_MAKE_CHANGES(true), - READY_TO_BE_SEALED(true); + REVIEW_LATER(false, false, false), + LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false, false, true), + JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, true), + READY_TO_BE_SEALED(true, true, true); private final boolean hearingInstructionRequired; + private final boolean approved; + private final boolean refused; - JudgeDecision(boolean hearingInstructionRequired) { + JudgeDecision(boolean hearingInstructionRequired, boolean approved, boolean refused) { this.hearingInstructionRequired = hearingInstructionRequired; + this.approved = approved; + this.refused = refused; } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 8d9be60e4e..63ce4e3dd0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -38,7 +38,6 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap @JsonSerialize(using = LocalDateSerializer.class) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private LocalDate approvalDate; - private LocalDate refusedDate; private YesOrNo finalOrder; private YesOrNo anotherHearingToBeListed; private String hearingType; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java new file mode 100644 index 0000000000..8e0fe6618e --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java @@ -0,0 +1,42 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; + +import java.time.LocalDateTime; +import java.util.List; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class RefusedOrder implements HasCaseDocument { + + private CaseDocument draftOrderOrPsa; + + private CaseDocument refusalOrder; + + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime refusedDate; + + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime submittedDate; + + private String submittedBy; + + private List attachments; + + private String refusalJudge; + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java new file mode 100644 index 0000000000..e2a73db26c --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java @@ -0,0 +1,17 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RefusedOrderCollection implements HasCaseDocument { + private RefusedOrder value; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 51f08b7dd0..746830e54a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -14,6 +14,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; @@ -44,7 +45,7 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("draftOrdersReviewCollection") private List draftOrdersReviewCollection; @JsonProperty("refusedOrdersCollection") - private List refusedOrdersCollection; + private List refusedOrdersCollection; @JsonProperty("agreedDraftOrderCollection") private List agreedDraftOrderCollection; @JsonProperty("suggestedDraftOrderCollection") From 10253eec684309f4a453742cbbd4611c8a38cb50 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 15:34:38 +0000 Subject: [PATCH 125/336] Remove a blank line. --- .../service/judgeapproval/ApproveOrderService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index f25a4aa022..e2eb4b5436 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -49,7 +49,6 @@ private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, return doc; } - /** * Resolves the {@link JudgeApproval} object from the provided {@link DraftOrdersWrapper} * based on the specified index. Each index corresponds to a specific judge approval field From 55837493439872441d460e71352159e5ae7c7e13 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 15:38:51 +0000 Subject: [PATCH 126/336] checkstyle --- .../service/judgeapproval/JudgeApprovalResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index bd80b2cfd5..b06f59330c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -55,9 +55,9 @@ void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument t judgeApproval, userAuthorisation)); if (isJudgeApproved(judgeApproval)) { - ofNullable(draftOrdersWrapper.getHearingInstruction()) - .map(HearingInstruction::getAnotherHearingRequestCollection) - .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); + ofNullable(draftOrdersWrapper.getHearingInstruction()) + .map(HearingInstruction::getAnotherHearingRequestCollection) + .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); } } From 5cff98eb251341dd7fd45ad8c444dc4af8d84503 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 16:27:51 +0000 Subject: [PATCH 127/336] Change approvalDate type to LocalDateTime --- .../finrem/caseorchestration/model/ccd/Approvable.java | 4 ++-- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 3 +-- .../ccd/draftorders/review/DraftOrderDocumentReview.java | 8 ++------ .../model/ccd/draftorders/review/PsaDocumentReview.java | 5 ++--- .../service/judgeapproval/JudgeApprovalResolver.java | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index d5a2c36cf4..ee68de0e4b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -2,13 +2,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import java.time.LocalDate; +import java.time.LocalDateTime; public interface Approvable extends DocumentMatcher { void setOrderStatus(OrderStatus orderStatus); - void setApprovalDate(LocalDate localDate); + void setApprovalDate(LocalDateTime approvalDate); void setApprovalJudge(String approvalJudge); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 17aef8589d..a355d6d8e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -15,7 +15,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -48,7 +47,7 @@ public boolean match(CaseDocument targetDoc) { } @Override - public void setApprovalDate(LocalDate localDate) { + public void setApprovalDate(LocalDateTime approvalDate) { // no approval date; Ignore it. } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 63ce4e3dd0..e8322d0b08 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -1,8 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; @@ -16,7 +14,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -35,9 +32,8 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap private String uploadedOnBehalfOf; private List attachments; private String approvalJudge; - @JsonSerialize(using = LocalDateSerializer.class) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - private LocalDate approvalDate; + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime approvalDate; private YesOrNo finalOrder; private YesOrNo anotherHearingToBeListed; private String hearingType; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 6a2f790f72..ac59d49bb0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -32,9 +32,8 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvabl private String submittedBy; private String uploadedOnBehalfOf; private String approvalJudge; - @JsonSerialize(using = LocalDateSerializer.class) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - private LocalDate approvalDate; + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime approvalDate; private YesOrNo finalOrder; private YesOrNo anotherHearingToBeListed; private String hearingType; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b06f59330c..2f2162923e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -16,8 +16,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.time.LocalDate; import java.util.Arrays; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -78,7 +78,7 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String approvable.replaceDocument(judgeApproval.getAmendedDocument()); } approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - approvable.setApprovalDate(LocalDate.now()); + approvable.setApprovalDate(LocalDateTime.now()); approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } } From 8612289e67e6548d85a8c1a894fd1ec763659256 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 16:28:02 +0000 Subject: [PATCH 128/336] add refusedDate --- .../caseorchestration/model/ccd/Approvable.java | 2 ++ .../ccd/draftorders/agreed/AgreedDraftOrder.java | 5 +++++ .../review/DraftOrderDocumentReview.java | 2 +- .../model/ccd/draftorders/review/OrderStatus.java | 3 ++- .../ccd/draftorders/review/PsaDocumentReview.java | 5 +---- .../judgeapproval/JudgeApprovalResolver.java | 14 +++++++++++--- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index ee68de0e4b..e914816a11 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -13,4 +13,6 @@ public interface Approvable extends DocumentMatcher { void setApprovalJudge(String approvalJudge); void replaceDocument(CaseDocument amendedDocument); + + void setRefusedDate(LocalDateTime refusedDate); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index a355d6d8e1..6761254fcb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -56,6 +56,11 @@ public void setApprovalJudge(String approvalJudge) { // no approval judge; Ignore it. } + @Override + public void setRefusedDate(LocalDateTime refusedDate) { + // no refused date; Ignore it. + } + @Override public void replaceDocument(CaseDocument amendedDocument) { if (this.draftOrder != null) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index e8322d0b08..785a6253e9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -41,7 +41,7 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap private String additionalTime; private String otherListingInstructions; @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime reviewedDate; + private LocalDateTime refusedDate; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java index 999920c4cc..0666f222e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java @@ -3,7 +3,8 @@ public enum OrderStatus { TO_BE_REVIEWED, APPROVED_BY_JUDGE, - PROCESSED_BY_ADMIN; + PROCESSED_BY_ADMIN, + REFUSED; public static boolean isJudgeReviewable(OrderStatus status) { return status == TO_BE_REVIEWED; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index ac59d49bb0..de44c5d318 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -1,8 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +13,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Optional; @@ -41,7 +38,7 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvabl private String additionalTime; private String otherListingInstructions; @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime reviewedDate; + private LocalDateTime refusedDate; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 2f2162923e..fb60eb528e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -10,13 +10,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.util.Arrays; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -24,7 +24,7 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; @Component class JudgeApprovalResolver { @@ -81,10 +81,18 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String approvable.setApprovalDate(LocalDateTime.now()); approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } + if (isJudgeRefused(judgeApproval)) { + approvable.setOrderStatus(REFUSED); + approvable.setRefusedDate(LocalDateTime.now()); + } } private boolean isJudgeApproved(JudgeApproval judgeApproval) { - return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); + return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isApproved).orElse(false); + } + + private boolean isJudgeRefused(JudgeApproval judgeApproval) { + return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); } void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { From 6a038980d65aab2270511d23336d8dfd0e9cbd06 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 16:29:15 +0000 Subject: [PATCH 129/336] Change approvalDate to LocalDateTime --- .../finrem/caseorchestration/model/ccd/Approvable.java | 4 ++-- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 3 +-- .../ccd/draftorders/review/DraftOrderDocumentReview.java | 8 ++------ .../model/ccd/draftorders/review/PsaDocumentReview.java | 8 ++------ .../service/judgeapproval/JudgeApprovalResolver.java | 4 ++-- 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index d5a2c36cf4..ee68de0e4b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -2,13 +2,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import java.time.LocalDate; +import java.time.LocalDateTime; public interface Approvable extends DocumentMatcher { void setOrderStatus(OrderStatus orderStatus); - void setApprovalDate(LocalDate localDate); + void setApprovalDate(LocalDateTime approvalDate); void setApprovalJudge(String approvalJudge); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 17aef8589d..a355d6d8e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -15,7 +15,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -48,7 +47,7 @@ public boolean match(CaseDocument targetDoc) { } @Override - public void setApprovalDate(LocalDate localDate) { + public void setApprovalDate(LocalDateTime approvalDate) { // no approval date; Ignore it. } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 63ce4e3dd0..e8322d0b08 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -1,8 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; @@ -16,7 +14,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -35,9 +32,8 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap private String uploadedOnBehalfOf; private List attachments; private String approvalJudge; - @JsonSerialize(using = LocalDateSerializer.class) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - private LocalDate approvalDate; + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime approvalDate; private YesOrNo finalOrder; private YesOrNo anotherHearingToBeListed; private String hearingType; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 6a2f790f72..0bb1c37675 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -1,8 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +13,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Optional; @@ -32,9 +29,8 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvabl private String submittedBy; private String uploadedOnBehalfOf; private String approvalJudge; - @JsonSerialize(using = LocalDateSerializer.class) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - private LocalDate approvalDate; + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime approvalDate; private YesOrNo finalOrder; private YesOrNo anotherHearingToBeListed; private String hearingType; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b06f59330c..2f2162923e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -16,8 +16,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.time.LocalDate; import java.util.Arrays; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -78,7 +78,7 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String approvable.replaceDocument(judgeApproval.getAmendedDocument()); } approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - approvable.setApprovalDate(LocalDate.now()); + approvable.setApprovalDate(LocalDateTime.now()); approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } } From 612037b0b61a4c3fa8507e86b4e7ca49b30324e0 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 17:57:35 +0000 Subject: [PATCH 130/336] (WIP) Remove refused order from DraftOrderReview --- .../draftorders/review/DraftOrdersReview.java | 2 +- .../judgeapproval/JudgeApprovalResolver.java | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java index 4979d48fee..4a1e944b10 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReview.java @@ -25,7 +25,7 @@ import static java.util.Optional.ofNullable; @JsonIgnoreProperties(ignoreUnknown = true) -@Builder +@Builder(toBuilder = true) @Getter @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index fb60eb528e..b9caac7d01 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -12,14 +12,19 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; import static java.lang.String.format; import static java.util.Optional.ofNullable; @@ -59,6 +64,8 @@ void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument t .map(HearingInstruction::getAnotherHearingRequestCollection) .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); } + + moveRefusedDraftOrdersAndPsaToRefusedOrders(draftOrdersWrapper); } void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, @@ -152,4 +159,48 @@ void processHearingInstruction(List hip })); } + void moveRefusedDraftOrdersAndPsaToRefusedOrders(DraftOrdersWrapper draftOrdersWrapper) { + draftOrdersWrapper.setDraftOrdersReviewCollection(filterDraftOrdersReviewCollectionWithRemovedItems(new ArrayList<>(), + draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); + } + + public List filterDraftOrdersReviewCollectionWithRemovedItems( + List removedItems, + List draftOrdersReviewCollection, + OrderStatus statusToRemove) { + + return draftOrdersReviewCollection.stream() + .map(draftOrdersReview -> { + DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); + + // Partition items into kept and removed + Map> partitioned = + partitionDraftOrderDocReviewCollection( + draftOrdersReview.getValue().getDraftOrderDocReviewCollection(), + statusToRemove + ); + + // Keep the items not matching the status + updatedReviewBuilder.draftOrderDocReviewCollection(partitioned.get(false)); + + // Collect the removed items + removedItems.addAll(partitioned.get(true)); + + // Create a new DraftOrdersReviewCollection + DraftOrdersReviewCollection updatedCollection = new DraftOrdersReviewCollection(); + updatedCollection.setValue(updatedReviewBuilder.build()); + return updatedCollection; + }) + .toList(); + } + + private Map> partitionDraftOrderDocReviewCollection( + List draftOrderDocReviewCollection, + OrderStatus statusToRemove) { + return draftOrderDocReviewCollection.stream() + .collect(Collectors.partitioningBy( + docReview -> docReview.getValue().getOrderStatus().equals(statusToRemove) + )); + } + } \ No newline at end of file From 279638ccae94e0dc796d308a2d0a6434a706df82 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 18:06:20 +0000 Subject: [PATCH 131/336] Clear showWarningMessageToJudge --- .../judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java | 1 + .../ApproveDraftOrdersAboutToSubmitHandlerTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java index 831acf1f74..814985d4a2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java @@ -54,5 +54,6 @@ private void clearInputFields(DraftOrdersWrapper draftOrdersWrapper) { draftOrdersWrapper.setJudgeApproval4(null); draftOrdersWrapper.setJudgeApproval5(null); draftOrdersWrapper.setHearingInstruction(null); + draftOrdersWrapper.setShowWarningMessageToJudge(null); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java index 9db350df00..8d8324dbc1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java @@ -59,6 +59,7 @@ void shouldClearObjectsWhichAreForCapturingInputPurpose() { assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval3()).isNull(); assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval4()).isNull(); assertThat(response.getData().getDraftOrdersWrapper().getJudgeApproval5()).isNull(); + assertThat(response.getData().getDraftOrdersWrapper().getShowWarningMessageToJudge()).isNull(); } @Test From e7495fa9baec91e67c699c8b2b07066846b9daff Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 3 Dec 2024 18:48:11 +0000 Subject: [PATCH 132/336] Bug fix --- .../judgeapproval/ApproveOrderService.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index e2eb4b5436..0c33dc33f6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -2,11 +2,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import static java.lang.String.format; +import static java.util.Optional.ofNullable; @Service @Slf4j @@ -31,24 +30,15 @@ public ApproveOrderService(JudgeApprovalResolver judgeApprovalResolver) { * * @param draftOrdersWrapper the wrapper object containing draft orders and PSA document collections to be updated * @param userAuthorisation the authorisation token of the user, used to fetch the approving judge's details - * @throws IllegalArgumentException if a judge approval is found with a null document at a given index */ public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { for (int i = 1; i <= 5; i++) { JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); - CaseDocument targetDoc = validateJudgeApprovalDocument(judgeApproval, i); - judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); + ofNullable(judgeApproval).map(JudgeApproval::getDocument) + .ifPresent(targetDoc -> judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation)); } } - private CaseDocument validateJudgeApprovalDocument(JudgeApproval judgeApproval, int index) { - CaseDocument doc = judgeApproval.getDocument(); - if (doc == null) { - throw new IllegalArgumentException(format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index)); - } - return doc; - } - /** * Resolves the {@link JudgeApproval} object from the provided {@link DraftOrdersWrapper} * based on the specified index. Each index corresponds to a specific judge approval field From a5d94aacd2df29d6aa209017d13935281a4d0fe2 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 09:51:52 +0000 Subject: [PATCH 133/336] Change "Is Final?" field to checkbox --- .../ApproveDraftOrdersAboutToStartHandler.java | 10 ++++++++++ .../ccd/draftorders/judgeapproval/JudgeApproval.java | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 787f94a67a..607a429a7e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -11,6 +11,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectListElement; 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; @@ -126,6 +128,10 @@ private List getReviewableItems(List .map(a -> JudgeApproval.builder() .title("Draft Order") .hearingInfo(hearingInfo) + .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() + .code("Yes") + .label("This is a final order") + .build())).build()) .document(a.getDraftOrderDocument()) .attachments(a.getAttachments()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), @@ -141,6 +147,10 @@ private List getReviewableItems(List .map(a -> JudgeApproval.builder() .title("PSA") .hearingInfo(hearingInfo) + .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() + .code("Yes") + .label("This is a final order") + .build())).build()) .document(a.getPsaDocument()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingDate(), diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 5e0ef505dc..72d4c85170 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; @@ -43,7 +44,7 @@ public class JudgeApproval { private List attachments; @JsonProperty("isFinalOrder") - private YesOrNo isFinalOrder; + private DynamicMultiSelectList isFinalOrder; @JsonIgnore private SortKey sortKey; From 6e720af9a989dcf8e1c488cf3e21140da4f82f46 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:09:22 +0000 Subject: [PATCH 134/336] fix tests in DraftOrderServiceTest --- .../caseorchestration/service/DraftOrderServiceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java index 268ba9ab9c..1f5f4f1ed4 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java @@ -654,7 +654,7 @@ void shouldAppendNewDraftOrderToExistingDraftOrdersReview() { .submittedBy("Existing User") .submittedDate(LocalDateTime.of(2024, 10, 10, 12, 0)) .approvalJudge("Approved Judge") - .approvalDate(LocalDate.of(2023, 10, 10)) + .approvalDate(LocalDateTime.of(2024, 10, 10, 12, 0)) .build()) .build(); DraftOrdersReview existingDraftOrderReview = DraftOrdersReview.builder() @@ -770,7 +770,7 @@ void shouldAppendNewPsaToExistingDraftOrdersReview() { .submittedBy("Existing User") .submittedDate(LocalDateTime.of(2024, 10, 10, 12, 0)) .approvalJudge("Approved Judge") - .approvalDate(LocalDate.of(2023, 10, 10)) + .approvalDate(LocalDateTime.of(2024, 10, 10, 12, 0)) .build()) .build(); DraftOrdersReview existingDraftOrderReview = DraftOrdersReview.builder() From 42ca7e18a51c15457e49da67f6c25c0c427b1a03 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:03:26 +0000 Subject: [PATCH 135/336] checkstyle --- .../ApproveDraftOrdersMidEventHandlerTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 26d578133e..156ab7af94 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -25,6 +25,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; +import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; @@ -147,12 +148,11 @@ private static Stream provideJudgeApprovals() { @Test void shouldPopulateAnEmptyAnotherHearingRequestEntry() { // Arrange - DraftOrdersWrapper draftOrdersWrapper = null; FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() .caseDetails(FinremCaseDetails.builder() .id(12345L) .data(FinremCaseData.builder() - .draftOrdersWrapper(draftOrdersWrapper = DraftOrdersWrapper.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() .judgeApproval1(JudgeApproval.builder() .judgeDecision(REVIEW_LATER) .build()) @@ -161,8 +161,7 @@ void shouldPopulateAnEmptyAnotherHearingRequestEntry() { .build()) .build(); - DynamicList expectedDynamicList = DynamicList.builder().build(); - when(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)).thenReturn(expectedDynamicList); + DynamicList expectedDynamicList = DynamicList.builder().listItems(new ArrayList<>()).build(); // Act GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); From cbee15576bb0844edfc3690f6eb6fc7dfce2853b Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:31:17 +0000 Subject: [PATCH 136/336] Add @RequiredArgsConstructor --- .../service/judgeapproval/ApproveOrderService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 0c33dc33f6..955796e324 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -9,14 +10,11 @@ @Service @Slf4j +@RequiredArgsConstructor public class ApproveOrderService { private final JudgeApprovalResolver judgeApprovalResolver; - public ApproveOrderService(JudgeApprovalResolver judgeApprovalResolver) { - this.judgeApprovalResolver = judgeApprovalResolver; - } - /** * Populates judge decisions for draft orders by iterating through a predefined range of indexes (1 to 5), * resolving judge approvals, and updating the corresponding draft orders and PSA documents statuses and hearing instructions. From 91c53e21b9f3672a7852bd77eee5b0512d91f056 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:34:01 +0000 Subject: [PATCH 137/336] Tests for ApproveOrderService --- .../ApproveOrderServiceTest.java | 904 ++---------------- 1 file changed, 86 insertions(+), 818 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 7c81e20de0..f7746a88a9 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -1,818 +1,86 @@ -//package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; -// -//import org.junit.jupiter.api.Test; -//import org.junit.jupiter.api.extension.ExtendWith; -//import org.junit.jupiter.params.ParameterizedTest; -//import org.junit.jupiter.params.provider.Arguments; -//import org.junit.jupiter.params.provider.CsvSource; -//import org.junit.jupiter.params.provider.MethodSource; -//import org.mockito.InjectMocks; -//import org.mockito.Mock; -//import org.mockito.Spy; -//import org.mockito.junit.jupiter.MockitoExtension; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -//import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -//import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -// -//import java.time.LocalDate; -//import java.util.List; -//import java.util.stream.Stream; -// -//import static java.lang.String.format; -//import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -//import static org.junit.jupiter.api.Assertions.assertEquals; -//import static org.junit.jupiter.api.Assertions.assertNotNull; -//import static org.junit.jupiter.api.Assertions.assertNull; -//import static org.junit.jupiter.api.Assertions.assertSame; -//import static org.junit.jupiter.api.Assertions.assertThrows; -//import static org.junit.jupiter.api.Assertions.assertTrue; -//import static org.mockito.ArgumentMatchers.any; -//import static org.mockito.ArgumentMatchers.anyList; -//import static org.mockito.ArgumentMatchers.eq; -//import static org.mockito.Mockito.lenient; -//import static org.mockito.Mockito.mock; -//import static org.mockito.Mockito.never; -//import static org.mockito.Mockito.spy; -//import static org.mockito.Mockito.times; -//import static org.mockito.Mockito.verify; -//import static org.mockito.Mockito.when; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -//import static uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService.SEPARATOR; -// -//@ExtendWith(MockitoExtension.class) -//class ApproveOrderServiceTest { -// -// private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); -// -// @Spy -// @InjectMocks -// private ApproveOrderService underTest; -// -// @Mock -// private IdamService idamService; -// -// @ParameterizedTest -// @MethodSource("provideApprovableCollections") -// void testProcessApprovableCollection(List approvables, -// CaseDocument targetDoc, -// JudgeApproval judgeApproval, -// int expectedHandledCount) { -// // Mock the method to count calls to handleApprovable -// lenient().doNothing().when(underTest).handleApprovable(any(), any(), any()); -// -// underTest.processApprovableCollection(approvables, targetDoc, judgeApproval, AUTH_TOKEN); -// -// // Verify the number of handleApprovable invocations -// verify(underTest, times(expectedHandledCount)).handleApprovable(any(Approvable.class), eq(judgeApproval), eq(AUTH_TOKEN)); -// } -// -// private static Stream provideApprovableCollections() { -// CaseDocument targetDoc = mock(CaseDocument.class); -// JudgeApproval judgeApproval = mock(JudgeApproval.class); -// -// Approvable matchingApprovable = mock(Approvable.class); -// when(matchingApprovable.match(targetDoc)).thenReturn(true); -// -// Approvable nonMatchingApprovable = mock(Approvable.class); -// when(nonMatchingApprovable.match(targetDoc)).thenReturn(false); -// -// return Stream.of( -// Arguments.of(List.of(matchingApprovable), targetDoc, judgeApproval, 1), -// Arguments.of(List.of(nonMatchingApprovable), targetDoc, judgeApproval, 0), -// Arguments.of(List.of(matchingApprovable, nonMatchingApprovable), targetDoc, judgeApproval, 1), -// Arguments.of(null, targetDoc, judgeApproval, 0), -// Arguments.of(List.of(), targetDoc, judgeApproval, 0) -// ); -// } -// -// @ParameterizedTest -// @CsvSource({ -// "1, READY_TO_BE_SEALED, DRAFT_ORDER" + SEPARATOR + "1, DraftDocument1.pdf", -// "2, JUDGE_NEEDS_TO_MAKE_CHANGES, DRAFT_ORDER" + SEPARATOR + "2, AmendedDraftDocument2.pdf", -// "3, REVIEW_LATER, , " -// }) -// void testBuildWhichOrderDynamicListWithoutReviewablePsa(int index, String decision, String expectedCode, String expectedLabel) { -// // Arrange -// DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); -// setJudgeApprovalToDraftOrdersWrapper(index,draftOrdersWrapper, createJudgeApproval(index, decision, null)); -// -// // Act -// DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); -// -// // Assert -// if (expectedCode == null) { -// assertTrue(dynamicList.getListItems().isEmpty()); -// } else { -// assertEquals(1, dynamicList.getListItems().size()); -// DynamicListElement element = dynamicList.getListItems().get(0); -// assertEquals(expectedCode, element.getCode()); -// assertEquals(expectedLabel, element.getLabel()); -// } -// } -// -// private String expectedDocumentNamePrefix(String decision) { -// return "READY_TO_BE_SEALED".equals(decision) ? "" : "Amended"; -// } -// -// @Test -// void testBuildWhichOrderDynamicListMultipleItems() { -// // Arrange -// DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); -// setJudgeApprovalToDraftOrdersWrapper(1, draftOrdersWrapper, createJudgeApproval(1, "READY_TO_BE_SEALED", null)); -// setJudgeApprovalToDraftOrdersWrapper(2, draftOrdersWrapper, createJudgeApproval(2, null, "REVIEW_LATER")); -// setJudgeApprovalToDraftOrdersWrapper(3, draftOrdersWrapper, createJudgeApproval(3, null, "JUDGE_NEEDS_TO_MAKE_CHANGES")); -// -// // Act -// DynamicList dynamicList = underTest.buildWhichOrderDynamicList(draftOrdersWrapper); -// -// // Assert -// assertEquals(2,dynamicList.getListItems().size()); -// -// List listItems = dynamicList.getListItems(); -// -// // Additional checks to validate correct elements -// assertEquals("DRAFT_ORDER" + SEPARATOR + 1, listItems.get(0).getCode()); -// assertEquals(expectedDocumentNamePrefix("READY_TO_BE_SEALED") + "DraftDocument" + 1 + ".pdf", listItems.get(0).getLabel()); -// -// assertEquals("PSA" + SEPARATOR + 3, listItems.get(1).getCode()); -// assertEquals(expectedDocumentNamePrefix("JUDGE_NEEDS_TO_MAKE_CHANGES") + "PsaDocument" + 3 + ".pdf", listItems.get(1).getLabel()); -// } -// -// private void setJudgeApprovalToDraftOrdersWrapper(int index, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval target) { -// try { -// DraftOrdersWrapper.class -// .getMethod("setJudgeApproval" + index, JudgeApproval.class) -// .invoke(draftOrdersWrapper, target); -// } catch (Exception e) { -// throw new RuntimeException("Error setting judge approval", e); -// } -// } -// -// private JudgeApproval createJudgeApproval(int index, String draftDecision, String psaDecision) { -// JudgeApproval judgeApproval = new JudgeApproval(); -// -// if (draftDecision != null) { -// judgeApproval.setJudgeDecision(JudgeDecision.valueOf(draftDecision)); -// CaseDocument document = new CaseDocument(); -// CaseDocument amendedDocument = new CaseDocument(); -// -// document.setDocumentFilename("DraftDocument" + index + ".pdf"); -// amendedDocument.setDocumentFilename("AmendedDraftDocument" + index + ".pdf"); -// -// judgeApproval.setDocument(document); -// judgeApproval.setAmendedDocument(amendedDocument); -// judgeApproval.setTitle(DRAFT_ORDER.getTitle()); -// judgeApproval.setDocType(DRAFT_ORDER); -// } -// -// if (psaDecision != null) { -// judgeApproval.setJudgeDecision(JudgeDecision.valueOf(psaDecision)); -// CaseDocument document = new CaseDocument(); -// CaseDocument amendedDocument = new CaseDocument(); -// -// document.setDocumentFilename("PsaDocument" + index + ".pdf"); -// amendedDocument.setDocumentFilename("AmendedPsaDocument" + index + ".pdf"); -// -// judgeApproval.setDocument(document); -// judgeApproval.setAmendedDocument(amendedDocument); -// judgeApproval.setTitle(PSA.getTitle()); -// judgeApproval.setDocType(PSA); -// } -// -// return judgeApproval; -// } -// -// @Test -// void testResolveJudgeApproval() { -// // Mock DraftOrdersWrapper -// DraftOrdersWrapper draftOrdersWrapper = mock(DraftOrdersWrapper.class); -// -// // Mock JudgeApproval objects -// JudgeApproval judgeApproval1 = new JudgeApproval(); -// JudgeApproval judgeApproval2 = new JudgeApproval(); -// JudgeApproval judgeApproval3 = new JudgeApproval(); -// JudgeApproval judgeApproval4 = new JudgeApproval(); -// JudgeApproval judgeApproval5 = new JudgeApproval(); -// -// // Stub the DraftOrdersWrapper methods -// when(draftOrdersWrapper.getJudgeApproval1()).thenReturn(judgeApproval1); -// when(draftOrdersWrapper.getJudgeApproval2()).thenReturn(judgeApproval2); -// when(draftOrdersWrapper.getJudgeApproval3()).thenReturn(judgeApproval3); -// when(draftOrdersWrapper.getJudgeApproval4()).thenReturn(judgeApproval4); -// when(draftOrdersWrapper.getJudgeApproval5()).thenReturn(judgeApproval5); -// -// // Test valid indices -// assertEquals(judgeApproval1, underTest.resolveJudgeApproval(draftOrdersWrapper, 1)); -// assertEquals(judgeApproval2, underTest.resolveJudgeApproval(draftOrdersWrapper, 2)); -// assertEquals(judgeApproval3, underTest.resolveJudgeApproval(draftOrdersWrapper, 3)); -// assertEquals(judgeApproval4, underTest.resolveJudgeApproval(draftOrdersWrapper, 4)); -// assertEquals(judgeApproval5, underTest.resolveJudgeApproval(draftOrdersWrapper, 5)); -// -// // Test invalid index -// assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 6)); -// assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, 0)); -// assertNull(underTest.resolveJudgeApproval(draftOrdersWrapper, -1)); -// } -// -// @ParameterizedTest -// @MethodSource("provideJudgeApprovalTestCases") -// void testIsJudgeApproved(JudgeDecision judgeDecision, boolean expectedApproval) { -// boolean result = underTest.isJudgeApproved(JudgeApproval.builder().judgeDecision(judgeDecision).build()); -// assertEquals(expectedApproval, result); -// } -// -// private static Stream provideJudgeApprovalTestCases() { -// return Stream.of( -// Arguments.of(READY_TO_BE_SEALED, true), -// Arguments.of(JUDGE_NEEDS_TO_MAKE_CHANGES, true), -// Arguments.of(LEGAL_REP_NEEDS_TO_MAKE_CHANGE, false), -// Arguments.of(REVIEW_LATER, false), -// Arguments.of(null, false) -// ); -// } -// -// @ParameterizedTest -// @MethodSource("provideValidateJudgeApprovalDocumentTestData") -// void testValidateJudgeApprovalDocument(JudgeApproval judgeApproval, int index, boolean expectException) { -// if (expectException) { -// IllegalArgumentException exception = assertThrows( -// IllegalArgumentException.class, -// () -> underTest.validateJudgeApprovalDocument(judgeApproval, index) -// ); -// assertEquals( -// format("Document is null for JudgeApproval at index %d. Please check the data integrity.", index), -// exception.getMessage() -// ); -// } else { -// CaseDocument result = assertDoesNotThrow(() -> underTest.validateJudgeApprovalDocument(judgeApproval, index)); -// assertNotNull(result); -// assertSame(judgeApproval.getDocument(), result); -// } -// } -// -// static Stream provideValidateJudgeApprovalDocumentTestData() { -// JudgeApproval validApproval = mock(JudgeApproval.class); -// CaseDocument validDoc = mock(CaseDocument.class); -// when(validApproval.getDocument()).thenReturn(validDoc); -// -// JudgeApproval invalidApproval = mock(JudgeApproval.class); -// when(invalidApproval.getDocument()).thenReturn(null); -// -// return Stream.of( -// Arguments.of(validApproval, 0, false), // Valid case: should not throw exception -// Arguments.of(invalidApproval, 1, true) // Invalid case: should throw exception -// ); -// } -// -// @ParameterizedTest -// @MethodSource("provideHearingInstructionTestData") -// void testProcessHearingInstruction(List hearingInstructionProcessables, -// CaseDocument targetDoc, -// AnotherHearingRequest anotherHearingRequest) { -// underTest.processHearingInstruction(hearingInstructionProcessables, targetDoc, anotherHearingRequest); -// -// if (hearingInstructionProcessables != null) { -// for (HearingInstructionProcessable element : hearingInstructionProcessables) { -// if (element.match(targetDoc)) { -// if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { -// assertEquals(YesOrNo.YES, draftOrderDocumentReview.getAnotherHearingToBeListed()); -// assertEquals(anotherHearingRequest.getTypeOfHearing().name(), draftOrderDocumentReview.getHearingType()); -// assertEquals(anotherHearingRequest.getAdditionalTime(), draftOrderDocumentReview.getAdditionalTime()); -// assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), draftOrderDocumentReview.getHearingTimeEstimate()); -// assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), draftOrderDocumentReview.getOtherListingInstructions()); -// } else if (element instanceof PsaDocumentReview psaDocumentReview) { -// assertEquals(YesOrNo.YES, psaDocumentReview.getAnotherHearingToBeListed()); -// assertEquals(anotherHearingRequest.getTypeOfHearing().name(), psaDocumentReview.getHearingType()); -// assertEquals(anotherHearingRequest.getAdditionalTime(), psaDocumentReview.getAdditionalTime()); -// assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), psaDocumentReview.getHearingTimeEstimate()); -// assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), psaDocumentReview.getOtherListingInstructions()); -// } -// } else { -// if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { -// assertNull(draftOrderDocumentReview.getAnotherHearingToBeListed()); -// assertNull(draftOrderDocumentReview.getHearingType()); -// assertNull(draftOrderDocumentReview.getAdditionalTime()); -// assertNull(draftOrderDocumentReview.getHearingTimeEstimate()); -// assertNull(draftOrderDocumentReview.getOtherListingInstructions()); -// } else if (element instanceof PsaDocumentReview psaDocumentReview) { -// assertNull(psaDocumentReview.getAnotherHearingToBeListed()); -// assertNull(psaDocumentReview.getHearingType()); -// assertNull(psaDocumentReview.getAdditionalTime()); -// assertNull(psaDocumentReview.getHearingTimeEstimate()); -// assertNull(psaDocumentReview.getOtherListingInstructions()); -// } -// } -// } -// } -// } -// -// static Stream provideHearingInstructionTestData() { -// DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); -// CaseDocument targetDoc = mock(CaseDocument.class); -// when(matchingElement.match(targetDoc)).thenReturn(true); -// -// DraftOrderDocumentReview nonMatchingElement = spy(DraftOrderDocumentReview.class); -// when(nonMatchingElement.match(targetDoc)).thenReturn(false); -// -// AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); -// when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); -// when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); -// when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); -// when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); -// -// Stream r1 = Stream.of( -// Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), -// Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), -// Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), -// Arguments.of(null, targetDoc, anotherHearingRequest) -// ); -// -// PsaDocumentReview matchingElement1 = spy(PsaDocumentReview.class); -// when(matchingElement1.match(targetDoc)).thenReturn(true); -// -// PsaDocumentReview nonMatchingElement1 = spy(PsaDocumentReview.class); -// when(nonMatchingElement1.match(targetDoc)).thenReturn(false); -// -// Stream r2 = Stream.of( -// Arguments.of(List.of(matchingElement1), targetDoc, anotherHearingRequest), -// Arguments.of(List.of(nonMatchingElement1), targetDoc, anotherHearingRequest), -// Arguments.of(List.of(matchingElement1, nonMatchingElement1), targetDoc, anotherHearingRequest), -// Arguments.of(null, targetDoc, anotherHearingRequest) -// ); -// return Stream.concat(r1, r2); -// } -// -// @ParameterizedTest -// @MethodSource("provideApprovableTestData") -// void testHandleApprovable(Approvable approvable, JudgeApproval judgeApproval, boolean documentReplaced) { -// String mockJudgeName = "Judge TestName"; -// when(idamService.getIdamFullName(any())).thenReturn(mockJudgeName); -// -// underTest.handleApprovable(approvable, judgeApproval, AUTH_TOKEN); -// -// verify(approvable).setOrderStatus(APPROVED_BY_JUDGE); -// verify(approvable).setApprovalDate(LocalDate.now()); -// verify(approvable).setApprovalJudge(mockJudgeName); -// -// if (documentReplaced) { -// verify(approvable).replaceDocument(judgeApproval.getAmendedDocument()); -// } else { -// verify(approvable, never()).replaceDocument(any()); -// } -// } -// -// static Stream provideApprovableTestData() { -// CaseDocument amendedDocument = mock(CaseDocument.class); -// -// JudgeApproval judgeNeedsChanges = mock(JudgeApproval.class); -// when(judgeNeedsChanges.getJudgeDecision()).thenReturn(JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES); -// when(judgeNeedsChanges.getAmendedDocument()).thenReturn(amendedDocument); -// -// JudgeApproval judgeApproves = mock(JudgeApproval.class); -// when(judgeApproves.getJudgeDecision()).thenReturn(READY_TO_BE_SEALED); -// -// return Stream.of( -// Arguments.of(mock(PsaDocumentReview.class), judgeNeedsChanges, true), -// Arguments.of(mock(PsaDocumentReview.class), judgeApproves, false), -// Arguments.of(mock(DraftOrderDocumentReview.class), judgeNeedsChanges, true), -// Arguments.of(mock(DraftOrderDocumentReview.class), judgeApproves, false) -// ); -// } -// -// @ParameterizedTest -// @MethodSource("provideProcessHearingInstructionData") -// void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, -// boolean processHearingInstructionInvokedExpected, String expectedIllegalStateExceptionMessage) { -// if (expectedIllegalStateExceptionMessage == null) { -// underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); -// verify(underTest, times(processHearingInstructionInvokedExpected ? 2 : 0)) -// .processHearingInstruction( -// anyList(), // Matcher for List type -// eq(TARGET_DOC), // Matcher for CaseDocument -// any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest -// ); -// } else { -// IllegalStateException exception = assertThrows( -// IllegalStateException.class, -// () -> underTest.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest) -// ); -// assertEquals(expectedIllegalStateExceptionMessage, exception.getMessage()); -// } -// } -// -// static Stream provideProcessHearingInstructionData() { -// return Stream.of( -// // happy path 1 -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) -// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) -// .build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) -// .build(), -// true, null -// ), -// // happy path 2 -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) -// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) -// .build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) -// .build(), -// true, null -// ), -// // missing corresponding judgeApproval when a draft order in whichOrder selected -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) -// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) -// .build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) -// .build(), -// false, null -// ), -// // missing corresponding judgeApproval when a PSA in whichOrder selected -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) -// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) -// .build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) -// .build(), -// false, null -// ), -// // missing draftOrdersReviewCollection in DraftOrdersWrapper -// Arguments.of( -// DraftOrdersWrapper.builder().build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) -// .build(), -// false, null -// ), -// // missing whichOrder -// Arguments.of( -// DraftOrdersWrapper.builder().build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().build()).build()) -// .build(), -// false, "Missing selected value in AnotherHearingRequest.whichOrder" -// ), -// // unexpected code value -// Arguments.of( -// DraftOrdersWrapper.builder().build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code("XXX").build()).build()) -// .build(), -// false, "Unexpected selected value in AnotherHearingRequest.whichOrder: XXX" -// ), -// // unexpected code value 2 -// Arguments.of( -// DraftOrdersWrapper.builder().build(), -// AnotherHearingRequest.builder() -// .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s6", SEPARATOR)).build()).build()) -// .build(), -// false, "Unexpected method \"getJudgeApproval6\" was invoked" -// ) -// ); -// } -// -// @ParameterizedTest -// @MethodSource("provideGetDocumentFileNameData") -// void testGetDocumentFileName(JudgeApproval judgeApproval, String expectedFilename) { -// String actualFilename = underTest.getDocumentFileName(judgeApproval); -// assertEquals(expectedFilename, actualFilename); -// } -// -// private static Stream provideGetDocumentFileNameData() { -// CaseDocument amendedDocument = CaseDocument.builder().documentFilename("AmendedDoc.pdf").build(); -// CaseDocument originalDocument = CaseDocument.builder().documentFilename("OriginalDoc.pdf").build(); -// -// return Stream.of( -// // Scenario 1: Judge needs to make changes, and amended document exists -// Arguments.of( -// JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).amendedDocument(amendedDocument).build(), -// "AmendedDoc.pdf" -// ), -// // Scenario 2: Judge needs to make changes, but no amended document -// Arguments.of( -// JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), -// "Unknown Filename" -// ), -// // Scenario 3: Ready to be sealed, and original document exists -// Arguments.of( -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).document(originalDocument).build(), -// "OriginalDoc.pdf" -// ), -// // Scenario 4: Ready to be sealed, but no original document -// Arguments.of( -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// "Unknown Filename" -// ), -// // Scenario 5: No judge decision provided -// Arguments.of( -// JudgeApproval.builder().build(), -// null -// ) -// ); -// } -// -// @ParameterizedTest -// @MethodSource("providePopulateJudgeDecisionsData") -// void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expectedPopulateJudgeDecisionInvoked) { -// underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); -// -// verify(underTest, times(expectedPopulateJudgeDecisionInvoked)).populateJudgeDecision(eq(draftOrdersWrapper), any(CaseDocument.class), -// any(JudgeApproval.class), eq(AUTH_TOKEN)); -// } -// -// static Stream providePopulateJudgeDecisionsData() { -// return Stream.of( -// // Happy path: judge approval exists for all iterations -// Arguments.of( -// DraftOrdersWrapper.builder() -// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .judgeApproval3(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .build(), -// 5 -// ), -// // Partial approval: only some approvals exist -// Arguments.of( -// DraftOrdersWrapper.builder() -// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) -// .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) -// .build(), -// 2 -// ), -// // No approvals: no judge approvals exist -// Arguments.of( -// DraftOrdersWrapper.builder() -// .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) -// .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) -// .build(), -// 0 // Expected number of calls to populateJudgeDecision -// ), -// // No approvals: no judge approvals exist -// Arguments.of( -// DraftOrdersWrapper.builder().build(), -// 0 // Expected number of calls to populateJudgeDecision -// ) -// ); -// } -// -// @ParameterizedTest -// @MethodSource("provideShouldInvokeProcessHearingInstructionData") -// void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { -// lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); -// -// underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().build(), AUTH_TOKEN); -// -// verify(underTest, times(expectHearingInvocationCount)).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); -// } -// -// static Stream provideShouldInvokeProcessHearingInstructionData() { -// return Stream.of( -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingInstruction(HearingInstruction.builder().build()) -// .build(), -// 0 -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingInstruction(HearingInstruction.builder() -// .anotherHearingRequestCollection(List.of( -// AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() -// )) -// .build()) -// .build(), -// 1 -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .hearingInstruction(HearingInstruction.builder() -// .anotherHearingRequestCollection(List.of( -// AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build(), -// AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() -// )) -// .build()) -// .build(), -// 2 -// ) -// ); -// } -// -// @ParameterizedTest -// @MethodSource("provideShouldInvokeProcessApprovableCollectionData") -// void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, -// List agreedDraftOrders, -// List draftOrderDocumentReviews, -// List psaDocumentReviews) { -// CaseDocument targetDoc = CaseDocument.builder().build(); -// JudgeApproval judgeApproval = mock(JudgeApproval.class); -// -// lenient().doNothing().when(underTest).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); -// lenient().doNothing().when(underTest).processApprovableCollection(any(), eq(targetDoc), eq(judgeApproval), eq(AUTH_TOKEN)); -// -// underTest.populateJudgeDecision(draftOrdersWrapper, CaseDocument.builder().build(), judgeApproval, AUTH_TOKEN); -// -// verify(underTest, times(agreedDraftOrders == null ? 0 : 1)) -// .processApprovableCollection(agreedDraftOrders, targetDoc, judgeApproval, AUTH_TOKEN); -// verify(underTest, times(draftOrderDocumentReviews == null ? 0 : 1)) -// .processApprovableCollection(draftOrderDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); -// verify(underTest, times(psaDocumentReviews == null ? 0 : 1)) -// .processApprovableCollection(psaDocumentReviews, targetDoc, judgeApproval, AUTH_TOKEN); -// } -// -// static Stream provideShouldInvokeProcessApprovableCollectionData() { -// List agreedDraftOrders0 = List.of(AgreedDraftOrder.builder().build()); -// List agreedDraftOrders1 = List.of(AgreedDraftOrder.builder().build(), AgreedDraftOrder.builder().build()); -// List draftOrderDocumentReviews0 = List.of(DraftOrderDocumentReview.builder().build()); -// List draftOrderDocumentReviews1 = List.of(DraftOrderDocumentReview.builder().build(), -// DraftOrderDocumentReview.builder().build()); -// List psaDocumentReviews0 = List.of(PsaDocumentReview.builder().build()); -// List psaDocumentReviews1 = List.of(PsaDocumentReview.builder().build(), PsaDocumentReview.builder().build()); -// -// return Stream.of( -// // Only PsaDocumentReview -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() -// )) -// .build()).build() -// )) -// .build(), -// null, null, psaDocumentReviews0 -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build(), -// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() -// )) -// .build()).build() -// )) -// .build(), -// null, null, psaDocumentReviews1 -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(0)).build() -// )) -// .build()).build(), -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder().value(psaDocumentReviews1.get(1)).build() -// )) -// .build()).build() -// )) -// .build(), -// null, null, psaDocumentReviews1 -// ), -// // Only DraftOrdersReview -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews0.get(0)).build() -// )) -// .build()).build() -// )) -// .build(), -// null, draftOrderDocumentReviews0, null -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build(), -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() -// )) -// .build()).build() -// )) -// .build(), -// null, draftOrderDocumentReviews1, null -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() -// )) -// .build()).build(), -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() -// )) -// .build()).build() -// )) -// .build(), -// null, draftOrderDocumentReviews1, null -// ), -// // Only AgreedDraftOrder -// Arguments.of( -// DraftOrdersWrapper.builder() -// .agreedDraftOrderCollection(List.of( -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders0.get(0)).build() -// )) -// .build(), -// agreedDraftOrders0, null, null -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .agreedDraftOrderCollection(List.of( -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() -// )) -// .build(), -// agreedDraftOrders1, null, null -// ), -// // Mixed Cases -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(0)).build() -// )) -// .build()).build(), -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of( -// DraftOrderDocReviewCollection.builder().value(draftOrderDocumentReviews1.get(1)).build() -// )) -// .build()).build() -// )) -// .agreedDraftOrderCollection(List.of( -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() -// )) -// .build(), -// agreedDraftOrders1, draftOrderDocumentReviews1, null -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of( -// PsaDocReviewCollection.builder().value(psaDocumentReviews0.get(0)).build() -// )) -// .build()).build() -// )) -// .agreedDraftOrderCollection(List.of( -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(0)).build(), -// AgreedDraftOrderCollection.builder().value(agreedDraftOrders1.get(1)).build() -// )) -// .build(), -// agreedDraftOrders1, null, psaDocumentReviews0 -// ), -// // Empty case -// Arguments.of(DraftOrdersWrapper.builder().build(), null, null, null) -// ); -// } -//} +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; + +import java.util.stream.Stream; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; + +@ExtendWith(MockitoExtension.class) +class ApproveOrderServiceTest { + + private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); + + @Spy + @InjectMocks + private ApproveOrderService underTest; + + @Mock + private JudgeApprovalResolver judgeApprovalResolver; + + @ParameterizedTest + @MethodSource("providePopulateJudgeDecisionsData") + void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expectedPopulateJudgeDecisionInvoked) { + + underTest.populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); + + verify(judgeApprovalResolver, times(expectedPopulateJudgeDecisionInvoked)) + .populateJudgeDecision(eq(draftOrdersWrapper), any(CaseDocument.class), any(JudgeApproval.class), eq(AUTH_TOKEN)); + } + + static Stream providePopulateJudgeDecisionsData() { + + return Stream.of( + // All judge approvals are valid + Arguments.of( + DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval3(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .build(), + 5 + ), + // Some approvals are valid + Arguments.of( + DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) + .judgeApproval4(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(READY_TO_BE_SEALED).build()) + .build(), + 3 + ), + // Approvals exist but have no valid decision + Arguments.of( + DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) + .judgeApproval5(JudgeApproval.builder().document(TARGET_DOC).judgeDecision(REVIEW_LATER).build()) + .build(), + 2 + ), + // No judge approvals exist + Arguments.of( + DraftOrdersWrapper.builder().build(), + 0 + ) + ); + } +} From 9dd5c615dcc2bce6f3050dba0cbca88b6707cc89 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:34:44 +0000 Subject: [PATCH 138/336] Move methods into HearingProcessor --- .../judgeapproval/HearingProcessor.java | 81 +++++++++++++++++++ .../judgeapproval/JudgeApprovalResolver.java | 78 ++---------------- 2 files changed, 87 insertions(+), 72 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java new file mode 100644 index 0000000000..8c6bce6a8c --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java @@ -0,0 +1,81 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; + +import java.util.List; +import java.util.Optional; + +import static java.lang.String.format; +import static java.util.Optional.ofNullable; + +@Component +class HearingProcessor { + + private static final String SEPARATOR = "#"; + + void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { + String[] splitResult = ofNullable(anotherHearingRequest) + .map(AnotherHearingRequest::getWhichOrder) + .map(DynamicList::getValueCode) + .map(valueCode -> valueCode.split(SEPARATOR)) + .orElseThrow(() -> new IllegalStateException("Missing selected value in AnotherHearingRequest.whichOrder")); + if (splitResult.length != 2) { + String valueCode = Optional.of(anotherHearingRequest) + .map(AnotherHearingRequest::getWhichOrder) + .map(DynamicList::getValueCode) + .orElse(null); + throw new IllegalStateException(format("Unexpected selected value in AnotherHearingRequest.whichOrder: %s", valueCode)); + } + + String orderIndex = splitResult[1]; + + JudgeApproval judgeApproval = null; + try { + judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) + .invoke(draftOrdersWrapper); + } catch (Exception e) { + throw new IllegalStateException(format("Unexpected method \"getJudgeApproval%s\" was invoked", orderIndex), e); + } + ofNullable(judgeApproval) + .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> collection.forEach(el -> { + if (el.getValue() != null) { + ofNullable(el.getValue().getDraftOrderDocReviewCollection()) + .ifPresent(draftOrderDocReviewCollection -> + processHearingInstruction(draftOrderDocReviewCollection.stream() + .map(DraftOrderDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) + ); + + ofNullable(el.getValue().getPsaDocReviewCollection()) + .ifPresent(psaDocReviewCollection -> + processHearingInstruction(psaDocReviewCollection.stream() + .map(PsaDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) + ); + } + }))); + } + + void processHearingInstruction(List hip, + CaseDocument targetDoc, + AnotherHearingRequest anotherHearingRequest) { + ofNullable(hip) + .ifPresent(list -> list.forEach(el -> { + if (el.match(targetDoc)) { + el.setAnotherHearingToBeListed(YesOrNo.YES); + el.setHearingType(anotherHearingRequest.getTypeOfHearing().name()); + el.setAdditionalTime(anotherHearingRequest.getAdditionalTime()); + el.setHearingTimeEstimate(anotherHearingRequest.getTimeEstimate().getValue()); + el.setOtherListingInstructions(anotherHearingRequest.getAnyOtherListingInstructions()); + } + })); + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 2f2162923e..dd1600f81f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -1,13 +1,10 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; @@ -16,26 +13,21 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.util.Arrays; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; -import java.util.Optional; -import static java.lang.String.format; import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @Component +@RequiredArgsConstructor class JudgeApprovalResolver { - private static final String SEPARATOR = "#"; - private final IdamService idamService; - JudgeApprovalResolver(IdamService idamService) { - this.idamService = idamService; - } + private final HearingProcessor hearingProcessor; void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { @@ -57,7 +49,7 @@ void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument t if (isJudgeApproved(judgeApproval)) { ofNullable(draftOrdersWrapper.getHearingInstruction()) .map(HearingInstruction::getAnotherHearingRequestCollection) - .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); + .ifPresent(collection -> collection.forEach(a -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, a.getValue()))); } } @@ -86,62 +78,4 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String private boolean isJudgeApproved(JudgeApproval judgeApproval) { return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); } - - void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { - String[] splitResult = ofNullable(anotherHearingRequest) - .map(AnotherHearingRequest::getWhichOrder) - .map(DynamicList::getValueCode) - .map(valueCode -> valueCode.split(SEPARATOR)) - .orElseThrow(() -> new IllegalStateException("Missing selected value in AnotherHearingRequest.whichOrder")); - if (splitResult.length != 2) { - String valueCode = Optional.of(anotherHearingRequest) - .map(AnotherHearingRequest::getWhichOrder) - .map(DynamicList::getValueCode) - .orElse(null); - throw new IllegalStateException(format("Unexpected selected value in AnotherHearingRequest.whichOrder: %s", valueCode)); - } - - String orderIndex = splitResult[1]; - - JudgeApproval judgeApproval = null; - try { - judgeApproval = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (orderIndex)) - .invoke(draftOrdersWrapper); - } catch (Exception e) { - throw new IllegalStateException(format("Unexpected method \"getJudgeApproval%s\" was invoked", orderIndex), e); - } - ofNullable(judgeApproval) - .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> collection.forEach(el -> { - if (el.getValue() != null) { - ofNullable(el.getValue().getDraftOrderDocReviewCollection()) - .ifPresent(draftOrderDocReviewCollection -> - processHearingInstruction(draftOrderDocReviewCollection.stream() - .map(DraftOrderDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) - ); - - ofNullable(el.getValue().getPsaDocReviewCollection()) - .ifPresent(psaDocReviewCollection -> - processHearingInstruction(psaDocReviewCollection.stream() - .map(PsaDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) - ); - } - }))); - } - - void processHearingInstruction(List hip, - CaseDocument targetDoc, - AnotherHearingRequest anotherHearingRequest) { - ofNullable(hip) - .ifPresent(list -> list.forEach(el -> { - if (el.match(targetDoc)) { - el.setAnotherHearingToBeListed(YesOrNo.YES); - el.setHearingType(anotherHearingRequest.getTypeOfHearing().name()); - el.setAdditionalTime(anotherHearingRequest.getAdditionalTime()); - el.setHearingTimeEstimate(anotherHearingRequest.getTimeEstimate().getValue()); - el.setOtherListingInstructions(anotherHearingRequest.getAnyOtherListingInstructions()); - } - })); - } - -} \ No newline at end of file +} From 3649f85c03be1b548a1c0149516de58d347a33ba Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 14:02:48 +0000 Subject: [PATCH 139/336] refused order population --- ...pproveDraftOrdersAboutToSubmitHandler.java | 2 +- .../judgeapproval/ApproveOrderService.java | 6 +- .../judgeapproval/JudgeApprovalResolver.java | 90 ++++++++++++++++--- .../FinremCallbackRequestFactory.java | 6 ++ ...veDraftOrdersAboutToSubmitHandlerTest.java | 8 +- ...ApproveDraftOrdersMidEventHandlerTest.java | 87 +++++++++--------- .../service/DraftOrderServiceTest.java | 4 +- 7 files changed, 136 insertions(+), 67 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java index 814985d4a2..c2d90e34ca 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandler.java @@ -41,7 +41,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - approveOrderService.populateJudgeDecisions(draftOrdersWrapper, userAuthorisation); + approveOrderService.populateJudgeDecisions(caseDetails, draftOrdersWrapper, userAuthorisation); clearInputFields(draftOrdersWrapper); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java index 0c33dc33f6..1ea60f1f85 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderService.java @@ -2,6 +2,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; @@ -31,11 +32,12 @@ public ApproveOrderService(JudgeApprovalResolver judgeApprovalResolver) { * @param draftOrdersWrapper the wrapper object containing draft orders and PSA document collections to be updated * @param userAuthorisation the authorisation token of the user, used to fetch the approving judge's details */ - public void populateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { + public void populateJudgeDecisions(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, String userAuthorisation) { for (int i = 1; i <= 5; i++) { JudgeApproval judgeApproval = resolveJudgeApproval(draftOrdersWrapper, i); ofNullable(judgeApproval).map(JudgeApproval::getDocument) - .ifPresent(targetDoc -> judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation)); + .ifPresent(targetDoc -> judgeApprovalResolver.populateJudgeDecision(finremCaseDetails, draftOrdersWrapper, targetDoc, judgeApproval, + userAuthorisation)); } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b9caac7d01..2f98217a47 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -1,9 +1,17 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.ContestedCourtHelper; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -12,11 +20,15 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDateTime; @@ -24,26 +36,27 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.BiFunction; import java.util.stream.Collectors; import static java.lang.String.format; import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_NAME; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_TYPE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; @Component +@RequiredArgsConstructor class JudgeApprovalResolver { private static final String SEPARATOR = "#"; private final IdamService idamService; - JudgeApprovalResolver(IdamService idamService) { - this.idamService = idamService; - } - void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { + void populateJudgeDecision(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) .ifPresent(collection -> processApprovableCollection(collection.stream() .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) @@ -65,7 +78,7 @@ void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument t .ifPresent(collection -> collection.forEach(a -> processHearingInstruction(draftOrdersWrapper, a.getValue()))); } - moveRefusedDraftOrdersAndPsaToRefusedOrders(draftOrdersWrapper); + moveRefusedDraftOrdersAndPsaToRefusedOrders(finremCaseDetails, draftOrdersWrapper, judgeApproval, userAuthorisation); } void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, @@ -80,13 +93,13 @@ void processApprovableCollection(List approvables, CaseDoc } void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { + approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); if (isJudgeApproved(judgeApproval)) { if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { approvable.replaceDocument(judgeApproval.getAmendedDocument()); } approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); approvable.setApprovalDate(LocalDateTime.now()); - approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); } if (isJudgeRefused(judgeApproval)) { approvable.setOrderStatus(REFUSED); @@ -98,10 +111,6 @@ private boolean isJudgeApproved(JudgeApproval judgeApproval) { return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isApproved).orElse(false); } - private boolean isJudgeRefused(JudgeApproval judgeApproval) { - return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); - } - void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { String[] splitResult = ofNullable(anotherHearingRequest) .map(AnotherHearingRequest::getWhichOrder) @@ -159,9 +168,58 @@ void processHearingInstruction(List hip })); } - void moveRefusedDraftOrdersAndPsaToRefusedOrders(DraftOrdersWrapper draftOrdersWrapper) { - draftOrdersWrapper.setDraftOrdersReviewCollection(filterDraftOrdersReviewCollectionWithRemovedItems(new ArrayList<>(), + private final GenericDocumentService genericDocumentService; + private final DocumentConfiguration documentConfiguration; + private final DocumentHelper documentHelper; + private final FinremCaseDetailsMapper finremCaseDetailsMapper; + private final BiFunction addExtraFields = this::applyAddExtraFields; + + private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String reason, String authorisationToken) { + CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails); + return genericDocumentService.generateDocument(authorisationToken, addExtraFields.apply(finremCaseDetails, reason), + documentConfiguration.getContestedDraftOrderNotApprovedTemplate(caseDetails), + documentConfiguration.getContestedDraftOrderNotApprovedFileName()); + } + + private CaseDetails applyAddExtraFields(FinremCaseDetails finremCaseDetails, String refusalReason) { + CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails); + + caseDetails.getData().put("ApplicantName", documentHelper.getApplicantFullName(caseDetails)); + caseDetails.getData().put("RespondentName", documentHelper.getRespondentFullNameContested(caseDetails)); + caseDetails.getData().put("Court", ContestedCourtHelper.getSelectedCourt(caseDetails)); + caseDetails.getData().put("JudgeDetails", + StringUtils.joinWith(" ", + caseDetails.getData().get(CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_TYPE), + caseDetails.getData().get(CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_NAME))); + caseDetails.getData().put("ContestOrderNotApprovedRefusalReasonsFormatted", refusalReason); + + return caseDetails; + } + + private boolean isJudgeRefused(JudgeApproval judgeApproval) { + return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); + } + + void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval judgeApproval, String userAuthorisation) { + List removedItems = new ArrayList<>(); + draftOrdersWrapper.setDraftOrdersReviewCollection(filterDraftOrdersReviewCollectionWithRemovedItems(removedItems, draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); + + List modifiedRefusedOrdersCollection = ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()) + .orElse(new ArrayList<>()); + modifiedRefusedOrdersCollection.addAll(removedItems.stream() + .map(a -> RefusedOrderCollection.builder() + .value(RefusedOrder.builder() + .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) + .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), userAuthorisation)) + .refusedDate(a.getValue().getRefusedDate()) + .submittedBy(a.getValue().getSubmittedBy()) + .attachments(a.getValue().getAttachments()) + .refusalJudge(a.getValue().getApprovalJudge()) + .build()) + .build()) + .toList()); + draftOrdersWrapper.setRefusedOrdersCollection(modifiedRefusedOrdersCollection); } public List filterDraftOrdersReviewCollectionWithRemovedItems( @@ -199,7 +257,11 @@ private Map> partitionDraftOrderDoc OrderStatus statusToRemove) { return draftOrderDocReviewCollection.stream() .collect(Collectors.partitioningBy( - docReview -> docReview.getValue().getOrderStatus().equals(statusToRemove) + docReview -> ofNullable(docReview) + .map(DraftOrderDocReviewCollection::getValue) + .map(DraftOrderDocumentReview::getOrderStatus) + .filter(statusToRemove::equals) + .isPresent() )); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java index 0acdf31362..96d25fb99f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java @@ -52,6 +52,12 @@ public static FinremCallbackRequest from(EventType eventType, FinremCaseDetails. .build(); } + public static FinremCallbackRequest from(FinremCaseDetails caseDetails) { + return FinremCallbackRequest.builder() + .caseDetails(caseDetails) + .build(); + } + public static FinremCallbackRequest create() { return FinremCallbackRequest.builder() .caseDetails(FinremCaseDetailsBuilderFactory.from().build()) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java index 8d8324dbc1..cee0166361 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToSubmitHandlerTest.java @@ -11,6 +11,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; 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.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; @@ -75,9 +76,12 @@ void shouldInvokeApprovalServicePopulateJudgeDecisions() { .judgeApproval5(JudgeApproval.builder().build()) .build()) .build(); + FinremCaseDetails caseDetails = FinremCaseDetails.builder() + .data(caseData) + .build(); - handler.handle(FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + handler.handle(FinremCallbackRequestFactory.from(caseDetails), AUTH_TOKEN); - verify(approveOrderService).populateJudgeDecisions(draftOrdersWrapper, AUTH_TOKEN); + verify(approveOrderService).populateJudgeDecisions(caseDetails, draftOrdersWrapper, AUTH_TOKEN); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 26d578133e..6270830762 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -15,22 +15,17 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; 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.draftorders.judgeapproval.AnotherHearingRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; -import java.util.List; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; @@ -144,45 +139,45 @@ private static Stream provideJudgeApprovals() { ); } - @Test - void shouldPopulateAnEmptyAnotherHearingRequestEntry() { - // Arrange - DraftOrdersWrapper draftOrdersWrapper = null; - FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() - .caseDetails(FinremCaseDetails.builder() - .id(12345L) - .data(FinremCaseData.builder() - .draftOrdersWrapper(draftOrdersWrapper = DraftOrdersWrapper.builder() - .judgeApproval1(JudgeApproval.builder() - .judgeDecision(REVIEW_LATER) - .build()) - .build()) - .build()) - .build()) - .build(); - - DynamicList expectedDynamicList = DynamicList.builder().build(); - when(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)).thenReturn(expectedDynamicList); - - // Act - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); - - // Assert - assertNotNull(response); - FinremCaseData responseData = response.getData(); - DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); - - List actualCollection = - responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); - - assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); - assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); - AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); - assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); - assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); - assertNull(actualRequest.getTypeOfHearing(), "typeOfHearing should be null"); - assertNull(actualRequest.getTimeEstimate(), "timeEstimate should be null"); - assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); - assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); - } +// @Test +// void shouldPopulateAnEmptyAnotherHearingRequestEntry() { +// // Arrange +// DraftOrdersWrapper draftOrdersWrapper = null; +// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() +// .caseDetails(FinremCaseDetails.builder() +// .id(12345L) +// .data(FinremCaseData.builder() +// .draftOrdersWrapper(draftOrdersWrapper = DraftOrdersWrapper.builder() +// .judgeApproval1(JudgeApproval.builder() +// .judgeDecision(REVIEW_LATER) +// .build()) +// .build()) +// .build()) +// .build()) +// .build(); +// +// DynamicList expectedDynamicList = DynamicList.builder().build(); +// when(approveOrderService.buildWhichOrderDynamicList(draftOrdersWrapper)).thenReturn(expectedDynamicList); +// +// // Act +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); +// +// // Assert +// assertNotNull(response); +// FinremCaseData responseData = response.getData(); +// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); +// +// List actualCollection = +// responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); +// +// assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); +// assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); +// AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); +// assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); +// assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); +// assertNull(actualRequest.getTypeOfHearing(), "typeOfHearing should be null"); +// assertNull(actualRequest.getTimeEstimate(), "timeEstimate should be null"); +// assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); +// assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); +// } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java index 268ba9ab9c..df879e98fb 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java @@ -654,7 +654,7 @@ void shouldAppendNewDraftOrderToExistingDraftOrdersReview() { .submittedBy("Existing User") .submittedDate(LocalDateTime.of(2024, 10, 10, 12, 0)) .approvalJudge("Approved Judge") - .approvalDate(LocalDate.of(2023, 10, 10)) + .approvalDate(LocalDateTime.of(2023, 10, 10, 0, 0)) .build()) .build(); DraftOrdersReview existingDraftOrderReview = DraftOrdersReview.builder() @@ -770,7 +770,7 @@ void shouldAppendNewPsaToExistingDraftOrdersReview() { .submittedBy("Existing User") .submittedDate(LocalDateTime.of(2024, 10, 10, 12, 0)) .approvalJudge("Approved Judge") - .approvalDate(LocalDate.of(2023, 10, 10)) + .approvalDate(LocalDateTime.of(2023, 10, 10,0, 0)) .build()) .build(); DraftOrdersReview existingDraftOrderReview = DraftOrdersReview.builder() From bd9ffacfda099a57be0c2deff97cdd78deb6f6e2 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 14:16:22 +0000 Subject: [PATCH 140/336] remove extra blank line --- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index f4da82ed15..121056d043 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -49,8 +49,7 @@ public class JudgeApproval { @JsonProperty("isFinalOrder") private DynamicMultiSelectList isFinalOrder; - - + @JsonProperty("changesRequestedByJudge") private String changesRequestedByJudge; From 352925791395189c0b2e2ad10732f588d8105e40 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 14:21:16 +0000 Subject: [PATCH 141/336] Remove blank lines. --- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 2 +- .../service/judgeapproval/JudgeApprovalResolver.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 121056d043..c9dba86c2e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -49,7 +49,7 @@ public class JudgeApproval { @JsonProperty("isFinalOrder") private DynamicMultiSelectList isFinalOrder; - + @JsonProperty("changesRequestedByJudge") private String changesRequestedByJudge; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index f4cd9effb0..39f00b7e79 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -97,7 +97,6 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String approvable.setOrderStatus(REFUSED); approvable.setRefusedDate(LocalDateTime.now()); } - } private boolean isJudgeApproved(JudgeApproval judgeApproval) { From 8418714b87572f893d82bc20367bd276e9b6c32d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 14:29:25 +0000 Subject: [PATCH 142/336] tidy up --- .../judgeapproval/JudgeApprovalResolver.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 39f00b7e79..5c695bc90c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.function.BiFunction; import java.util.stream.Collectors; +import java.util.stream.Stream; import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_NAME; @@ -74,7 +75,7 @@ void populateJudgeDecision(FinremCaseDetails finremCaseDetails, DraftOrdersWrapp } void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { + String userAuthorisation) { ofNullable(approvables) .ifPresent(list -> list.forEach(el -> ofNullable(el) @@ -135,30 +136,33 @@ private CaseDetails applyAddExtraFields(FinremCaseDetails finremCaseDetails, Str return caseDetails; } - void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, - JudgeApproval judgeApproval, String userAuthorisation) { + private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, + JudgeApproval judgeApproval, String userAuthorisation) { List removedItems = new ArrayList<>(); draftOrdersWrapper.setDraftOrdersReviewCollection(filterDraftOrdersReviewCollectionWithRemovedItems(removedItems, draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); - List modifiedRefusedOrdersCollection = ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()) - .orElse(new ArrayList<>()); - modifiedRefusedOrdersCollection.addAll(removedItems.stream() - .map(a -> RefusedOrderCollection.builder() - .value(RefusedOrder.builder() - .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), userAuthorisation)) - .refusedDate(a.getValue().getRefusedDate()) - .submittedBy(a.getValue().getSubmittedBy()) - .attachments(a.getValue().getAttachments()) - .refusalJudge(a.getValue().getApprovalJudge()) - .build()) - .build()) - .toList()); - draftOrdersWrapper.setRefusedOrdersCollection(modifiedRefusedOrdersCollection); + draftOrdersWrapper.setRefusedOrdersCollection( + Stream.concat( + ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new).stream(), + removedItems.stream() + .filter(a -> a.getValue() != null) + .map(a -> RefusedOrderCollection.builder() + .value(RefusedOrder.builder() + .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) + .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), userAuthorisation)) + .refusedDate(a.getValue().getRefusedDate()) + .submittedDate(a.getValue().getSubmittedDate()) + .submittedBy(a.getValue().getSubmittedBy()) + .attachments(a.getValue().getAttachments()) + .refusalJudge(a.getValue().getApprovalJudge()) + .build()) + .build()) + ).toList() + ); } - public List filterDraftOrdersReviewCollectionWithRemovedItems( + private List filterDraftOrdersReviewCollectionWithRemovedItems( List removedItems, List draftOrdersReviewCollection, OrderStatus statusToRemove) { From 3ce1259ca97ee2b301e5d2172e8c58647d504da6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 14:45:24 +0000 Subject: [PATCH 143/336] bug fix --- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 72d4c85170..b6ee60f7b9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -49,7 +49,6 @@ public class JudgeApproval { @JsonIgnore private SortKey sortKey; - @JsonIgnore public YesOrNo getHasAttachment() { return YesOrNo.forValue(!ofNullable(attachments).orElse(List.of()).isEmpty()); } From 68c25cf1c8be24f409f84e0a5150e9dc72f10f2f Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:24:13 +0000 Subject: [PATCH 144/336] checkstyle fix --- .../judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 156ab7af94..1bffa56eea 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -161,8 +161,6 @@ void shouldPopulateAnEmptyAnotherHearingRequestEntry() { .build()) .build(); - DynamicList expectedDynamicList = DynamicList.builder().listItems(new ArrayList<>()).build(); - // Act GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); @@ -178,6 +176,8 @@ void shouldPopulateAnEmptyAnotherHearingRequestEntry() { assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); + + DynamicList expectedDynamicList = DynamicList.builder().listItems(new ArrayList<>()).build(); assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); assertNull(actualRequest.getTypeOfHearing(), "typeOfHearing should be null"); assertNull(actualRequest.getTimeEstimate(), "timeEstimate should be null"); From 6d0b97eb1c673225ae6ec7add1bca4038f84fd09 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 17:25:41 +0000 Subject: [PATCH 145/336] Missing refusal date in the report parameter --- .../judgeapproval/JudgeApprovalResolver.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 5c695bc90c..89ee33655b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -28,10 +28,10 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.function.BiFunction; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -112,16 +112,16 @@ private boolean isJudgeRefused(JudgeApproval judgeApproval) { private final DocumentConfiguration documentConfiguration; private final DocumentHelper documentHelper; private final FinremCaseDetailsMapper finremCaseDetailsMapper; - private final BiFunction addExtraFields = this::applyAddExtraFields; - private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String reason, String authorisationToken) { + private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String reason, String refusedDateInString, + String authorisationToken) { CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails); - return genericDocumentService.generateDocument(authorisationToken, addExtraFields.apply(finremCaseDetails, reason), + return genericDocumentService.generateDocument(authorisationToken, applyAddExtraFields(finremCaseDetails, reason, refusedDateInString), documentConfiguration.getContestedDraftOrderNotApprovedTemplate(caseDetails), documentConfiguration.getContestedDraftOrderNotApprovedFileName()); } - private CaseDetails applyAddExtraFields(FinremCaseDetails finremCaseDetails, String refusalReason) { + private CaseDetails applyAddExtraFields(FinremCaseDetails finremCaseDetails, String refusalReason, String refusedDate) { CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails); caseDetails.getData().put("ApplicantName", documentHelper.getApplicantFullName(caseDetails)); @@ -132,6 +132,7 @@ private CaseDetails applyAddExtraFields(FinremCaseDetails finremCaseDetails, Str caseDetails.getData().get(CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_TYPE), caseDetails.getData().get(CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_NAME))); caseDetails.getData().put("ContestOrderNotApprovedRefusalReasonsFormatted", refusalReason); + caseDetails.getData().put("refusalOrderDate", refusedDate); return caseDetails; } @@ -150,7 +151,8 @@ private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finre .map(a -> RefusedOrderCollection.builder() .value(RefusedOrder.builder() .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), userAuthorisation)) + .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), + DateTimeFormatter.ofPattern("yyyy-MM-dd").format(a.getValue().getRefusedDate()), userAuthorisation)) .refusedDate(a.getValue().getRefusedDate()) .submittedDate(a.getValue().getSubmittedDate()) .submittedBy(a.getValue().getSubmittedBy()) From 984e5d2514759db940dcb5bb91b88eaca8a42c51 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 4 Dec 2024 17:36:01 +0000 Subject: [PATCH 146/336] add tobuilder --- .../model/ccd/draftorders/review/PsaDocumentReview.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index de44c5d318..9f4d7d1574 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; import java.util.Optional; -@Builder +@Builder(toBuilder = true) @Data @NoArgsConstructor @AllArgsConstructor From 5203e98c52a5162a599fa62013a059cba551750d Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:33:51 +0000 Subject: [PATCH 147/336] Add tests to JudgeApprovalResolverTest --- .../JudgeApprovalResolverTest.java | 158 ++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java new file mode 100644 index 0000000000..384fc69534 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -0,0 +1,158 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; + +import java.util.List; +import java.util.stream.Stream; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; + +@ExtendWith(MockitoExtension.class) +@ExtendWith(MockitoExtension.class) +class JudgeApprovalResolverTest { + + private static final String AUTH_TOKEN = "auth-token"; + + @Spy + @InjectMocks + private JudgeApprovalResolver judgeApprovalResolver; + + @Mock + private IdamService idamService; + + @Mock + private HearingProcessor hearingProcessor; + + @ParameterizedTest + @MethodSource("provideShouldInvokeProcessHearingInstructionData") + void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { + // Execute the method being tested + judgeApprovalResolver.populateJudgeDecision( + draftOrdersWrapper, + CaseDocument.builder().build(), + JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), + AUTH_TOKEN + ); + + // Verify the expected number of invocations to processHearingInstruction + verify(hearingProcessor, times(expectHearingInvocationCount)) + .processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); + } + + static Stream provideShouldInvokeProcessHearingInstructionData() { + return Stream.of( + // No hearing requests + Arguments.of( + DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder().build()) + .build(), + 0 // No hearing request means no invocation + ), + // Single hearing request + Arguments.of( + DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder() + .anotherHearingRequestCollection(List.of( + AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() + )) + .build()) + .build(), + 1 // Expect a single invocation for one hearing request + ), + // Multiple hearing requests + Arguments.of( + DraftOrdersWrapper.builder() + .hearingInstruction(HearingInstruction.builder() + .anotherHearingRequestCollection(List.of( + AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build(), + AnotherHearingRequestCollection.builder().value(AnotherHearingRequest.builder().build()).build() + )) + .build()) + .build(), + 2 // Expect two invocations for two hearing requests + ) + ); + } + + @ParameterizedTest + @MethodSource("provideProcessApprovableCollectionData") + void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, + List approvables) { + CaseDocument targetDoc = CaseDocument.builder().build(); + JudgeApproval judgeApproval = mock(JudgeApproval.class); + judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, "auth"); + + if (approvables != null) { + verify(judgeApprovalResolver, times(1)) + .processApprovableCollection(approvables, targetDoc, judgeApproval, "auth"); + } else { + verify(judgeApprovalResolver, never()).processApprovableCollection(any(), any(), any(), any()); + } + } + + static Stream provideProcessApprovableCollectionData() { + List draftReviews = List.of(DraftOrderDocumentReview.builder().build()); + List psaReviews = List.of(PsaDocumentReview.builder().build()); + List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); + + return Stream.of( + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() + .value(draftReviews.get(0)).build())) + .build()).build())) + .build(), + draftReviews + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() + .value(psaReviews.get(0)).build())) + .build()).build())) + .build(), + psaReviews + ), + Arguments.of( + DraftOrdersWrapper.builder() + .agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDrafts.get(0)).build())) + .build(), + agreedDrafts + ), + Arguments.of(DraftOrdersWrapper.builder().build(), null) + ); + } +} From cd98dfc293622392c6331bfb8dcc48dd38ac0c44 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 14:54:14 +0000 Subject: [PATCH 148/336] Making use of ContestedDraftOrderNotApprovedDetailsMapper and refactor the unit tests. --- .../config/DocumentConfiguration.java | 5 ++ ...tedDraftOrderNotApprovedDetailsMapper.java | 33 ++----- .../model/ccd/wrapper/DraftOrdersWrapper.java | 9 ++ ...ContestedDraftOrderNotApprovedDetails.java | 2 + .../judgeapproval/JudgeApprovalResolver.java | 55 +++++------- .../caseorchestration/BaseServiceTest.java | 14 +++ .../AbstractLetterDetailsMapperTest.java | 12 ++- ...raftOrderNotApprovedDetailsMapperTest.java | 87 ++++++++++++------- .../caseorchestration/utils/TestUtils.java | 56 ++++++++++++ .../fixtures/refusal-order-contested.json | 4 +- 10 files changed, 186 insertions(+), 91 deletions(-) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java index 0e8c4a4fe2..9dd3133d08 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java @@ -182,6 +182,11 @@ public String getContestedDraftOrderNotApprovedTemplate(CaseDetails caseDetails) : contestedDraftOrderNotApprovedTemplate; } + public String getContestedDraftOrderNotApprovedTemplate(FinremCaseDetails caseDetails) { + return isHighCourtSelected(caseDetails) ? contestedDraftOrderNotApprovedHighCourtTemplate + : contestedDraftOrderNotApprovedTemplate; + } + public String getContestedOrderApprovedCoverLetterTemplate(CaseDetails caseDetails) { return isHighCourtSelected(caseDetails) ? contestedOrderApprovedCoverLetterHighCourtTemplate : contestedOrderApprovedCoverLetterTemplate; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java index c01cf36299..90c71bdceb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java @@ -5,16 +5,15 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.CourtDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.AbstractLetterDetailsMapper; -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.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.CourtListWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.letterdetails.ContestedDraftOrderNotApprovedDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.letterdetails.DocumentTemplateDetails; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import static java.util.Optional.ofNullable; @Component @@ -26,40 +25,24 @@ public ContestedDraftOrderNotApprovedDetailsMapper(CourtDetailsMapper courtDetai @Override public DocumentTemplateDetails buildDocumentTemplateDetails(FinremCaseDetails caseDetails, CourtListWrapper courtList) { + DraftOrdersWrapper draftOrdersWrapper = caseDetails.getData().getDraftOrdersWrapper(); return ContestedDraftOrderNotApprovedDetails.builder() + .caseNumber(caseDetails.getId().toString()) .applicantName(caseDetails.getData().getFullApplicantName()) .respondentName(caseDetails.getData().getRespondentFullName()) .court(courtDetailsMapper.getCourtDetails(courtList).getCourtName()) .judgeDetails(getJudgeDetails(caseDetails)) - .contestOrderNotApprovedRefusalReasons(getFormattedRefusalReasons(caseDetails)) + .contestOrderNotApprovedRefusalReasons(draftOrdersWrapper.getRefusalOrderReason()) .civilPartnership(YesOrNo.getYesOrNo(caseDetails.getData().getCivilPartnership())) .divorceCaseNumber(caseDetails.getData().getDivorceCaseNumber()) - .refusalOrderDate(String.valueOf(caseDetails.getData().getRefusalOrderDate())) + .refusalOrderDate(String.valueOf(draftOrdersWrapper.getRefusalOrderRefusedDate())) .build(); } private String getJudgeDetails(FinremCaseDetails caseDetails) { return StringUtils.joinWith(" ", - caseDetails.getData().getRefusalOrderJudgeType().getValue(), + ofNullable(caseDetails.getData().getRefusalOrderJudgeType()).map(JudgeType::getValue).orElse(""), caseDetails.getData().getRefusalOrderJudgeName()); } - private String getFormattedRefusalReasons(FinremCaseDetails caseDetails) { - FinremCaseData caseData = caseDetails.getData(); - List refusalReasons = Optional.ofNullable(caseData.getJudgeNotApprovedReasons()) - .orElse(new ArrayList<>()) - .stream() - .map(reason -> reason.getValue().getJudgeNotApprovedReasons()) - .toList(); - - StringBuilder formattedRefusalReasons = new StringBuilder(); - refusalReasons.forEach(reason -> { - if (formattedRefusalReasons.length() > 0) { - formattedRefusalReasons.append('\n'); - } - formattedRefusalReasons.append("- "); - formattedRefusalReasons.append(reason); - }); - return formattedRefusalReasons.toString(); - } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 746830e54a..fe89ab2d0e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,6 +21,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; @@ -71,6 +74,12 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("hearingInstruction") private HearingInstruction hearingInstruction; + + private String refusalOrderReason; + + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime refusalOrderRefusedDate; + public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/letterdetails/ContestedDraftOrderNotApprovedDetails.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/letterdetails/ContestedDraftOrderNotApprovedDetails.java index c8624c71c5..61eed3dfe7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/letterdetails/ContestedDraftOrderNotApprovedDetails.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/letterdetails/ContestedDraftOrderNotApprovedDetails.java @@ -11,6 +11,8 @@ @AllArgsConstructor @NoArgsConstructor public class ContestedDraftOrderNotApprovedDetails implements DocumentTemplateDetails { + @JsonProperty("caseNumber") + private String caseNumber; @JsonProperty("ApplicantName") private String applicantName; @JsonProperty("RespondentName") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 89ee33655b..8cccb44a06 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -1,13 +1,9 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.helper.ContestedCourtHelper; -import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; @@ -28,7 +24,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -36,8 +31,6 @@ import java.util.stream.Stream; import static java.util.Optional.ofNullable; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_NAME; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_TYPE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; @@ -109,32 +102,29 @@ private boolean isJudgeRefused(JudgeApproval judgeApproval) { } private final GenericDocumentService genericDocumentService; - private final DocumentConfiguration documentConfiguration; - private final DocumentHelper documentHelper; - private final FinremCaseDetailsMapper finremCaseDetailsMapper; - - private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String reason, String refusedDateInString, - String authorisationToken) { - CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails); - return genericDocumentService.generateDocument(authorisationToken, applyAddExtraFields(finremCaseDetails, reason, refusedDateInString), - documentConfiguration.getContestedDraftOrderNotApprovedTemplate(caseDetails), - documentConfiguration.getContestedDraftOrderNotApprovedFileName()); - } - private CaseDetails applyAddExtraFields(FinremCaseDetails finremCaseDetails, String refusalReason, String refusedDate) { - CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails); + private final DocumentConfiguration documentConfiguration; - caseDetails.getData().put("ApplicantName", documentHelper.getApplicantFullName(caseDetails)); - caseDetails.getData().put("RespondentName", documentHelper.getRespondentFullNameContested(caseDetails)); - caseDetails.getData().put("Court", ContestedCourtHelper.getSelectedCourt(caseDetails)); - caseDetails.getData().put("JudgeDetails", - StringUtils.joinWith(" ", - caseDetails.getData().get(CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_TYPE), - caseDetails.getData().get(CONTESTED_APPLICATION_NOT_APPROVED_JUDGE_NAME))); - caseDetails.getData().put("ContestOrderNotApprovedRefusalReasonsFormatted", refusalReason); - caseDetails.getData().put("refusalOrderDate", refusedDate); + private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; - return caseDetails; + private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, + String authorisationToken) { + DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); + draftOrdersWrapper.setRefusalOrderReason(refusalReason); + draftOrdersWrapper.setRefusalOrderRefusedDate(refusedDate); + try { + return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, + contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() + ), + documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), + documentConfiguration.getContestedDraftOrderNotApprovedFileName(), + finremCaseDetails.getId().toString()); + } finally { + // Clear the temp values as they are for report generation purpose. + draftOrdersWrapper.setRefusalOrderReason(null); + draftOrdersWrapper.setRefusalOrderRefusedDate(null); + } } private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, @@ -152,7 +142,7 @@ private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finre .value(RefusedOrder.builder() .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), - DateTimeFormatter.ofPattern("yyyy-MM-dd").format(a.getValue().getRefusedDate()), userAuthorisation)) + a.getValue().getRefusedDate(), userAuthorisation)) .refusedDate(a.getValue().getRefusedDate()) .submittedDate(a.getValue().getSubmittedDate()) .submittedBy(a.getValue().getSubmittedBy()) @@ -182,6 +172,7 @@ private List filterDraftOrdersReviewCollectionWithR // Keep the items not matching the status updatedReviewBuilder.draftOrderDocReviewCollection(partitioned.get(false)); + // TODO PSA // Collect the removed items removedItems.addAll(partitioned.get(true)); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/BaseServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/BaseServiceTest.java index 97f0c4eb28..39e93d42ab 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/BaseServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/BaseServiceTest.java @@ -27,6 +27,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.NatureApplicationWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.notifications.service.EmailService; +import uk.gov.hmcts.reform.finrem.caseorchestration.utils.TestUtils; import java.io.File; import java.io.IOException; @@ -463,6 +464,19 @@ protected Map getDataFromCaptor(ArgumentCaptorDeprecated: This method is no longer recommended for use. Developers should use + * {@link TestUtils#buildCaseDetailsFromJson(ObjectMapper, String)} instead, as it allows + * the {@link ObjectMapper} to be explicitly provided, improving configurability and test reliability. + * + * @param testJson the path to the JSON resource file on the classpath + * @return the {@link CaseDetails} object deserialized from the JSON content + * @throws RuntimeException if an error occurs while reading or deserializing the JSON resource + * @deprecated Use {@link TestUtils#buildCaseDetailsFromJson(ObjectMapper, String)} for enhanced configurability. + */ + @Deprecated protected CaseDetails buildCaseDetailsFromJson(String testJson) { try (InputStream resourceAsStream = getClass().getResourceAsStream(testJson)) { CaseDetails caseDetails = diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/AbstractLetterDetailsMapperTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/AbstractLetterDetailsMapperTest.java index d0e1f7b0eb..e3e907d411 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/AbstractLetterDetailsMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/AbstractLetterDetailsMapperTest.java @@ -13,10 +13,20 @@ protected void setCaseDetails(String resource) { caseDetails = finremCaseDetailsMapper.mapToFinremCaseDetails(buildCaseDetailsFromJson(resource)); } + /** + * Retrieves the case data from the placeholders map. + * + *

    Deprecated: This method is no longer recommended for use. + * Developers should use {@link uk.gov.hmcts.reform.finrem.caseorchestration.utils.TestUtils#getCaseData(Map)} instead. + * + * @param placeholdersMap the map containing placeholders, including case details + * @return the extracted case data as a map + * @deprecated Use {@link uk.gov.hmcts.reform.finrem.caseorchestration.utils.TestUtils#getCaseData(Map)} for improved maintainability. + */ + @Deprecated protected Map getCaseData(Map placeholdersMap) { Map actualCaseDetails = (Map) placeholdersMap.get(CASE_DETAILS); return (Map) actualCaseDetails.get(CASE_DATA); } - } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java index b43f25f21f..6b9f6eff2d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java @@ -1,35 +1,52 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.AbstractLetterDetailsMapperTest; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.CourtDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.document.CourtDetailsTemplateFields; import uk.gov.hmcts.reform.finrem.caseorchestration.model.letterdetails.ContestedDraftOrderNotApprovedDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.letterdetails.DocumentTemplateDetails; import java.util.Map; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.TestUtils.buildCaseDetailsFromJson; +import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.TestUtils.getCaseData; -public class ContestedDraftOrderNotApprovedDetailsMapperTest extends AbstractLetterDetailsMapperTest { +@ExtendWith(MockitoExtension.class) +class ContestedDraftOrderNotApprovedDetailsMapperTest { public static final String TEST_JSON = "/fixtures/refusal-order-contested.json"; - @Autowired - private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + @InjectMocks + private ContestedDraftOrderNotApprovedDetailsMapper underTest; - @Before - public void setUp() { - setCaseDetails(TEST_JSON); - } + @Spy + private ObjectMapper objectMapper = new ObjectMapper(); + + @Spy + private FinremCaseDetailsMapper finremCaseDetailsMapper = new FinremCaseDetailsMapper(objectMapper.registerModule(new JavaTimeModule())); + + @Mock + private CourtDetailsMapper courtDetailsMapper; @Test - public void givenValidCaseData_whenBuildDocumentTemplateDetails_thenReturnExpectedDetails() { - DocumentTemplateDetails actual = contestedDraftOrderNotApprovedDetailsMapper.buildDocumentTemplateDetails(caseDetails, - caseDetails.getData().getRegionWrapper().getDefaultCourtList()); + void givenValidCaseData_whenBuildDocumentTemplateDetails_thenReturnExpectedDetails() { + FinremCaseDetails finremCaseDetails = readFinremCaseDetailsFromJson(); + stubCourtDetailsMapperGetCourtDetails(finremCaseDetails); + + DocumentTemplateDetails actual = underTest.buildDocumentTemplateDetails(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList()); DocumentTemplateDetails expected = getExpectedContestedDraftOrderNotApprovedDetails(); @@ -37,35 +54,41 @@ public void givenValidCaseData_whenBuildDocumentTemplateDetails_thenReturnExpect } @Test - public void givenValidCaseData_whenGetDocumentTemplateDetailsAsMap_thenReturnExpectedMap() { - Map placeholdersMap = contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(caseDetails, - caseDetails.getData().getRegionWrapper().getDefaultCourtList()); + void givenValidCaseData_whenGetDocumentTemplateDetailsAsMap_thenReturnExpectedMap() { + FinremCaseDetails finremCaseDetails = readFinremCaseDetailsFromJson(); + stubCourtDetailsMapperGetCourtDetails(finremCaseDetails); + + Map actualData = getCaseData(underTest.getDocumentTemplateDetailsAsMap(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList())); ContestedDraftOrderNotApprovedDetails expected = getExpectedContestedDraftOrderNotApprovedDetails(); - Map actualData = getCaseData(placeholdersMap); + assertEquals(expected.getApplicantName(), actualData.get("ApplicantName")); + assertEquals(expected.getJudgeDetails(), actualData.get("JudgeDetails")); + assertEquals(expected.getRefusalOrderDate(), actualData.get("refusalOrderDate")); + assertEquals(expected.getContestOrderNotApprovedRefusalReasons(), actualData.get("ContestOrderNotApprovedRefusalReasonsFormatted")); + } + + private FinremCaseDetails readFinremCaseDetailsFromJson() { + return finremCaseDetailsMapper.mapToFinremCaseDetails(buildCaseDetailsFromJson(objectMapper, TEST_JSON)); + } - assertThat(actualData.get("ApplicantName"), is(expected.getApplicantName())); - assertThat(actualData.get("JudgeDetails"), is(expected.getJudgeDetails())); - assertThat(actualData.get("refusalOrderDate"), is(expected.getRefusalOrderDate())); - assertThat(actualData.get("ContestOrderNotApprovedRefusalReasonsFormatted"), - is(expected.getContestOrderNotApprovedRefusalReasons())); + private void stubCourtDetailsMapperGetCourtDetails(FinremCaseDetails finremCaseDetails) { + when(courtDetailsMapper.getCourtDetails(finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList())) + .thenReturn(CourtDetailsTemplateFields.builder().courtName("Nottingham County Court And Family Court").build()); } private ContestedDraftOrderNotApprovedDetails getExpectedContestedDraftOrderNotApprovedDetails() { return ContestedDraftOrderNotApprovedDetails.builder() + .caseNumber("1234567890") .judgeDetails("Her Honour Judge Contested") .court("Nottingham County Court And Family Court") .applicantName("Contested Applicant Name") .respondentName("Contested Respondent Name") .divorceCaseNumber("DD98D76543") .civilPartnership("No") - .refusalOrderDate("2020-06-01") - .contestOrderNotApprovedRefusalReasons(getRefusalReasons()) + .refusalOrderDate("2024-06-04T23:09:22.075") + .contestOrderNotApprovedRefusalReasons("Refusal Reasons") .build(); } - - private String getRefusalReasons() { - return "- Test Reason 1\n- Test Reason 2"; - } -} \ No newline at end of file +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java new file mode 100644 index 0000000000..5ba29964cb --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java @@ -0,0 +1,56 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import uk.gov.hmcts.reform.ccd.client.model.CallbackRequest; +import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; + +import java.io.InputStream; +import java.util.Map; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CASE_DATA; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CASE_DETAILS; + +public abstract class TestUtils { + + /** + * Builds a {@link CaseDetails} object from a JSON resource file. + * + *

    This utility method reads a JSON file from the classpath and maps its content to + * a {@link CaseDetails} object using the provided {@link ObjectMapper}. It is primarily + * designed for use in tests to quickly create {@link CaseDetails} instances from test data. + * + * @param objectMapper the {@link ObjectMapper} to use for JSON deserialization + * @param testJson the path to the JSON resource file on the classpath + * @return the {@link CaseDetails} object deserialized from the JSON content + * @throws RuntimeException if an error occurs while reading or deserializing the JSON resource + */ + public static CaseDetails buildCaseDetailsFromJson(ObjectMapper objectMapper, String testJson) { + try (InputStream resourceAsStream = TestUtils.class.getResourceAsStream(testJson)) { + return objectMapper.readValue(resourceAsStream, CallbackRequest.class).getCaseDetails(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * Extracts the case data from the provided placeholders map. + * + *

    This utility method is the recommended approach for retrieving case data + * in tests, replacing the older {@code getCaseData(Map)} method. It ensures + * consistent and maintainable test utility practices. + * + * @param placeholdersMap the map containing placeholders, including case details + * @return the extracted case data as a map + * @throws IllegalArgumentException if the placeholders map does not contain expected keys + */ + public static Map getCaseData(Map placeholdersMap) { + if (placeholdersMap == null || !placeholdersMap.containsKey(CASE_DETAILS)) { + throw new IllegalArgumentException("Placeholders map must contain a key for CASE_DETAILS"); + } + Map actualCaseDetails = (Map) placeholdersMap.get(CASE_DETAILS); + if (actualCaseDetails == null || !actualCaseDetails.containsKey(CASE_DATA)) { + throw new IllegalArgumentException("Case details must contain a key for CASE_DATA"); + } + return (Map) actualCaseDetails.get(CASE_DATA); + } +} diff --git a/src/test/resources/fixtures/refusal-order-contested.json b/src/test/resources/fixtures/refusal-order-contested.json index 442a7ae086..e4cb94ba10 100644 --- a/src/test/resources/fixtures/refusal-order-contested.json +++ b/src/test/resources/fixtures/refusal-order-contested.json @@ -175,7 +175,9 @@ "orderRefusalJudge" : "District Judge" } } - ] + ], + "refusalOrderReason": "Refusal Reasons", + "refusalOrderRefusedDate": "2024-06-04T23:09:22.075Z" } } } \ No newline at end of file From 96fe17335e13d88deeaafb54b8d30b633cdf8b81 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 15:02:39 +0000 Subject: [PATCH 149/336] Remove extra blank line --- .../caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index fe89ab2d0e..7afd50a989 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -74,7 +74,6 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("hearingInstruction") private HearingInstruction hearingInstruction; - private String refusalOrderReason; @JsonSerialize(using = LocalDateTimeSerializer.class) From 6a54fdb8f7f63297d9d4cb3d087308aef6a8c995 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 15:59:29 +0000 Subject: [PATCH 150/336] add private a constructor --- .../reform/finrem/caseorchestration/utils/TestUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java index 5ba29964cb..b8dbc174ba 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/TestUtils.java @@ -10,7 +10,11 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CASE_DATA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CASE_DETAILS; -public abstract class TestUtils { +public class TestUtils { + + private TestUtils() { + // all access through static methods + } /** * Builds a {@link CaseDetails} object from a JSON resource file. From a9e6ac3558b7eefd41d5e60372dbbc2774370829 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 17:21:47 +0000 Subject: [PATCH 151/336] Fix a bug that not showing judge name --- ...tedDraftOrderNotApprovedDetailsMapper.java | 12 +++++----- .../model/ccd/wrapper/DraftOrdersWrapper.java | 9 ++++++-- .../judgeapproval/JudgeApprovalResolver.java | 23 ++++++++++++++----- ...raftOrderNotApprovedDetailsMapperTest.java | 2 +- .../fixtures/refusal-order-contested.json | 6 +++-- 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java index 90c71bdceb..2f613ed132 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java @@ -31,18 +31,18 @@ public DocumentTemplateDetails buildDocumentTemplateDetails(FinremCaseDetails ca .applicantName(caseDetails.getData().getFullApplicantName()) .respondentName(caseDetails.getData().getRespondentFullName()) .court(courtDetailsMapper.getCourtDetails(courtList).getCourtName()) - .judgeDetails(getJudgeDetails(caseDetails)) - .contestOrderNotApprovedRefusalReasons(draftOrdersWrapper.getRefusalOrderReason()) + .judgeDetails(getJudgeDetails(draftOrdersWrapper)) + .contestOrderNotApprovedRefusalReasons(draftOrdersWrapper.getGeneratedOrderReason()) .civilPartnership(YesOrNo.getYesOrNo(caseDetails.getData().getCivilPartnership())) .divorceCaseNumber(caseDetails.getData().getDivorceCaseNumber()) - .refusalOrderDate(String.valueOf(draftOrdersWrapper.getRefusalOrderRefusedDate())) + .refusalOrderDate(String.valueOf(draftOrdersWrapper.getGeneratedOrderRefusedDate())) .build(); } - private String getJudgeDetails(FinremCaseDetails caseDetails) { + private String getJudgeDetails(DraftOrdersWrapper draftOrdersWrapper) { return StringUtils.joinWith(" ", - ofNullable(caseDetails.getData().getRefusalOrderJudgeType()).map(JudgeType::getValue).orElse(""), - caseDetails.getData().getRefusalOrderJudgeName()); + ofNullable(draftOrdersWrapper.getGeneratedOrderJudgeType()).map(JudgeType::getValue).orElse(""), + draftOrdersWrapper.getGeneratedOrderJudgeName()); } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 7afd50a989..ab7dfd01f9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; @@ -74,10 +75,14 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("hearingInstruction") private HearingInstruction hearingInstruction; - private String refusalOrderReason; + private String generatedOrderReason; @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime refusalOrderRefusedDate; + private LocalDateTime generatedOrderRefusedDate; + + private JudgeType generatedOrderJudgeType; + + private String generatedOrderJudgeName; public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 8cccb44a06..4be67c91f2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -7,6 +7,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -108,10 +109,13 @@ private boolean isJudgeRefused(JudgeApproval judgeApproval) { private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, - String authorisationToken) { + String judgeName, JudgeType judgeType, String authorisationToken) { DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); - draftOrdersWrapper.setRefusalOrderReason(refusalReason); - draftOrdersWrapper.setRefusalOrderRefusedDate(refusedDate); + draftOrdersWrapper.setGeneratedOrderReason(refusalReason); + draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); + draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); + draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); + try { return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, @@ -122,8 +126,10 @@ private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, St finremCaseDetails.getId().toString()); } finally { // Clear the temp values as they are for report generation purpose. - draftOrdersWrapper.setRefusalOrderReason(null); - draftOrdersWrapper.setRefusalOrderRefusedDate(null); + draftOrdersWrapper.setGeneratedOrderReason(null); + draftOrdersWrapper.setGeneratedOrderRefusedDate(null); + draftOrdersWrapper.setGeneratedOrderJudgeType(null); + draftOrdersWrapper.setGeneratedOrderJudgeName(null); } } @@ -142,7 +148,7 @@ private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finre .value(RefusedOrder.builder() .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), - a.getValue().getRefusedDate(), userAuthorisation)) + a.getValue().getRefusedDate(), a.getValue().getApprovalJudge(), null, userAuthorisation)) .refusedDate(a.getValue().getRefusedDate()) .submittedDate(a.getValue().getSubmittedDate()) .submittedBy(a.getValue().getSubmittedBy()) @@ -169,6 +175,11 @@ private List filterDraftOrdersReviewCollectionWithR draftOrdersReview.getValue().getDraftOrderDocReviewCollection(), statusToRemove ); +// Map> psaPartitioneds = +// partitionDraftOrderDocReviewCollection( +// draftOrdersReview.getValue().getPsaDocReviewCollection(), +// statusToRemove +// ); // Keep the items not matching the status updatedReviewBuilder.draftOrderDocReviewCollection(partitioned.get(false)); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java index 6b9f6eff2d..185d06482c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java @@ -81,7 +81,7 @@ private void stubCourtDetailsMapperGetCourtDetails(FinremCaseDetails finremCaseD private ContestedDraftOrderNotApprovedDetails getExpectedContestedDraftOrderNotApprovedDetails() { return ContestedDraftOrderNotApprovedDetails.builder() .caseNumber("1234567890") - .judgeDetails("Her Honour Judge Contested") + .judgeDetails("District Judge Peter Chapman") .court("Nottingham County Court And Family Court") .applicantName("Contested Applicant Name") .respondentName("Contested Respondent Name") diff --git a/src/test/resources/fixtures/refusal-order-contested.json b/src/test/resources/fixtures/refusal-order-contested.json index e4cb94ba10..9efc3d7793 100644 --- a/src/test/resources/fixtures/refusal-order-contested.json +++ b/src/test/resources/fixtures/refusal-order-contested.json @@ -176,8 +176,10 @@ } } ], - "refusalOrderReason": "Refusal Reasons", - "refusalOrderRefusedDate": "2024-06-04T23:09:22.075Z" + "generatedOrderReason": "Refusal Reasons", + "generatedOrderRefusedDate": "2024-06-04T23:09:22.075Z", + "generatedOrderJudgeName": "Peter Chapman", + "generatedOrderJudgeType": "District Judge" } } } \ No newline at end of file From 23947aef077fc4044e8175928c8484fd914fbdf4 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 18:06:53 +0000 Subject: [PATCH 152/336] update judge details logic --- .../ContestedDraftOrderNotApprovedDetailsMapper.java | 12 +++++++++--- ...testedDraftOrderNotApprovedDetailsMapperTest.java | 12 ++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java index 2f613ed132..a421781814 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java @@ -13,6 +13,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.letterdetails.ContestedDraftOrderNotApprovedDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.letterdetails.DocumentTemplateDetails; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import static java.util.Optional.ofNullable; @@ -40,9 +43,12 @@ public DocumentTemplateDetails buildDocumentTemplateDetails(FinremCaseDetails ca } private String getJudgeDetails(DraftOrdersWrapper draftOrdersWrapper) { - return StringUtils.joinWith(" ", - ofNullable(draftOrdersWrapper.getGeneratedOrderJudgeType()).map(JudgeType::getValue).orElse(""), - draftOrdersWrapper.getGeneratedOrderJudgeName()); + return Stream.of( + ofNullable(draftOrdersWrapper.getGeneratedOrderJudgeType()).map(JudgeType::getValue).orElse(""), + draftOrdersWrapper.getGeneratedOrderJudgeName() + ) + .filter(StringUtils::isNotBlank) // Exclude empty or blank strings + .collect(Collectors.joining(" ")); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java index 185d06482c..26445e9dbe 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapperTest.java @@ -69,6 +69,18 @@ void givenValidCaseData_whenGetDocumentTemplateDetailsAsMap_thenReturnExpectedMa assertEquals(expected.getContestOrderNotApprovedRefusalReasons(), actualData.get("ContestOrderNotApprovedRefusalReasonsFormatted")); } + @Test + void shouldReturnValidJudgeDetailsWhenJudgeTypeIsMissing() { + FinremCaseDetails finremCaseDetails = readFinremCaseDetailsFromJson(); + finremCaseDetails.getData().getDraftOrdersWrapper().setGeneratedOrderJudgeType(null); + stubCourtDetailsMapperGetCourtDetails(finremCaseDetails); + + Map actualData = getCaseData(underTest.getDocumentTemplateDetailsAsMap(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList())); + + assertEquals("Peter Chapman", actualData.get("JudgeDetails")); + } + private FinremCaseDetails readFinremCaseDetailsFromJson() { return finremCaseDetailsMapper.mapToFinremCaseDetails(buildCaseDetailsFromJson(objectMapper, TEST_JSON)); } From da4c207aa5271f4d11a661bf146e747ee65bc1a5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 18:09:27 +0000 Subject: [PATCH 153/336] Remove extra blank line. --- .../ContestedDraftOrderNotApprovedDetailsMapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java index a421781814..b48bfe2a16 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java @@ -18,7 +18,6 @@ import static java.util.Optional.ofNullable; - @Component public class ContestedDraftOrderNotApprovedDetailsMapper extends AbstractLetterDetailsMapper { From 1069a644fcd6682f660a88c885270d46cac646f4 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 20:07:00 +0000 Subject: [PATCH 154/336] Generate Refusal order for PSA. --- .../model/ccd/Approvable.java | 2 + .../model/ccd/HasApprovable.java | 5 ++ .../review/DraftOrderDocReviewCollection.java | 3 +- .../review/PsaDocReviewCollection.java | 3 +- .../judgeapproval/JudgeApprovalResolver.java | 81 ++++++++++++++----- 5 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index e914816a11..f316bf65d0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -6,6 +6,8 @@ public interface Approvable extends DocumentMatcher { + OrderStatus getOrderStatus(); + void setOrderStatus(OrderStatus orderStatus); void setApprovalDate(LocalDateTime approvalDate); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java new file mode 100644 index 0000000000..2707039f28 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java @@ -0,0 +1,5 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +public interface HasApprovable { + Approvable getValue(); +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java index 752e08b2e5..92eb8115fd 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java @@ -5,6 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -12,6 +13,6 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class DraftOrderDocReviewCollection implements HasCaseDocument { +public class DraftOrderDocReviewCollection implements HasCaseDocument, HasApprovable { private DraftOrderDocumentReview value; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index f2d4d5e440..ec2ff1d9eb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -5,6 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -12,6 +13,6 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class PsaDocReviewCollection implements HasCaseDocument { +public class PsaDocReviewCollection implements HasCaseDocument, HasApprovable { private PsaDocumentReview value; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 4be67c91f2..d1f8489867 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -7,13 +7,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; @@ -28,6 +28,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -136,23 +138,40 @@ private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, St private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, JudgeApproval judgeApproval, String userAuthorisation) { List removedItems = new ArrayList<>(); - draftOrdersWrapper.setDraftOrdersReviewCollection(filterDraftOrdersReviewCollectionWithRemovedItems(removedItems, + List removedPsaItems = new ArrayList<>(); + draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRemovedItemsFromDraftOrderDocReviewCollection(removedItems, + draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); + draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRemovedItemsFromPsaDocReviewCollection(removedPsaItems, draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); draftOrdersWrapper.setRefusedOrdersCollection( Stream.concat( - ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new).stream(), - removedItems.stream() + Stream.concat( + ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new).stream(), + removedItems.stream() + .filter(a -> a.getValue() != null) + .map(a -> RefusedOrderCollection.builder() + .value(RefusedOrder.builder() + .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) + .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), + a.getValue().getRefusedDate(), a.getValue().getApprovalJudge(), null, userAuthorisation)) + .refusedDate(a.getValue().getRefusedDate()) + .submittedDate(a.getValue().getSubmittedDate()) + .submittedBy(a.getValue().getSubmittedBy()) + .attachments(a.getValue().getAttachments()) + .refusalJudge(a.getValue().getApprovalJudge()) + .build()) + .build())), + removedPsaItems.stream() .filter(a -> a.getValue() != null) .map(a -> RefusedOrderCollection.builder() .value(RefusedOrder.builder() - .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) + .draftOrderOrPsa(a.getValue().getPsaDocument()) .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), a.getValue().getRefusedDate(), a.getValue().getApprovalJudge(), null, userAuthorisation)) .refusedDate(a.getValue().getRefusedDate()) .submittedDate(a.getValue().getSubmittedDate()) .submittedBy(a.getValue().getSubmittedBy()) - .attachments(a.getValue().getAttachments()) .refusalJudge(a.getValue().getApprovalJudge()) .build()) .build()) @@ -160,30 +179,52 @@ private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finre ); } - private List filterDraftOrdersReviewCollectionWithRemovedItems( + private List filterAndCollectRemovedItemsFromDraftOrderDocReviewCollection( List removedItems, List draftOrdersReviewCollection, OrderStatus statusToRemove) { + return filterAndCollectRemovedItemsFromReviewCollection( + removedItems, + draftOrdersReviewCollection, + statusToRemove, + DraftOrdersReview::getDraftOrderDocReviewCollection, + DraftOrdersReview.DraftOrdersReviewBuilder::draftOrderDocReviewCollection + ); + } + + private List filterAndCollectRemovedItemsFromPsaDocReviewCollection( + List removedItems, + List draftOrdersReviewCollection, + OrderStatus statusToRemove) { + return filterAndCollectRemovedItemsFromReviewCollection( + removedItems, + draftOrdersReviewCollection, + statusToRemove, + DraftOrdersReview::getPsaDocReviewCollection, + DraftOrdersReview.DraftOrdersReviewBuilder::psaDocReviewCollection + ); + } + + private List filterAndCollectRemovedItemsFromReviewCollection( + List removedItems, + List draftOrdersReviewCollection, + OrderStatus statusToRemove, + Function> getReviewCollection, + BiConsumer> setReviewCollection) { return draftOrdersReviewCollection.stream() .map(draftOrdersReview -> { DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); // Partition items into kept and removed - Map> partitioned = + Map> partitioned = partitionDraftOrderDocReviewCollection( - draftOrdersReview.getValue().getDraftOrderDocReviewCollection(), + getReviewCollection.apply(draftOrdersReview.getValue()), statusToRemove ); -// Map> psaPartitioneds = -// partitionDraftOrderDocReviewCollection( -// draftOrdersReview.getValue().getPsaDocReviewCollection(), -// statusToRemove -// ); // Keep the items not matching the status - updatedReviewBuilder.draftOrderDocReviewCollection(partitioned.get(false)); - // TODO PSA + setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); // Collect the removed items removedItems.addAll(partitioned.get(true)); @@ -196,14 +237,14 @@ private List filterDraftOrdersReviewCollectionWithR .toList(); } - private Map> partitionDraftOrderDocReviewCollection( - List draftOrderDocReviewCollection, + private Map> partitionDraftOrderDocReviewCollection( + List draftOrderDocReviewCollection, OrderStatus statusToRemove) { return draftOrderDocReviewCollection.stream() .collect(Collectors.partitioningBy( docReview -> ofNullable(docReview) - .map(DraftOrderDocReviewCollection::getValue) - .map(DraftOrderDocumentReview::getOrderStatus) + .map(HasApprovable::getValue) + .map(Approvable::getOrderStatus) .filter(statusToRemove::equals) .isPresent() )); From 5f58ee9279fa331379f3baddadfd6cb4715b3c29 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 5 Dec 2024 20:21:55 +0000 Subject: [PATCH 155/336] rename titleInJudgeDecisionMessage to inlineDocType --- .../judgeapproval/ApproveDraftOrdersAboutToStartHandler.java | 4 ++-- .../model/ccd/draftorders/judgeapproval/JudgeApproval.java | 2 +- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 40cd9306a8..99b5be9228 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -130,7 +130,7 @@ private List getReviewableItems(List .map(a -> JudgeApproval.builder() .docType(DRAFT_ORDER) .title(DRAFT_ORDER.getTitle()) - .titleInJudgeDecisionMessage(DRAFT_ORDER.getDescription()) + .inlineDocType(DRAFT_ORDER.getDescription()) .hearingInfo(hearingInfo) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") @@ -151,7 +151,7 @@ private List getReviewableItems(List .map(a -> JudgeApproval.builder() .docType(PSA) .title(PSA.getTitle()) - .titleInJudgeDecisionMessage(PSA.getDescription()) + .inlineDocType(PSA.getDescription()) .hearingInfo(hearingInfo) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 6190dbfd99..a13cc79e8e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -29,7 +29,7 @@ public class JudgeApproval { private String title; - private String titleInJudgeDecisionMessage; + private String inlineDocType; private String hearingInfo; diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 1cfce0c0c6..897af03fbb 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -168,7 +168,7 @@ void handle_withVariousDraftOrdersWrapperData( var expected = expectedJudgeApproval.get(i).orElse(null); if (expected != null && actual != null) { assertEquals(expected.getTitle(), actual.getTitle()); - assertEquals(expected.getTitleInJudgeDecisionMessage(), actual.getTitleInJudgeDecisionMessage()); + assertEquals(expected.getInlineDocType(), actual.getInlineDocType()); assertEquals(expected.getDocument(), actual.getDocument()); assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); if (expected.getHasAttachment() == YES) { @@ -278,7 +278,7 @@ private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, List attachments) { return JudgeApproval.builder().hearingInfo(hearingInfo) .title(docType.getTitle()) - .titleInJudgeDecisionMessage(docType.getDescription()) + .inlineDocType(docType.getDescription()) .document(document) .attachments(attachments) .hasAttachment(YesOrNo.forValue(attachments != null && !attachments.isEmpty())) From 8c02368e4cf8861bf0dc7d154a2f8f29119310a0 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:37:40 +0000 Subject: [PATCH 156/336] Add tests to JudgeApprovalResolverTest --- .../JudgeApprovalResolverTest.java | 86 ++++++++++++------- 1 file changed, 54 insertions(+), 32 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 384fc69534..b3e7696ddc 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -16,11 +16,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -34,6 +30,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @ExtendWith(MockitoExtension.class) @@ -104,55 +101,80 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { } @ParameterizedTest - @MethodSource("provideProcessApprovableCollectionData") - void shouldInvokeProcessApprovableCollection(DraftOrdersWrapper draftOrdersWrapper, - List approvables) { + @MethodSource("provideProcessApprovableCollectionDataWithHandleApprovable") + void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, + List approvables, + JudgeApproval judgeApproval, + boolean shouldCallHandleApprovable) { CaseDocument targetDoc = CaseDocument.builder().build(); - JudgeApproval judgeApproval = mock(JudgeApproval.class); + judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, "auth"); if (approvables != null) { verify(judgeApprovalResolver, times(1)) .processApprovableCollection(approvables, targetDoc, judgeApproval, "auth"); + + approvables.forEach(approvable -> { + if (shouldCallHandleApprovable) { + verify(judgeApprovalResolver, times(1)) + .handleApprovable(approvable, judgeApproval, "auth"); + } else { + verify(judgeApprovalResolver, never()) + .handleApprovable(any(), any(), any()); + } + }); } else { - verify(judgeApprovalResolver, never()).processApprovableCollection(any(), any(), any(), any()); + verify(judgeApprovalResolver, never()) + .processApprovableCollection(any(), any(), any(), any()); } } - static Stream provideProcessApprovableCollectionData() { + static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { List draftReviews = List.of(DraftOrderDocumentReview.builder().build()); List psaReviews = List.of(PsaDocumentReview.builder().build()); List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); + JudgeApproval approvedJudgeApproval = mock(JudgeApproval.class); + when(approvedJudgeApproval.getJudgeDecision()).thenReturn(READY_TO_BE_SEALED); + + JudgeApproval notApprovedJudgeApproval = mock(JudgeApproval.class); + when(notApprovedJudgeApproval.getJudgeDecision()).thenReturn(null); + return Stream.of( - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() - .value(draftReviews.get(0)).build())) - .build()).build())) - .build(), - draftReviews - ), - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() - .value(psaReviews.get(0)).build())) - .build()).build())) - .build(), - psaReviews - ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() +// .value(draftReviews.get(0)).build())) +// .build()).build())) +// .build(), +// draftReviews, +// approvedJudgeApproval, +// true // should call handleApprovable +// ), +// Arguments.of( +// DraftOrdersWrapper.builder() +// .draftOrdersReviewCollection(List.of( +// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() +// .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() +// .value(psaReviews.get(0)).build())) +// .build()).build())) +// .build(), +// psaReviews, +// approvedJudgeApproval, +// true +// ), Arguments.of( DraftOrdersWrapper.builder() .agreedDraftOrderCollection(List.of( AgreedDraftOrderCollection.builder().value(agreedDrafts.get(0)).build())) .build(), - agreedDrafts + agreedDrafts, + notApprovedJudgeApproval, + false // should not call handleApprovable ), - Arguments.of(DraftOrdersWrapper.builder().build(), null) + Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false) ); } } From 29beac5789cb0b8e0e70aebbc71e296c27b49de3 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:38:15 +0000 Subject: [PATCH 157/336] Add tests to HearingProcessorTest --- .../judgeapproval/HearingProcessorTest.java | 232 ++++++++++++++++++ 1 file changed, 232 insertions(+) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java new file mode 100644 index 0000000000..b5fd3afe19 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java @@ -0,0 +1,232 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingTimeDirection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.InterimTypeOfHearing; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; + +import java.util.List; +import java.util.stream.Stream; + +import static java.lang.String.format; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +@ExtendWith(MockitoExtension.class) +class HearingProcessorTest { + + private static final String SEPARATOR = "#"; + + private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); + + @Spy + @InjectMocks + private HearingProcessor hearingProcessor; + + @ParameterizedTest + @MethodSource("provideHearingInstructionTestData") + void testProcessHearingInstruction(List hearingInstructionProcessables, + CaseDocument targetDoc, + AnotherHearingRequest anotherHearingRequest) { + hearingProcessor.processHearingInstruction(hearingInstructionProcessables, targetDoc, anotherHearingRequest); + + if (hearingInstructionProcessables != null) { + for (HearingInstructionProcessable element : hearingInstructionProcessables) { + if (element.match(targetDoc)) { + if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { + assertEquals(YesOrNo.YES, draftOrderDocumentReview.getAnotherHearingToBeListed()); + assertEquals(anotherHearingRequest.getTypeOfHearing().name(), draftOrderDocumentReview.getHearingType()); + assertEquals(anotherHearingRequest.getAdditionalTime(), draftOrderDocumentReview.getAdditionalTime()); + assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), draftOrderDocumentReview.getHearingTimeEstimate()); + assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), draftOrderDocumentReview.getOtherListingInstructions()); + } else if (element instanceof PsaDocumentReview psaDocumentReview) { + assertEquals(YesOrNo.YES, psaDocumentReview.getAnotherHearingToBeListed()); + assertEquals(anotherHearingRequest.getTypeOfHearing().name(), psaDocumentReview.getHearingType()); + assertEquals(anotherHearingRequest.getAdditionalTime(), psaDocumentReview.getAdditionalTime()); + assertEquals(anotherHearingRequest.getTimeEstimate().getValue(), psaDocumentReview.getHearingTimeEstimate()); + assertEquals(anotherHearingRequest.getAnyOtherListingInstructions(), psaDocumentReview.getOtherListingInstructions()); + } + } else { + if (element instanceof DraftOrderDocumentReview draftOrderDocumentReview) { + assertNull(draftOrderDocumentReview.getAnotherHearingToBeListed()); + assertNull(draftOrderDocumentReview.getHearingType()); + assertNull(draftOrderDocumentReview.getAdditionalTime()); + assertNull(draftOrderDocumentReview.getHearingTimeEstimate()); + assertNull(draftOrderDocumentReview.getOtherListingInstructions()); + } else if (element instanceof PsaDocumentReview psaDocumentReview) { + assertNull(psaDocumentReview.getAnotherHearingToBeListed()); + assertNull(psaDocumentReview.getHearingType()); + assertNull(psaDocumentReview.getAdditionalTime()); + assertNull(psaDocumentReview.getHearingTimeEstimate()); + assertNull(psaDocumentReview.getOtherListingInstructions()); + } + } + } + } + } + + static Stream provideHearingInstructionTestData() { + DraftOrderDocumentReview matchingElement = spy(DraftOrderDocumentReview.class); + CaseDocument targetDoc = mock(CaseDocument.class); + when(matchingElement.match(targetDoc)).thenReturn(true); + + DraftOrderDocumentReview nonMatchingElement = spy(DraftOrderDocumentReview.class); + when(nonMatchingElement.match(targetDoc)).thenReturn(false); + + AnotherHearingRequest anotherHearingRequest = spy(AnotherHearingRequest.class); + when(anotherHearingRequest.getTypeOfHearing()).thenReturn(InterimTypeOfHearing.FH); + when(anotherHearingRequest.getAdditionalTime()).thenReturn("30 minutes"); + when(anotherHearingRequest.getTimeEstimate()).thenReturn(HearingTimeDirection.STANDARD_TIME); + when(anotherHearingRequest.getAnyOtherListingInstructions()).thenReturn("Test instructions"); + + Stream r1 = Stream.of( + Arguments.of(List.of(matchingElement), targetDoc, anotherHearingRequest), + Arguments.of(List.of(nonMatchingElement), targetDoc, anotherHearingRequest), + Arguments.of(List.of(matchingElement, nonMatchingElement), targetDoc, anotherHearingRequest), + Arguments.of(null, targetDoc, anotherHearingRequest) + ); + + PsaDocumentReview matchingElement1 = spy(PsaDocumentReview.class); + when(matchingElement1.match(targetDoc)).thenReturn(true); + + PsaDocumentReview nonMatchingElement1 = spy(PsaDocumentReview.class); + when(nonMatchingElement1.match(targetDoc)).thenReturn(false); + + Stream r2 = Stream.of( + Arguments.of(List.of(matchingElement1), targetDoc, anotherHearingRequest), + Arguments.of(List.of(nonMatchingElement1), targetDoc, anotherHearingRequest), + Arguments.of(List.of(matchingElement1, nonMatchingElement1), targetDoc, anotherHearingRequest), + Arguments.of(null, targetDoc, anotherHearingRequest) + ); + return Stream.concat(r1, r2); + } + + @ParameterizedTest + @MethodSource("provideProcessHearingInstructionData") + void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest, + boolean processHearingInstructionInvokedExpected, String expectedIllegalStateExceptionMessage) { + if (expectedIllegalStateExceptionMessage == null) { + hearingProcessor.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); + verify(hearingProcessor, times(processHearingInstructionInvokedExpected ? 2 : 0)) + .processHearingInstruction( + anyList(), // Matcher for List type + eq(TARGET_DOC), // Matcher for CaseDocument + any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest + ); + } else { + IllegalStateException exception = assertThrows( + IllegalStateException.class, + () -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest) + ); + assertEquals(expectedIllegalStateExceptionMessage, exception.getMessage()); + } + } + + static Stream provideProcessHearingInstructionData() { + return Stream.of( + // happy path 1 + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) + .build(), + true, null + ), + // happy path 2 + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) + .build(), + true, null + ), + // missing corresponding judgeApproval when a draft order in whichOrder selected + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) + .build(), + false, null + ), + // missing corresponding judgeApproval when a PSA in whichOrder selected + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) + .build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) + .build(), + false, null + ), + // missing draftOrdersReviewCollection in DraftOrdersWrapper + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) + .build(), + false, null + ), + // missing whichOrder + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().build()).build()) + .build(), + false, "Missing selected value in AnotherHearingRequest.whichOrder" + ), + // unexpected code value + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code("XXX").build()).build()) + .build(), + false, "Unexpected selected value in AnotherHearingRequest.whichOrder: XXX" + ), + // unexpected code value 2 + Arguments.of( + DraftOrdersWrapper.builder().build(), + AnotherHearingRequest.builder() + .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s6", SEPARATOR)).build()).build()) + .build(), + false, "Unexpected method \"getJudgeApproval6\" was invoked" + ) + ); + } +} From 73ce376f8320cf14c282bda36516523d1311847d Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:52:36 +0000 Subject: [PATCH 158/336] Remove commented tests. --- .../JudgeApprovalResolverTest.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index b3e7696ddc..624b57d44a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -141,30 +141,6 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova when(notApprovedJudgeApproval.getJudgeDecision()).thenReturn(null); return Stream.of( -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() -// .value(draftReviews.get(0)).build())) -// .build()).build())) -// .build(), -// draftReviews, -// approvedJudgeApproval, -// true // should call handleApprovable -// ), -// Arguments.of( -// DraftOrdersWrapper.builder() -// .draftOrdersReviewCollection(List.of( -// DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() -// .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() -// .value(psaReviews.get(0)).build())) -// .build()).build())) -// .build(), -// psaReviews, -// approvedJudgeApproval, -// true -// ), Arguments.of( DraftOrdersWrapper.builder() .agreedDraftOrderCollection(List.of( From 331ba970d7d16a42340e7c39cd3495471b3b9794 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 6 Dec 2024 10:55:48 +0000 Subject: [PATCH 159/336] wrong property --- .../model/ccd/draftorders/judgeapproval/JudgeDecision.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java index 41f2a02470..694cee3595 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java @@ -7,8 +7,8 @@ public enum JudgeDecision { REVIEW_LATER(false, false, false), LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false, false, true), - JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, true), - READY_TO_BE_SEALED(true, true, true); + JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, false), + READY_TO_BE_SEALED(true, true, false); private final boolean hearingInstructionRequired; private final boolean approved; private final boolean refused; From 2b823bff1ba89e76c3d8baed24c745c473d21482 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:54:03 +0000 Subject: [PATCH 160/336] Improve coverage and improve tests --- .../JudgeApprovalResolverTest.java | 44 ++++++++++++++++--- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 624b57d44a..e3b5097ed1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -16,7 +16,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -31,13 +35,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; -@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class) class JudgeApprovalResolverTest { - private static final String AUTH_TOKEN = "auth-token"; @Spy @InjectMocks @@ -107,7 +111,9 @@ void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, JudgeApproval judgeApproval, boolean shouldCallHandleApprovable) { CaseDocument targetDoc = CaseDocument.builder().build(); - + if (shouldCallHandleApprovable) { + approvables.forEach(approvable -> when(approvable.match(targetDoc)).thenReturn(true)); // Ensure approvables match the targetDoc + } judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, "auth"); if (approvables != null) { @@ -130,17 +136,41 @@ void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, } static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { - List draftReviews = List.of(DraftOrderDocumentReview.builder().build()); - List psaReviews = List.of(PsaDocumentReview.builder().build()); + //Mock approvable objects to ensure they match the target document + DraftOrderDocumentReview draftReview = mock(DraftOrderDocumentReview.class); + PsaDocumentReview psaReview = mock(PsaDocumentReview.class); List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); - JudgeApproval approvedJudgeApproval = mock(JudgeApproval.class); - when(approvedJudgeApproval.getJudgeDecision()).thenReturn(READY_TO_BE_SEALED); + when(approvedJudgeApproval.getJudgeDecision()).thenReturn(JUDGE_NEEDS_TO_MAKE_CHANGES); JudgeApproval notApprovedJudgeApproval = mock(JudgeApproval.class); when(notApprovedJudgeApproval.getJudgeDecision()).thenReturn(null); return Stream.of( + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() + .value(draftReview).build())) + .build()).build())) + .build(), + List.of(draftReview), + approvedJudgeApproval, + true // should call handleApprovable + ), + Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() + .value(psaReview).build())) + .build()).build())) + .build(), + List.of(psaReview), + approvedJudgeApproval, + true // should call handleApprovable + ), Arguments.of( DraftOrdersWrapper.builder() .agreedDraftOrderCollection(List.of( From 5043a61d2a4d2811760dca41abd41b9d88a282be Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 09:47:01 +0000 Subject: [PATCH 161/336] FileUtils method for inserting timestamp to a filename. --- .../caseorchestration/utils/FileUtils.java | 21 ++++++++++ .../utils/FileUtilsTest.java | 39 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtils.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtils.java index ffe1724ca0..d36daa4177 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtils.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtils.java @@ -2,7 +2,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.Locale; public class FileUtils { @@ -26,4 +28,23 @@ public static boolean isWordDocument(CaseDocument caseDocument) { return isDocumentType(caseDocument, ".DOC", ".DOCX"); } + /** + * Inserts a timestamp into a given filename. + * + * @param filename the original filename (e.g., "ABC.pdf") + * @return the filename with the timestamp inserted (e.g., "ABC_20241209_123456.pdf") + * @throws IllegalArgumentException if the filename is invalid + */ + public static String insertTimestamp(String filename) { + if (filename == null || !filename.contains(".")) { + throw new IllegalArgumentException("Invalid filename: " + filename); + } + + String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date()); + int lastDotIndex = filename.lastIndexOf("."); + String baseName = filename.substring(0, lastDotIndex); + String extension = filename.substring(lastDotIndex); + + return baseName + "_" + timestamp + extension; + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java index a486bfd4e3..455506f73c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java @@ -1,9 +1,15 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.utils; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import java.text.SimpleDateFormat; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; class FileUtilsTest { @@ -63,4 +69,37 @@ void shouldReturnFalseForNullFilename() { assertFalse(FileUtils.isWordDocument(nullDocument)); } + @ParameterizedTest(name = "[{index}] Original: \"{0}\", Expected: Starts with \"{1}\" and ends with \"{2}\"") + @CsvSource({ + "'ABC.pdf', 'ABC', '.pdf'", + "'document.docx', 'document', '.docx'", + "'example.txt', 'example', '.txt'" + }) + void testInsertTimestamp(String originalFilename, String expectedBaseName, String expectedExtension) { + // Call the method under test + String result = FileUtils.insertTimestamp(originalFilename); + + // Assert that the result starts with the base name + assertTrue(result.startsWith(expectedBaseName), "Filename does not start with the expected base name"); + + // Assert that the result ends with the expected extension + assertTrue(result.endsWith(expectedExtension), "Filename does not end with the expected extension"); + + // Extract the timestamp and validate its format + String timestampPart = result.substring(expectedBaseName.length() + 1, result.length() - expectedExtension.length()); + assertDoesNotThrow(() -> new SimpleDateFormat("yyyyMMdd_HHmmss").parse(timestampPart), + "Timestamp part is not in the expected format"); + } + + @ParameterizedTest + @CsvSource({ + "''", // Empty string + "null", // Null string + "'filename_without_extension'" // Filename without an extension + }) + void testInsertTimestampWithInvalidInputs(String invalidFilename) { + assertThrows(IllegalArgumentException.class, () -> FileUtils.insertTimestamp(invalidFilename), + "Expected IllegalArgumentException for invalid filename: " + invalidFilename); + } + } From 6d75ca8bdd4c3e45a87212e522a78108cb46d8ce Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 09:59:42 +0000 Subject: [PATCH 162/336] insert timestamp to the refusal order filename. --- .../service/judgeapproval/JudgeApprovalResolver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index d1f8489867..ad45da5b74 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -36,6 +36,7 @@ import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; @Component @RequiredArgsConstructor @@ -124,7 +125,7 @@ private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, St finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() ), documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), - documentConfiguration.getContestedDraftOrderNotApprovedFileName(), + insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), finremCaseDetails.getId().toString()); } finally { // Clear the temp values as they are for report generation purpose. From cca28e2fb4a511b7bf8e82420f4748611168da42 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:14:27 +0000 Subject: [PATCH 163/336] Add getter for order status --- .../reform/finrem/caseorchestration/model/ccd/Approvable.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index ee68de0e4b..db665e24ca 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -6,6 +6,8 @@ public interface Approvable extends DocumentMatcher { + OrderStatus getOrderStatus(); + void setOrderStatus(OrderStatus orderStatus); void setApprovalDate(LocalDateTime approvalDate); From b1c42b099456c4e8cb092107fedead21fcd5577a Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:15:02 +0000 Subject: [PATCH 164/336] refactor mock for approvables and verify order status --- .../JudgeApprovalResolverTest.java | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index e3b5097ed1..f613586d27 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -20,6 +20,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; @@ -28,6 +29,7 @@ import java.util.List; import java.util.stream.Stream; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -36,7 +38,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @ExtendWith(MockitoExtension.class) @@ -109,11 +110,10 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, List approvables, JudgeApproval judgeApproval, - boolean shouldCallHandleApprovable) { - CaseDocument targetDoc = CaseDocument.builder().build(); - if (shouldCallHandleApprovable) { - approvables.forEach(approvable -> when(approvable.match(targetDoc)).thenReturn(true)); // Ensure approvables match the targetDoc - } + boolean shouldCallHandleApprovable, + CaseDocument targetDoc + ) { + judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, "auth"); if (approvables != null) { @@ -124,6 +124,7 @@ void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, if (shouldCallHandleApprovable) { verify(judgeApprovalResolver, times(1)) .handleApprovable(approvable, judgeApproval, "auth"); + assertEquals(OrderStatus.APPROVED_BY_JUDGE, approvable.getOrderStatus()); } else { verify(judgeApprovalResolver, never()) .handleApprovable(any(), any(), any()); @@ -137,11 +138,22 @@ void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { //Mock approvable objects to ensure they match the target document - DraftOrderDocumentReview draftReview = mock(DraftOrderDocumentReview.class); - PsaDocumentReview psaReview = mock(PsaDocumentReview.class); + CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); + CaseDocument psaDocument = CaseDocument.builder().documentUrl("NEW_DOC2.doc").build(); + + DraftOrderDocumentReview draftReview = DraftOrderDocumentReview.builder() + .draftOrderDocument(draftOrderDocument) + .build(); + PsaDocumentReview psaReview = PsaDocumentReview.builder() + .psaDocument(psaDocument) + .build(); + + List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); - JudgeApproval approvedJudgeApproval = mock(JudgeApproval.class); - when(approvedJudgeApproval.getJudgeDecision()).thenReturn(JUDGE_NEEDS_TO_MAKE_CHANGES); + + JudgeApproval approvedJudgeApproval = JudgeApproval.builder() + .judgeDecision(READY_TO_BE_SEALED) + .build(); JudgeApproval notApprovedJudgeApproval = mock(JudgeApproval.class); when(notApprovedJudgeApproval.getJudgeDecision()).thenReturn(null); @@ -157,7 +169,8 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build(), List.of(draftReview), approvedJudgeApproval, - true // should call handleApprovable + true, // should call handleApprovable + draftOrderDocument ), Arguments.of( DraftOrdersWrapper.builder() @@ -169,7 +182,8 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build(), List.of(psaReview), approvedJudgeApproval, - true // should call handleApprovable + true, // should call handleApprovable + psaDocument ), Arguments.of( DraftOrdersWrapper.builder() @@ -178,9 +192,10 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build(), agreedDrafts, notApprovedJudgeApproval, - false // should not call handleApprovable + false, // should not call handleApprovable + CaseDocument.builder().build() ), - Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false) + Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false, CaseDocument.builder().build()) ); } } From 464d86847dab06094d1908821627cf7ebd599c67 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:34:47 +0000 Subject: [PATCH 165/336] Improve coverage --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index f613586d27..9647c8150c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -38,6 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @ExtendWith(MockitoExtension.class) @@ -155,6 +156,10 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .judgeDecision(READY_TO_BE_SEALED) .build(); + JudgeApproval approvedJudgeApprovalWithChanges = JudgeApproval.builder() + .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) + .build(); + JudgeApproval notApprovedJudgeApproval = mock(JudgeApproval.class); when(notApprovedJudgeApproval.getJudgeDecision()).thenReturn(null); @@ -168,7 +173,7 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build()).build())) .build(), List.of(draftReview), - approvedJudgeApproval, + approvedJudgeApprovalWithChanges , true, // should call handleApprovable draftOrderDocument ), From 655584108925f519ef1080bc3ec8e2156a68acc9 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:37:13 +0000 Subject: [PATCH 166/336] fix import --- .../judgeapproval/ApproveDraftOrdersMidEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index b0b04e0772..dcfa278686 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; import lombok.extern.slf4j.Slf4j; -import org.apache.tika.utils.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; From 5596992525ca368763f2034516ef14a912cbd5e5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 11:58:14 +0000 Subject: [PATCH 167/336] Remove refused order from AgreedDraftOrderCollection --- .../agreed/AgreedDraftOrderCollection.java | 3 +- .../judgeapproval/JudgeApprovalResolver.java | 29 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java index 52db790f34..f5780be79c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java @@ -5,6 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) @@ -12,6 +13,6 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class AgreedDraftOrderCollection implements HasCaseDocument { +public class AgreedDraftOrderCollection implements HasCaseDocument, HasApprovable { private AgreedDraftOrder value; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index ad45da5b74..b8f1859d83 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -68,7 +68,7 @@ void populateJudgeDecision(FinremCaseDetails finremCaseDetails, DraftOrdersWrapp .map(HearingInstruction::getAnotherHearingRequestCollection) .ifPresent(collection -> collection.forEach(a -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, a.getValue()))); } - moveRefusedDraftOrdersAndPsaToRefusedOrders(finremCaseDetails, draftOrdersWrapper, judgeApproval, userAuthorisation); + processRefusedOrders(finremCaseDetails, draftOrdersWrapper, judgeApproval, userAuthorisation); } void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, @@ -136,15 +136,21 @@ private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, St } } - private void moveRefusedDraftOrdersAndPsaToRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, - JudgeApproval judgeApproval, String userAuthorisation) { + private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, + JudgeApproval judgeApproval, String userAuthorisation) { List removedItems = new ArrayList<>(); List removedPsaItems = new ArrayList<>(); + + // remove refused draft orders/PSAs from agreedDraftOrderCollection + filterAgreedDraftOrderCollections(draftOrdersWrapper, REFUSED); + + // remove refused draft orders/PSAs from PsaDocReviewCollection and DraftOrderDocReviewCollection and collect them draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRemovedItemsFromDraftOrderDocReviewCollection(removedItems, draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRemovedItemsFromPsaDocReviewCollection(removedPsaItems, draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); + // create RefusedOrder from collected items. draftOrdersWrapper.setRefusedOrdersCollection( Stream.concat( Stream.concat( @@ -207,7 +213,7 @@ private List filterAndCollectRemovedItemsFromPsaDoc } private List filterAndCollectRemovedItemsFromReviewCollection( - List removedItems, + List removedItemsCollector, List draftOrdersReviewCollection, OrderStatus statusToRemove, Function> getReviewCollection, @@ -228,7 +234,9 @@ private List filterAndCol setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); // Collect the removed items - removedItems.addAll(partitioned.get(true)); + if (removedItemsCollector != null) { + removedItemsCollector.addAll(partitioned.get(true)); + } // Create a new DraftOrdersReviewCollection DraftOrdersReviewCollection updatedCollection = new DraftOrdersReviewCollection(); @@ -238,6 +246,17 @@ private List filterAndCol .toList(); } + private void filterAgreedDraftOrderCollections(DraftOrdersWrapper draftOrdersWrapper, + OrderStatus statusToRemove) { + Map> partitioned = + partitionDraftOrderDocReviewCollection( + draftOrdersWrapper.getAgreedDraftOrderCollection(), + statusToRemove + ); + draftOrdersWrapper.setAgreedDraftOrderCollection(partitioned.get(false)); + } + + private Map> partitionDraftOrderDocReviewCollection( List draftOrderDocReviewCollection, OrderStatus statusToRemove) { From e032596adbc8224bf8b416ece1089447a1bda715 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:25:57 +0000 Subject: [PATCH 168/336] Java Docs added --- .../judgeapproval/HearingProcessor.java | 33 ++++++++++++++++++ .../judgeapproval/JudgeApprovalResolver.java | 34 +++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java index 8c6bce6a8c..f5cc11ab1f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessor.java @@ -17,11 +17,29 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; +/** + * The HearingProcessor class handles the processing of hearing instructions + * for draft orders, including validation of input data and updating the draft orders + * based on the provided hearing request. + */ @Component class HearingProcessor { private static final String SEPARATOR = "#"; + /** + * Processes the hearing instruction related to a draft order based on the + * provided DraftOrdersWrapper and AnotherHearingRequest. This method + * handles the extraction and validation of the selected value, invokes the + * appropriate method for retrieving judge approval, and processes review + * collections. + * + * @param draftOrdersWrapper the wrapper object containing the draft orders + * @param anotherHearingRequest the request containing hearing-related data + * @throws IllegalStateException if there is a missing or unexpected value + * in the AnotherHearingRequest or if the reflection-based method + * invocation fails + */ void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHearingRequest anotherHearingRequest) { String[] splitResult = ofNullable(anotherHearingRequest) .map(AnotherHearingRequest::getWhichOrder) @@ -45,16 +63,19 @@ void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHea } catch (Exception e) { throw new IllegalStateException(format("Unexpected method \"getJudgeApproval%s\" was invoked", orderIndex), e); } + // Process hearing instructions based on the judge approval and draft order review collections ofNullable(judgeApproval) .map(JudgeApproval::getDocument).ifPresent(targetDoc -> ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) .ifPresent(collection -> collection.forEach(el -> { if (el.getValue() != null) { + // Process draft order document review collection ofNullable(el.getValue().getDraftOrderDocReviewCollection()) .ifPresent(draftOrderDocReviewCollection -> processHearingInstruction(draftOrderDocReviewCollection.stream() .map(DraftOrderDocReviewCollection::getValue).toList(), targetDoc, anotherHearingRequest) ); + // Process PSA document review collection ofNullable(el.getValue().getPsaDocReviewCollection()) .ifPresent(psaDocReviewCollection -> processHearingInstruction(psaDocReviewCollection.stream() @@ -64,12 +85,24 @@ void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, AnotherHea }))); } + /** + * Processes a list of hearing instructions and updates their properties based on + * the target document and hearing request. This method modifies the + * properties of each instruction to reflect the hearing details (e.g. + * hearing type, additional time, time estimate). + * + * @param hip the list of hearing instructions to process + * @param targetDoc the document representing the target case + * @param anotherHearingRequest the request containing additional hearing details + */ void processHearingInstruction(List hip, CaseDocument targetDoc, AnotherHearingRequest anotherHearingRequest) { ofNullable(hip) .ifPresent(list -> list.forEach(el -> { + // Check if the hearing instruction matches the target document if (el.match(targetDoc)) { + // Update hearing instruction properties based on the hearing request el.setAnotherHearingToBeListed(YesOrNo.YES); el.setHearingType(anotherHearingRequest.getTypeOfHearing().name()); el.setAdditionalTime(anotherHearingRequest.getAdditionalTime()); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index dd1600f81f..2540129bcd 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -29,6 +29,16 @@ class JudgeApprovalResolver { private final HearingProcessor hearingProcessor; + /** + * Populates the judge's decision for the given draft orders and updates the status of approvable documents. + * This method processes the draft order review collection, PSA review collection, and agreed draft orders, + * and if the judge has approved, it processes the hearing instructions as well. + * + * @param draftOrdersWrapper the wrapper containing the draft orders to be processed + * @param targetDoc the target document to match against the approvable items + * @param judgeApproval the judge's approval information containing the decision + * @param userAuthorisation the user authorization string used to fetch the judge's full name + */ void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) @@ -53,6 +63,15 @@ void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument t } } + /** + * Processes a collection of approvable documents by matching them with the target document and handling + * the approval process based on the judge's decision. + * + * @param approvables a list of approvable items to be processed + * @param targetDoc the target document to match the approvable items against + * @param judgeApproval the judge's approval information containing the decision + * @param userAuthorisation the user authorization string to get the judge's full name + */ void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { ofNullable(approvables) @@ -64,6 +83,15 @@ void processApprovableCollection(List approvables, CaseDoc ); } + /** + * Handles the approval of an approvable item based on the judge's decision. If the judge has approved and + * requested changes, the document is replaced with the amended one. The status of the approvable item is updated + * and the approval date and judge's name are recorded. + * + * @param approvable the approvable item to be handled + * @param judgeApproval the judge's approval information containing the decision + * @param userAuthorisation the user authorization string to get the judge's full name + */ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { if (isJudgeApproved(judgeApproval)) { if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { @@ -75,6 +103,12 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String } } + /** + * Checks whether the judge has approved the draft order or if changes are required by the judge. + * + * @param judgeApproval the judge's approval information + * @return true if the judge's decision is to approve or request changes, false otherwise + */ private boolean isJudgeApproved(JudgeApproval judgeApproval) { return judgeApproval != null && Arrays.asList(READY_TO_BE_SEALED, JUDGE_NEEDS_TO_MAKE_CHANGES).contains(judgeApproval.getJudgeDecision()); } From 52ed03c441dd1de348f5b56f899b7bfa46177be2 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:28:01 +0000 Subject: [PATCH 169/336] Remove @spy in ApproveOrderServiceTest --- .../service/judgeapproval/ApproveOrderServiceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index f7746a88a9..5c12d21c86 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -28,7 +27,6 @@ class ApproveOrderServiceTest { private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); - @Spy @InjectMocks private ApproveOrderService underTest; From f07832327d9398b73756adca636bb177a04fbf41 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:36:47 +0000 Subject: [PATCH 170/336] remove @spy and improve test setup --- .../judgeapproval/HearingProcessorTest.java | 74 ++++++++++++------- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java index b5fd3afe19..82f0e1fc17 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/HearingProcessorTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; -import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; @@ -16,9 +15,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; @@ -29,16 +30,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.eq; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class) class HearingProcessorTest { @@ -46,7 +42,6 @@ class HearingProcessorTest { private static final CaseDocument TARGET_DOC = mock(CaseDocument.class); - @Spy @InjectMocks private HearingProcessor hearingProcessor; @@ -134,12 +129,19 @@ void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, Anoth boolean processHearingInstructionInvokedExpected, String expectedIllegalStateExceptionMessage) { if (expectedIllegalStateExceptionMessage == null) { hearingProcessor.processHearingInstruction(draftOrdersWrapper, anotherHearingRequest); - verify(hearingProcessor, times(processHearingInstructionInvokedExpected ? 2 : 0)) - .processHearingInstruction( - anyList(), // Matcher for List type - eq(TARGET_DOC), // Matcher for CaseDocument - any(AnotherHearingRequest.class) // Matcher for AnotherHearingRequest - ); + //Check the expected changes in data + if (processHearingInstructionInvokedExpected) { + //Verify that specific fields are updated + assertTrue(draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + .flatMap(el -> el.getValue().getDraftOrderDocReviewCollection().stream()) + .anyMatch(doc -> YesOrNo.YES.equals(doc.getValue().getAnotherHearingToBeListed()))); + } else { + // Verify no changes are made + assertTrue(draftOrdersWrapper.getDraftOrdersReviewCollection().stream() + .flatMap(el -> el.getValue().getDraftOrderDocReviewCollection().stream()) + .noneMatch(doc -> YesOrNo.YES.equals(doc.getValue().getAnotherHearingToBeListed()))); + } + } else { IllegalStateException exception = assertThrows( IllegalStateException.class, @@ -150,14 +152,31 @@ void testProcessHearingInstruction2(DraftOrdersWrapper draftOrdersWrapper, Anoth } static Stream provideProcessHearingInstructionData() { + CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); + CaseDocument psaDocument = CaseDocument.builder().documentUrl("NEW_DOC2.doc").build(); + + + DraftOrderDocumentReview draftReview = DraftOrderDocumentReview.builder() + .draftOrderDocument(draftOrderDocument) + .build(); + PsaDocumentReview psaReview = PsaDocumentReview.builder() + .psaDocument(psaDocument) + .build(); + return Stream.of( // happy path 1 Arguments.of( DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() + .value(draftReview).build())).build()).build())) + .judgeApproval1(JudgeApproval.builder().document(draftOrderDocument).build()) .build(), AnotherHearingRequest.builder() + .typeOfHearing(InterimTypeOfHearing.FH) + .additionalTime("Test additional time") + .timeEstimate(HearingTimeDirection.STANDARD_TIME) + .anyOtherListingInstructions("Test other listing instruction") .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("DRAFT_ORDER%s1", SEPARATOR)).build()).build()) .build(), true, null @@ -165,10 +184,16 @@ static Stream provideProcessHearingInstructionData() { // happy path 2 Arguments.of( DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) - .judgeApproval1(JudgeApproval.builder().document(TARGET_DOC).build()) + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() + .value(draftReview).build())).build()).build())) + .judgeApproval1(JudgeApproval.builder().document(draftOrderDocument).build()) .build(), AnotherHearingRequest.builder() + .typeOfHearing(InterimTypeOfHearing.FH) + .additionalTime("Test additional time") + .timeEstimate(HearingTimeDirection.STANDARD_TIME) + .anyOtherListingInstructions("Test other listing instruction") .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) .build(), true, null @@ -187,7 +212,10 @@ static Stream provideProcessHearingInstructionData() { // missing corresponding judgeApproval when a PSA in whichOrder selected Arguments.of( DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder().build()).build())) + .draftOrdersReviewCollection(List.of(DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() + .value(psaReview).build())) + .build()).build())) .judgeApproval2(JudgeApproval.builder().document(TARGET_DOC).build()) .build(), AnotherHearingRequest.builder() @@ -195,14 +223,6 @@ static Stream provideProcessHearingInstructionData() { .build(), false, null ), - // missing draftOrdersReviewCollection in DraftOrdersWrapper - Arguments.of( - DraftOrdersWrapper.builder().build(), - AnotherHearingRequest.builder() - .whichOrder(DynamicList.builder().value(DynamicListElement.builder().code(format("PSA%s1", SEPARATOR)).build()).build()) - .build(), - false, null - ), // missing whichOrder Arguments.of( DraftOrdersWrapper.builder().build(), From f2e3744ce9746a7f2340a134f314c016ef9da30a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 15:46:53 +0000 Subject: [PATCH 171/336] Add email template id --- .../notifications/domain/EmailTemplateNames.java | 1 + .../notifications/service/EmailService.java | 9 +++++++++ .../caseorchestration/service/NotificationService.java | 6 ++++++ src/main/resources/application.properties | 2 ++ src/test/resources/application.properties | 2 ++ 5 files changed, 20 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/EmailTemplateNames.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/EmailTemplateNames.java index 68b59f66bc..5491e54f31 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/EmailTemplateNames.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/EmailTemplateNames.java @@ -19,6 +19,7 @@ public enum EmailTemplateNames { FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE, FR_CONTESTED_DRAFT_ORDER, FR_CONTEST_ORDER_NOT_APPROVED, + FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED, FR_CONTESTED_CONSENT_ORDER_APPROVED, FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED, FR_CONTESTED_GENERAL_ORDER_CONSENT, diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java index ec8d2caf6a..51cc18630b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java @@ -135,6 +135,10 @@ protected Map buildTemplateVars(NotificationRequest notification addDraftOrderReviewOverdueTemplateVars(notificationRequest, templateVars); } + if (EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED.name().equals(templateName)) { + addRefusedDraftOrderOrPsaTemplateVars(notificationRequest, templateVars); + } + templateVars.putAll(emailTemplateVars.get(templateName)); return templateVars; } @@ -155,6 +159,11 @@ private void addDraftOrderReviewOverdueTemplateVars(NotificationRequest notifica templateVars.put("oldestDraftOrderDate", notificationRequest.getOldestDraftOrderDate()); } + private void addRefusedDraftOrderOrPsaTemplateVars(NotificationRequest notificationRequest, + Map templateVars) { + templateVars.put("judgeFeedback", notificationRequest.getJudgeFeedback()); + } + private EmailToSend generateEmail(String destinationAddress, String templateName, Map templateVars) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java index 1c6dc8d994..4a36902e09 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java @@ -83,6 +83,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_UPDATE_FRC_COURT; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_UPDATE_FRC_SOL; +import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTEST_ORDER_APPROVED_APPLICANT; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTEST_ORDER_APPROVED_INTERVENER1; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTEST_ORDER_APPROVED_INTERVENER2; @@ -1971,4 +1972,9 @@ public void sendDraftOrderReviewOverdueToCaseworker(NotificationRequest notifica emailService.sendConfirmationEmail(notificationRequest, FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE); } + + public void sendDraftOrderOrPsaRefused(NotificationRequest notificationRequest) { + log.info("{} - Sending draft order or PSA refused to caseworker", notificationRequest.getCaseReferenceNumber()); + emailService.sendConfirmationEmail(notificationRequest, FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED); + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3ea56db340..76cf49ef21 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -286,6 +286,7 @@ uk.gov.notify.email.templates=${UK_GOV_NOTIFY_EMAIL_TEMPLATES:\ FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT: '5166e828-2226-49d1-91b7-7407c682ff86',\ FR_CONTESTED_PREPARE_FOR_HEARING_INTERVENER_SOL: 'f5a55b88-7df6-4c54-8370-713e3ff5d152',\ FR_CONTEST_ORDER_NOT_APPROVED: '394e1407-cce5-4fa7-98df-431618b2eba4',\ + FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED: '2cf0a3b6-f186-4437-b28a-0e961305a0f5',\ FR_CONTESTED_CONSENT_ORDER_APPROVED: 'edc2be64-37f0-4104-80d5-5a7c10d0b6dd',\ FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED: '4f725f63-65c2-4e23-8967-874de5142b65',\ FR_CONTESTED_GENERAL_ORDER_CONSENT: '56a7e732-4b84-498f-8468-526160d3f344',\ @@ -337,6 +338,7 @@ uk.gov.notify.email.template.vars={\ FR_CONTESTED_PREPARE_FOR_HEARING_INTERVENER_SOL: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_INTERIM_HEARING: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTEST_ORDER_NOT_APPROVED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ + FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_CONSENT_ORDER_APPROVED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_GENERAL_ORDER_CONSENT: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 36b9d81354..bb1029f67a 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -217,6 +217,7 @@ uk.gov.notify.email.templates=${UK_GOV_NOTIFY_EMAIL_TEMPLATES:\ FR_CONTESTED_PREPARE_FOR_HEARING: 'f1ee98aa-c6fe-4226-a309-d75e4dd0f8dd',\ FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT: '5166e828-2226-49d1-91b7-7407c682ff86',\ FR_CONTESTED_PREPARE_FOR_HEARING_INTERVENER_SOL: 'f5a55b88-7df6-4c54-8370-713e3ff5d152',\ + FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED '2cf0a3b6-f186-4437-b28a-0e961305a0f5',\ FR_CONTEST_ORDER_NOT_APPROVED: '394e1407-cce5-4fa7-98df-431618b2eba4',\ FR_CONTESTED_CONSENT_ORDER_APPROVED: 'edc2be64-37f0-4104-80d5-5a7c10d0b6dd',\ FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED: '4f725f63-65c2-4e23-8967-874de5142b65',\ @@ -262,6 +263,7 @@ uk.gov.notify.email.template.vars={\ FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_PREPARE_FOR_HEARING_INTERVENER_SOL: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_INTERIM_HEARING: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ + FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTEST_ORDER_NOT_APPROVED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_CONSENT_ORDER_APPROVED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED: {frEmail:'contactFinancialRemedy@justice.gov.uk', contactNumber:'0300 303 0642', linkToSmartSurvey:'http://www.smartsurvey.co.uk/s/KCECE/'},\ From 58c09b92f758ae00b28d92cd89c77edb9d9e75f6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 15:50:11 +0000 Subject: [PATCH 172/336] remove an extra blank line. --- .../service/judgeapproval/JudgeApprovalResolver.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b8f1859d83..1924df90f3 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -256,7 +256,6 @@ private void filterAgreedDraftOrderCollections(DraftOrdersWrapper draftOrdersWra draftOrdersWrapper.setAgreedDraftOrderCollection(partitioned.get(false)); } - private Map> partitionDraftOrderDocReviewCollection( List draftOrderDocReviewCollection, OrderStatus statusToRemove) { From c3524eca734b2d6a7215617d7497a07b81ed2c92 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 15:51:48 +0000 Subject: [PATCH 173/336] typo --- .../finrem/caseorchestration/service/NotificationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java index 4a36902e09..576204d92c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java @@ -1974,7 +1974,7 @@ public void sendDraftOrderReviewOverdueToCaseworker(NotificationRequest notifica } public void sendDraftOrderOrPsaRefused(NotificationRequest notificationRequest) { - log.info("{} - Sending draft order or PSA refused to caseworker", notificationRequest.getCaseReferenceNumber()); + log.info("{} - Sending draft order or PSA refused", notificationRequest.getCaseReferenceNumber()); emailService.sendConfirmationEmail(notificationRequest, FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED); } } From 05d0ff8bd5a3dd958a6608229be899439cc6d30f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 18:21:09 +0000 Subject: [PATCH 174/336] add judgeFeedback and documentName --- .../notification/NotificationRequest.java | 4 ++++ .../domain/NotificationRequestTest.java | 20 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/notification/NotificationRequest.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/notification/NotificationRequest.java index 021f226667..b04e7f9e3d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/notification/NotificationRequest.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/notification/NotificationRequest.java @@ -61,4 +61,8 @@ public class NotificationRequest { private String judgeName; @JsonProperty("oldestDraftOrderDate") private String oldestDraftOrderDate; + @JsonProperty("judgeFeedback") + private String judgeFeedback; + @JsonProperty("documentName") + private String documentName; } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/NotificationRequestTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/NotificationRequestTest.java index 4c7f2552b8..59da49a4f2 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/NotificationRequestTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/domain/NotificationRequestTest.java @@ -1,25 +1,25 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain; -import org.junit.Test; +import org.junit.jupiter.api.Test; import uk.gov.hmcts.reform.finrem.caseorchestration.model.notification.NotificationRequest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.NotificationConstants.PHONE_OPENING_HOURS; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.TestConstants.CONTESTED; -public class NotificationRequestTest { +class NotificationRequestTest { private NotificationRequest underTest; @Test - public void shouldGetHwfNotificationRequestData() { + void shouldGetHwfNotificationRequestData() { underTest = new NotificationRequest("123456", "45623", "D123", "Padmaja", "test@test.com", "nottingham", CONTESTED, "body", PHONE_OPENING_HOURS, "consent", "Consent", "rejectedReason", "app", "res", "1234567890", "", "", "", "", null, null, - "2024-01-01", "judgeName", "2024-01-01"); + "2024-01-01", "judgeName", "2024-01-01", "Feedback by Mr. judge", "ABC.doc"); assertEquals("123456", underTest.getCaseReferenceNumber()); assertEquals("45623", underTest.getSolicitorReferenceNumber()); assertEquals("D123", underTest.getDivorceCaseNumber()); @@ -36,10 +36,12 @@ public void shouldGetHwfNotificationRequestData() { assertEquals("judgeName", underTest.getJudgeName()); assertEquals("2024-01-01", underTest.getHearingDate()); assertEquals("2024-01-01", underTest.getOldestDraftOrderDate()); + assertEquals("Feedback by Mr. judge", underTest.getJudgeFeedback()); + assertEquals("ABC.doc", underTest.getDocumentName()); } @Test - public void shouldNotGetHwfNotificationRequestData() { + void shouldNotGetHwfNotificationRequestData() { underTest = new NotificationRequest(); assertNull(underTest.getCaseReferenceNumber()); assertNull(underTest.getSolicitorReferenceNumber()); @@ -52,7 +54,7 @@ public void shouldNotGetHwfNotificationRequestData() { } @Test - public void shouldSetAndGetHwfNotificationRequestData() { + void shouldSetAndGetHwfNotificationRequestData() { underTest = new NotificationRequest(); setNotificationData(); assertNotificationData(); @@ -68,7 +70,7 @@ private void assertNotificationData() { } @Test - public void shouldSetAndGetHwfNotificationRequestDataForContested() { + void shouldSetAndGetHwfNotificationRequestDataForContested() { underTest = new NotificationRequest(); setNotificationData(); underTest.setSelectedCourt("nottingham"); From 41f1a09e57adb91f28f2700550897e7e21e7fa03 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 18:32:04 +0000 Subject: [PATCH 175/336] capture submitted by email address and populate them to AgreedDraftOrder and SuggestedDraftOrder. --- ...UploadDraftOrdersAboutToSubmitHandler.java | 8 +-- .../DraftOrdersNotificationRequestMapper.java | 24 +++++++ .../model/ccd/Approvable.java | 1 - .../model/ccd/HasSubmittedInfo.java | 2 + .../model/ccd/RefusalOrderConvertible.java | 21 ++++++ .../draftorders/agreed/AgreedDraftOrder.java | 26 +++---- .../review/DraftOrderDocumentReview.java | 10 ++- .../draftorders/review/PsaDocumentReview.java | 10 ++- .../ccd/draftorders/review/RefusedOrder.java | 9 +++ .../suggested/SuggestedDraftOrder.java | 1 + .../notifications/service/EmailService.java | 1 + .../service/DraftOrderService.java | 9 ++- .../judgeapproval/JudgeApprovalResolver.java | 70 ++++++++++--------- ...oadDraftOrderAboutToSubmitHandlerTest.java | 10 ++- .../service/DraftOrderServiceTest.java | 17 +++-- 15 files changed, 151 insertions(+), 68 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java index 9714c7674b..94ed9bc147 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java @@ -31,7 +31,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.DraftOrderService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamAuthService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.DraftOrdersCategoriser; -import uk.gov.hmcts.reform.idam.client.models.UserInfo; +import uk.gov.hmcts.reform.idam.client.models.UserDetails; import java.time.LocalDateTime; import java.util.ArrayList; @@ -244,9 +244,9 @@ private String checkRole(String id, String auth) { } private T applySubmittedInfo(String userAuthorisation, T submittedInfo) { - UserInfo userInfo = idamAuthService.getUserInfo(userAuthorisation); - String submittedByName = userInfo.getName(); - submittedInfo.setSubmittedBy(submittedByName); + UserDetails userDetails = idamAuthService.getUserDetails(userAuthorisation); + submittedInfo.setSubmittedBy(userDetails.getFullName()); + submittedInfo.setSubmittedByEmail(userDetails.getEmail()); submittedInfo.setSubmittedDate(LocalDateTime.now()); return submittedInfo; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java index 52be3eaca5..177ff9e55c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java @@ -5,15 +5,19 @@ import org.springframework.stereotype.Service; import uk.gov.hmcts.reform.finrem.caseorchestration.config.CourtDetailsConfiguration; import uk.gov.hmcts.reform.finrem.caseorchestration.helper.ContestedCourtHelper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.notification.NotificationRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.notifications.service.EmailService; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import static java.util.Optional.ofNullable; + @Service @Slf4j @RequiredArgsConstructor @@ -53,4 +57,24 @@ public NotificationRequest buildCaseworkerDraftOrderReviewOverdue(FinremCaseDeta .oldestDraftOrderDate(dateFormatter.format(draftOrdersReview.getEarliestToBeReviewedOrderDate())) .build(); } + + public NotificationRequest buildRefusedDraftOrderOrPsaNotificationRequest(FinremCaseDetails caseDetails, RefusedOrder refusedOrder) { + FinremCaseData caseData = caseDetails.getData(); + String notificationEmail = refusedOrder.getSubmittedByEmail(); + String documentName = ofNullable(refusedOrder.getDraftOrderOrPsa()).map(CaseDocument::getDocumentFilename) + .orElseThrow(IllegalArgumentException::new); + + return NotificationRequest.builder() + .notificationEmail(notificationEmail) + .caseReferenceNumber(String.valueOf(caseDetails.getId())) + .caseType(EmailService.CONTESTED) + .applicantName(caseData.getFullApplicantName()) + .respondentName(caseData.getRespondentFullName()) + .hearingDate(dateFormatter.format(refusedOrder.getHearingDate())) + .selectedCourt(ContestedCourtHelper.getSelectedFrc(caseDetails)) + .judgeName(refusedOrder.getRefusalJudge()) + .judgeFeedback(refusedOrder.getJudgeFeedback()) + .documentName(documentName) + .build(); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index f316bf65d0..89897a2c33 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -16,5 +16,4 @@ public interface Approvable extends DocumentMatcher { void replaceDocument(CaseDocument amendedDocument); - void setRefusedDate(LocalDateTime refusedDate); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java index ecb25556ee..6e45ca4de3 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java @@ -6,4 +6,6 @@ public interface HasSubmittedInfo { void setSubmittedDate(LocalDateTime localDate); void setSubmittedBy(String submittedBy); + + void setSubmittedByEmail(String submittedByEmail); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java new file mode 100644 index 0000000000..71d78e9fb1 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java @@ -0,0 +1,21 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +import java.time.LocalDateTime; + +public interface RefusalOrderConvertible extends Approvable { + + String getApprovalJudge(); + + CaseDocument getDraftOrderOrPsa(); + + LocalDateTime getRefusedDate(); + + String getSubmittedBy(); + + String getSubmittedByEmail(); + + LocalDateTime getSubmittedDate(); + + void setRefusedDate(LocalDateTime refusedDate); + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 6761254fcb..5373544f01 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -29,6 +29,7 @@ public class AgreedDraftOrder implements HasCaseDocument, HasSubmittedInfo, Appr private CaseDocument draftOrder; private CaseDocument pensionSharingAnnex; private String submittedBy; + private String submittedByEmail; private String uploadedOnBehalfOf; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime submittedDate; @@ -46,21 +47,6 @@ public boolean match(CaseDocument targetDoc) { .isPresent(); } - @Override - public void setApprovalDate(LocalDateTime approvalDate) { - // no approval date; Ignore it. - } - - @Override - public void setApprovalJudge(String approvalJudge) { - // no approval judge; Ignore it. - } - - @Override - public void setRefusedDate(LocalDateTime refusedDate) { - // no refused date; Ignore it. - } - @Override public void replaceDocument(CaseDocument amendedDocument) { if (this.draftOrder != null) { @@ -75,4 +61,14 @@ public void replaceDocument(CaseDocument amendedDocument) { } } + @Override + public void setApprovalDate(LocalDateTime approvalDate) { + // ignore + } + + @Override + public void setApprovalJudge(String approvalJudge) { + // ignore + } + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 785a6253e9..44b71aa80b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -6,10 +6,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; @@ -22,13 +22,14 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Approvable, HearingInstructionProcessable { +public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, RefusalOrderConvertible, HearingInstructionProcessable { private CaseDocument draftOrderDocument; private OrderStatus orderStatus; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime submittedDate; private YesOrNo resubmission; private String submittedBy; + private String submittedByEmail; private String uploadedOnBehalfOf; private List attachments; private String approvalJudge; @@ -55,4 +56,9 @@ public boolean match(CaseDocument targetDoc) { return Optional.ofNullable(targetDoc).map(CaseDocument::getDocumentUrl).equals(Optional.ofNullable(draftOrderDocument) .map(CaseDocument::getDocumentUrl)); } + + @Override + public CaseDocument getDraftOrderOrPsa() { + return getDraftOrderDocument(); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 9f4d7d1574..65def55167 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -6,10 +6,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; @@ -20,13 +20,14 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvable, HearingInstructionProcessable { +public class PsaDocumentReview implements HasCaseDocument, Reviewable, RefusalOrderConvertible, HearingInstructionProcessable { private CaseDocument psaDocument; private OrderStatus orderStatus; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime submittedDate; private YesOrNo resubmission; private String submittedBy; + private String submittedByEmail; private String uploadedOnBehalfOf; private String approvalJudge; @JsonSerialize(using = LocalDateTimeSerializer.class) @@ -52,4 +53,9 @@ public boolean match(CaseDocument targetDoc) { public void replaceDocument(CaseDocument amendedDocument) { this.setPsaDocument(amendedDocument); } + + @Override + public CaseDocument getDraftOrderOrPsa() { + return getPsaDocument(); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java index 8e0fe6618e..f9307e9702 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; @@ -12,6 +13,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -35,8 +37,15 @@ public class RefusedOrder implements HasCaseDocument { private String submittedBy; + private String submittedByEmail; + private List attachments; private String refusalJudge; + private String judgeFeedback; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private LocalDate hearingDate; + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java index ea4cac1c15..08796593a1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java @@ -24,6 +24,7 @@ public class SuggestedDraftOrder implements HasCaseDocument, HasSubmittedInfo { private CaseDocument draftOrder; private CaseDocument pensionSharingAnnex; private String submittedBy; + private String submittedByEmail; private String uploadedOnBehalfOf; @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime submittedDate; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java index 51cc18630b..e4ae372ac0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java @@ -162,6 +162,7 @@ private void addDraftOrderReviewOverdueTemplateVars(NotificationRequest notifica private void addRefusedDraftOrderOrPsaTemplateVars(NotificationRequest notificationRequest, Map templateVars) { templateVars.put("judgeFeedback", notificationRequest.getJudgeFeedback()); + templateVars.put("documentName", notificationRequest.getDocumentName()); } private EmailToSend generateEmail(String destinationAddress, diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java index 2c37b1819e..3b1bef0009 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java @@ -27,7 +27,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.idam.client.models.UserInfo; +import uk.gov.hmcts.reform.idam.client.models.UserDetails; import java.time.LocalDate; import java.time.LocalDateTime; @@ -50,9 +50,10 @@ public class DraftOrderService { private final HearingService hearingService; public T applySubmittedInfo(String userAuthorisation, T submittedInfo) { - UserInfo userInfo = idamAuthService.getUserInfo(userAuthorisation); - String submittedByName = userInfo.getName(); + UserDetails userDetails = idamAuthService.getUserDetails(userAuthorisation); + String submittedByName = userDetails.getFullName(); submittedInfo.setSubmittedBy(submittedByName); + submittedInfo.setSubmittedByEmail(userDetails.getEmail()); submittedInfo.setSubmittedDate(LocalDateTime.now()); return submittedInfo; } @@ -210,6 +211,7 @@ public void populateDraftOrdersReviewCollection(FinremCaseData finremCaseData, U .orderStatus(ado.getOrderStatus()) .draftOrderDocument(ado.getDraftOrder()) .submittedBy(ado.getSubmittedBy()) + .submittedByEmail(ado.getSubmittedByEmail()) .uploadedOnBehalfOf(ado.getUploadedOnBehalfOf()) .submittedDate(ado.getSubmittedDate()) .resubmission(ado.getResubmission()) @@ -231,6 +233,7 @@ public void populateDraftOrdersReviewCollection(FinremCaseData finremCaseData, U .orderStatus(ado.getOrderStatus()) .psaDocument(ado.getPensionSharingAnnex()) .submittedBy(ado.getSubmittedBy()) + .submittedByEmail(ado.getSubmittedByEmail()) .uploadedOnBehalfOf(ado.getUploadedOnBehalfOf()) .submittedDate(ado.getSubmittedDate()) .resubmission(ado.getResubmission()) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 1924df90f3..c42c7532fa 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -9,6 +9,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -24,10 +25,12 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; @@ -93,7 +96,9 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String } if (isJudgeRefused(judgeApproval)) { approvable.setOrderStatus(REFUSED); - approvable.setRefusedDate(LocalDateTime.now()); + if (approvable instanceof RefusalOrderConvertible refusalOrderConvertible) { + refusalOrderConvertible.setRefusedDate(LocalDateTime.now()); + } } } @@ -151,38 +156,39 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); // create RefusedOrder from collected items. + String judgeFeedback = judgeApproval.getChangesRequestedByJudge(); + LocalDate hearingDate = judgeApproval.getSortKey().getHearingDate(); + + List existingRefusedOrders = + ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new); + + Function toRefusedOrderCollection = item -> { + if (item.getValue() instanceof RefusalOrderConvertible refusalOrderConvertible) { + RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() + .draftOrderOrPsa(refusalOrderConvertible.getDraftOrderOrPsa()) + .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), + refusalOrderConvertible.getApprovalJudge(), null, userAuthorisation)) + .refusedDate(refusalOrderConvertible.getRefusedDate()) + .submittedDate(refusalOrderConvertible.getSubmittedDate()) + .submittedBy(refusalOrderConvertible.getSubmittedBy()) + .submittedByEmail(refusalOrderConvertible.getSubmittedByEmail()) + .refusalJudge(refusalOrderConvertible.getApprovalJudge()) + .judgeFeedback(judgeFeedback) + .hearingDate(hearingDate); + + return RefusedOrderCollection.builder().value(orderBuilder.build()).build(); + } else { + return null; + } + }; + + List newRefusedOrders = Stream.concat( + removedItems.stream().filter(a -> a.getValue() != null).map(toRefusedOrderCollection).filter(Objects::nonNull), + removedPsaItems.stream().filter(a -> a.getValue() != null).map(toRefusedOrderCollection).filter(Objects::nonNull) + ).toList(); + draftOrdersWrapper.setRefusedOrdersCollection( - Stream.concat( - Stream.concat( - ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new).stream(), - removedItems.stream() - .filter(a -> a.getValue() != null) - .map(a -> RefusedOrderCollection.builder() - .value(RefusedOrder.builder() - .draftOrderOrPsa(a.getValue().getDraftOrderDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), - a.getValue().getRefusedDate(), a.getValue().getApprovalJudge(), null, userAuthorisation)) - .refusedDate(a.getValue().getRefusedDate()) - .submittedDate(a.getValue().getSubmittedDate()) - .submittedBy(a.getValue().getSubmittedBy()) - .attachments(a.getValue().getAttachments()) - .refusalJudge(a.getValue().getApprovalJudge()) - .build()) - .build())), - removedPsaItems.stream() - .filter(a -> a.getValue() != null) - .map(a -> RefusedOrderCollection.builder() - .value(RefusedOrder.builder() - .draftOrderOrPsa(a.getValue().getPsaDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeApproval.getChangesRequestedByJudge(), - a.getValue().getRefusedDate(), a.getValue().getApprovalJudge(), null, userAuthorisation)) - .refusedDate(a.getValue().getRefusedDate()) - .submittedDate(a.getValue().getSubmittedDate()) - .submittedBy(a.getValue().getSubmittedBy()) - .refusalJudge(a.getValue().getApprovalJudge()) - .build()) - .build()) - ).toList() + Stream.concat(existingRefusedOrders.stream(), newRefusedOrders.stream()).toList() ); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java index ac620d522b..9564851b5e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java @@ -36,6 +36,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.DraftOrderService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamAuthService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.DraftOrdersCategoriser; +import uk.gov.hmcts.reform.idam.client.models.UserDetails; import uk.gov.hmcts.reform.idam.client.models.UserInfo; import java.time.LocalDateTime; @@ -122,9 +123,10 @@ void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { when(caseAssignedRoleService.getCaseAssignedUserRole(String.valueOf(caseID), AUTH_TOKEN)) .thenReturn(CaseAssignedUserRolesResource.builder().caseAssignedUserRoles(Collections.emptyList()).build()); - UserInfo mockUserInfo = mock(UserInfo.class); - when(idamAuthService.getUserInfo(AUTH_TOKEN)).thenReturn(mockUserInfo); - when(mockUserInfo.getName()).thenReturn("Hamzah"); + UserDetails mockUserInfo = mock(UserDetails.class); + when(idamAuthService.getUserDetails(AUTH_TOKEN)).thenReturn(mockUserInfo); + when(mockUserInfo.getFullName()).thenReturn("Hamzah"); + when(mockUserInfo.getEmail()).thenReturn("Hamzah@hamzah.com"); doNothing().when(draftOrdersCategoriser).categoriseDocuments(any(FinremCaseData.class), anyString()); @@ -141,6 +143,7 @@ void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { SuggestedDraftOrder draftOrderResult = response.getData().getDraftOrdersWrapper().getSuggestedDraftOrderCollection().get(0).getValue(); assertThat(draftOrderResult.getSubmittedBy()).isNotNull(); + assertThat(draftOrderResult.getSubmittedByEmail()).isNotNull(); assertThat(draftOrderResult.getPensionSharingAnnex()).isNull(); assertThat(draftOrderResult.getDraftOrder()).isNotNull(); assertThat(draftOrderResult.getAttachments()).isNotNull(); @@ -148,6 +151,7 @@ void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { SuggestedDraftOrder psaResult = response.getData().getDraftOrdersWrapper().getSuggestedDraftOrderCollection().get(1).getValue(); assertThat(psaResult.getSubmittedBy()).isNotNull(); + assertThat(psaResult.getSubmittedByEmail()).isNotNull(); assertThat(psaResult.getPensionSharingAnnex()).isNotNull(); assertThat(psaResult.getDraftOrder()).isNull(); assertThat(psaResult.getAttachments()).isNull(); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java index 1f5f4f1ed4..2e85e2ca2b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java @@ -42,7 +42,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.util.TestLogger; import uk.gov.hmcts.reform.finrem.caseorchestration.util.TestLogs; -import uk.gov.hmcts.reform.idam.client.models.UserInfo; +import uk.gov.hmcts.reform.idam.client.models.UserDetails; import java.time.LocalDate; import java.time.LocalDateTime; @@ -122,7 +122,8 @@ void testProcessAgreedDraftOrders(UploadAgreedDraftOrder uploadAgreedDraftOrder, List expectedOrders, boolean havingMissingUploadPartyLog) { // Mock dependencies - lenient().when(idamAuthService.getUserInfo(AUTH_TOKEN)).thenReturn(UserInfo.builder().name("").build()); + lenient().when(idamAuthService.getUserDetails(AUTH_TOKEN)).thenReturn(UserDetails.builder().forename("James").surname("Bond") + .email("jamesbond@fake.com").build()); LocalDateTime fixedDateTime = LocalDateTime.of(2024, 10, 18, 10, 0); try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class)) { @@ -167,7 +168,8 @@ private static Stream provideAgreedDraftOrderTestCases() { .orderStatus(OrderStatus.TO_BE_REVIEWED) .draftOrder(draftOrder1) .resubmission(YesOrNo.YES) - .submittedBy("") + .submittedBy("James Bond") + .submittedByEmail("jamesbond@fake.com") .submittedDate(LocalDateTime.of(2024, 10, 18, 10, 0)) .uploadedOnBehalfOf(UPLOAD_PARTY_APPLICANT) .attachments(List.of(CaseDocumentCollection.builder().value(attachment1).build())) @@ -201,7 +203,8 @@ private static Stream provideAgreedDraftOrderTestCases() { .orderStatus(OrderStatus.TO_BE_REVIEWED) .draftOrder(draftOrder1) .resubmission(YesOrNo.YES) - .submittedBy("") + .submittedBy("James Bond") + .submittedByEmail("jamesbond@fake.com") .submittedDate(LocalDateTime.of(2024, 10, 18, 10, 0)) .uploadedOnBehalfOf(UPLOAD_PARTY_APPLICANT) .attachments(List.of( @@ -235,14 +238,16 @@ private static Stream provideAgreedDraftOrderTestCases() { .orderStatus(OrderStatus.TO_BE_REVIEWED) .draftOrder(draftOrder1) .resubmission(YesOrNo.NO) - .submittedBy("") + .submittedBy("James Bond") + .submittedByEmail("jamesbond@fake.com") .submittedDate(LocalDateTime.of(2024, 10, 18, 10, 0)) .uploadedOnBehalfOf(UPLOAD_PARTY_APPLICANT) .build(); AgreedDraftOrder expectedOrder5 = AgreedDraftOrder.builder() .orderStatus(OrderStatus.TO_BE_REVIEWED) - .submittedBy("") + .submittedBy("James Bond") + .submittedByEmail("jamesbond@fake.com") .submittedDate(LocalDateTime.of(2024, 10, 18, 10, 0)) .uploadedOnBehalfOf(UPLOAD_PARTY_APPLICANT) .pensionSharingAnnex(psa1) From 2d63b470085bdaed32dc230fec47c27acc8caa3b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 19:52:51 +0000 Subject: [PATCH 176/336] Add hearingDate to JudgeApproval --- ...ApproveDraftOrdersAboutToStartHandler.java | 2 + .../ApproveDraftOrdersSubmittedHandler.java | 54 +++++++++++++++++++ .../DraftOrdersNotificationRequestMapper.java | 1 - .../judgeapproval/JudgeApproval.java | 5 ++ .../review/DraftOrderDocumentReview.java | 2 + .../draftorders/review/PsaDocumentReview.java | 2 + .../review/RefusedOrderCollection.java | 5 ++ .../judgeapproval/JudgeApprovalResolver.java | 2 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 9 ++-- 9 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 99b5be9228..4c5841e968 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -132,6 +132,7 @@ private List getReviewableItems(List .title(DRAFT_ORDER.getTitle()) .inlineDocType(DRAFT_ORDER.getDescription()) .hearingInfo(hearingInfo) + .hearingDate(draftOrdersReview.getHearingDate()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") .label("This is a final order") @@ -153,6 +154,7 @@ private List getReviewableItems(List .title(PSA.getTitle()) .inlineDocType(PSA.getDescription()) .hearingInfo(hearingInfo) + .hearingDate(draftOrdersReview.getHearingDate()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") .label("This is a final order") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java new file mode 100644 index 0000000000..4cda63d921 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -0,0 +1,54 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.FinremCallbackHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.DraftOrdersNotificationRequestMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +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.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; + +@Slf4j +@Service +public class ApproveDraftOrdersSubmittedHandler extends FinremCallbackHandler { + + private final NotificationService notificationService; + + private final DraftOrdersNotificationRequestMapper notificationRequestMapper; + + public ApproveDraftOrdersSubmittedHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, NotificationService notificationService, + DraftOrdersNotificationRequestMapper notificationRequestMapper) { + super(finremCaseDetailsMapper); + this.notificationService = notificationService; + this.notificationRequestMapper = notificationRequestMapper; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return CallbackType.SUBMITTED.equals(callbackType) + && CaseType.CONTESTED.equals(caseType) + && EventType.APPROVE_ORDERS.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested {} submitted event callback for Case ID: {}", callbackRequest.getEventType(), caseId); + + FinremCaseData finremCaseData = caseDetails.getData(); + DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + +// notificationService.sendDraftOrderOrPsaRefused(); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java index 177ff9e55c..087b080b0a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java @@ -26,7 +26,6 @@ public class DraftOrdersNotificationRequestMapper { private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("d MMMM yyyy"); - public NotificationRequest buildJudgeNotificationRequest(FinremCaseDetails caseDetails, LocalDate hearingDate, String judge) { NotificationRequest judgeNotificationRequest = new NotificationRequest(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index 45f74c8d46..b90a17b3a6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -13,6 +14,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import java.time.LocalDate; import java.util.List; import static java.util.Optional.ofNullable; @@ -33,6 +35,9 @@ public class JudgeApproval { private String hearingInfo; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private LocalDate hearingDate; + private YesOrNo hasAttachment; @JsonProperty("document") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 44b71aa80b..899e4d4474 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; @@ -58,6 +59,7 @@ public boolean match(CaseDocument targetDoc) { } @Override + @JsonIgnore public CaseDocument getDraftOrderOrPsa() { return getDraftOrderDocument(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 65def55167..8d55f85b2a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; @@ -55,6 +56,7 @@ public void replaceDocument(CaseDocument amendedDocument) { } @Override + @JsonIgnore public CaseDocument getDraftOrderOrPsa() { return getPsaDocument(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java index e2a73db26c..8bf1264761 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrderCollection.java @@ -7,11 +7,16 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import java.util.UUID; + @JsonIgnoreProperties(ignoreUnknown = true) @Data @Builder @AllArgsConstructor @NoArgsConstructor public class RefusedOrderCollection implements HasCaseDocument { + + private UUID id; + private RefusedOrder value; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index c42c7532fa..abb42e1a38 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -157,7 +157,7 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde // create RefusedOrder from collected items. String judgeFeedback = judgeApproval.getChangesRequestedByJudge(); - LocalDate hearingDate = judgeApproval.getSortKey().getHearingDate(); + LocalDate hearingDate = judgeApproval.getHearingDate(); List existingRefusedOrders = ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 897af03fbb..ef38017c47 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -144,7 +144,7 @@ void handle_withVariousDraftOrdersWrapperData( .build()) .build()) .build(); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 30), "09:00", "Mr. Judge")) .thenReturn("hearingServiceFormattedString1"); lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) .thenReturn("hearingServiceFormattedString2"); @@ -171,6 +171,7 @@ void handle_withVariousDraftOrdersWrapperData( assertEquals(expected.getInlineDocType(), actual.getInlineDocType()); assertEquals(expected.getDocument(), actual.getDocument()); assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); + assertEquals(expected.getHearingDate(), actual.getHearingDate()); if (expected.getHasAttachment() == YES) { assertEquals(expected.getAttachments(), actual.getAttachments()); } @@ -199,7 +200,7 @@ void handle_withVariousDraftOrdersWrapperData( .value(CaseDocument.builder().documentFilename("attachment2").build()).build(); private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(DraftOrdersReview.DraftOrdersReviewBuilder builder) { - return builder.hearingDate(LocalDate.of(2024, 10, 31)) + return builder.hearingDate(LocalDate.of(2024, 10, 30)) .hearingTime("09:00") .hearingType("hearingType") .hearingJudge("Mr. Judge"); @@ -276,7 +277,9 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus or private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, String hearingInfo, CaseDocument document, List attachments) { - return JudgeApproval.builder().hearingInfo(hearingInfo) + return JudgeApproval.builder() + .hearingInfo(hearingInfo) + .hearingDate(LocalDate.of(2024, "hearingServiceFormattedString1".equals(hearingInfo) ? 10: 11 , 30)) .title(docType.getTitle()) .inlineDocType(docType.getDescription()) .document(document) From 106afd51c63a4e45e9fce3dd1871e9ed02c77bbf Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 9 Dec 2024 19:56:35 +0000 Subject: [PATCH 177/336] add test case for the submitted handler. --- .../ApproveDraftOrdersSubmittedHandler.java | 3 +- ...pproveDraftOrdersSubmittedHandlerTest.java | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 4cda63d921..3ec5310c41 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -46,8 +46,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - -// notificationService.sendDraftOrderOrPsaRefused(); + // TODO get refusal order by ids and send email to those refused order. return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java new file mode 100644 index 0000000000..20acc98308 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java @@ -0,0 +1,33 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +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.mapper.DraftOrdersNotificationRequestMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ApproveDraftOrdersSubmittedHandlerTest { + + @Mock + private NotificationService notificationService; + + @Mock + private DraftOrdersNotificationRequestMapper notificationRequestMapper; + + @InjectMocks + private ApproveDraftOrdersSubmittedHandler handler; + + @Test + void canHandle() { + assertCanHandle(handler, CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.APPROVE_ORDERS); + } + +} From 4b8c4f83e6e4d6604115d4c01a20a644a302bed4 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 11:51:35 +0000 Subject: [PATCH 178/336] apply submitted email only when upload party is null. --- ...UploadDraftOrdersAboutToSubmitHandler.java | 15 +----- .../model/ccd/HasSubmittedInfo.java | 2 + .../service/DraftOrderService.java | 11 ++-- ...oadDraftOrderAboutToSubmitHandlerTest.java | 52 ++++++++++++------- 4 files changed, 43 insertions(+), 37 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java index 94ed9bc147..0bc46d7be9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java @@ -29,11 +29,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseAssignedRoleService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.DraftOrderService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamAuthService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.DraftOrdersCategoriser; -import uk.gov.hmcts.reform.idam.client.models.UserDetails; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -49,18 +46,14 @@ public class UploadDraftOrdersAboutToSubmitHandler extends FinremCallbackHandler private final DraftOrdersCategoriser draftOrdersCategoriser; - private final IdamAuthService idamAuthService; - private final CaseAssignedRoleService caseAssignedRoleService; private final DraftOrderService draftOrderService; public UploadDraftOrdersAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, DraftOrdersCategoriser draftOrdersCategoriser, - IdamAuthService idamAuthService, CaseAssignedRoleService caseAssignedRoleService, - DraftOrderService draftOrderService) { + CaseAssignedRoleService caseAssignedRoleService, DraftOrderService draftOrderService) { super(finremCaseDetailsMapper); this.draftOrdersCategoriser = draftOrdersCategoriser; - this.idamAuthService = idamAuthService; this.caseAssignedRoleService = caseAssignedRoleService; this.draftOrderService = draftOrderService; } @@ -244,11 +237,7 @@ private String checkRole(String id, String auth) { } private T applySubmittedInfo(String userAuthorisation, T submittedInfo) { - UserDetails userDetails = idamAuthService.getUserDetails(userAuthorisation); - submittedInfo.setSubmittedBy(userDetails.getFullName()); - submittedInfo.setSubmittedByEmail(userDetails.getEmail()); - submittedInfo.setSubmittedDate(LocalDateTime.now()); - return submittedInfo; + return draftOrderService.applySubmittedInfo(userAuthorisation, submittedInfo); } private boolean isOrdersSelected(List uploadOrdersOrPsas) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java index 6e45ca4de3..72f781020b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java @@ -8,4 +8,6 @@ public interface HasSubmittedInfo { void setSubmittedBy(String submittedBy); void setSubmittedByEmail(String submittedByEmail); + + String getUploadedOnBehalfOf(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java index 3b1bef0009..3e735c822e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java @@ -37,6 +37,7 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.YES_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.ORDER_TYPE; @@ -53,7 +54,10 @@ public T applySubmittedInfo(String userAuthorisatio UserDetails userDetails = idamAuthService.getUserDetails(userAuthorisation); String submittedByName = userDetails.getFullName(); submittedInfo.setSubmittedBy(submittedByName); - submittedInfo.setSubmittedByEmail(userDetails.getEmail()); + // capture email address if it's not uploaded by caseworker. + if (isEmpty(submittedInfo.getUploadedOnBehalfOf())) { + submittedInfo.setSubmittedByEmail(userDetails.getEmail()); + } submittedInfo.setSubmittedDate(LocalDateTime.now()); return submittedInfo; } @@ -101,10 +105,7 @@ private void setUploadedOnBehalfOf(UploadAgreedDraftOrder uploadAgreedDraftOrder ofNullable(uploadAgreedDraftOrder.getUploadParty()) .map(DynamicRadioList::getValue) .map(DynamicRadioListElement::getCode) - .ifPresentOrElse( - builder::uploadedOnBehalfOf, - () -> log.error("Unexpected null 'uploadedParty' on upload agreed order journey.") - ); + .ifPresent(builder::uploadedOnBehalfOf); } private AgreedDraftOrder mapToAgreedDraftOrder( diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java index 9564851b5e..a51056b734 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java @@ -1,11 +1,13 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.draftorders.upload; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -20,6 +22,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioListElement; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrder; @@ -34,10 +37,10 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseAssignedRoleService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.DraftOrderService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamAuthService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.DraftOrdersCategoriser; import uk.gov.hmcts.reform.idam.client.models.UserDetails; -import uk.gov.hmcts.reform.idam.client.models.UserInfo; import java.time.LocalDateTime; import java.util.ArrayList; @@ -50,6 +53,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -80,13 +84,32 @@ class UploadDraftOrderAboutToSubmitHandlerTest { @Mock private DraftOrderService draftOrderService; + @Mock + private HearingService hearingService; + @Test void canHandle() { assertCanHandle(handler, CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.DRAFT_ORDERS); } - @Test - void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { + @BeforeEach + void setup() { + + UserDetails mockedUserDetails = mock(UserDetails.class); + lenient().when(idamAuthService.getUserDetails(AUTH_TOKEN)).thenReturn(mockedUserDetails); + lenient().when(mockedUserDetails.getFullName()).thenReturn("Hamzah"); + lenient().when(mockedUserDetails.getEmail()).thenReturn("Hamzah@hamzah.com"); + + lenient().doAnswer(invocation -> { + String input = invocation.getArgument(0); + HasSubmittedInfo secondArg = invocation.getArgument(1); + return new DraftOrderService(idamAuthService, hearingService).applySubmittedInfo(input, secondArg); + }).when(draftOrderService).applySubmittedInfo(anyString(), any()); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly(boolean withUploadParty) { // Given final Long caseID = 1727874196328932L; FinremCaseData caseData = spy(new FinremCaseData()); @@ -114,20 +137,15 @@ void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { caseData.getDraftOrdersWrapper().getUploadSuggestedDraftOrder().setSuggestedPsaCollection((List.of(psaCollection))); caseData.getDraftOrdersWrapper().getUploadSuggestedDraftOrder().setUploadSuggestedDraftOrderCollection((List.of(orderCollection))); - DynamicRadioList uploadParty = DynamicRadioList.builder().value( - DynamicRadioListElement.builder().code(UPLOAD_PARTY_APPLICANT).build() - ).build(); + DynamicRadioList uploadParty = withUploadParty + ? DynamicRadioList.builder().value(DynamicRadioListElement.builder().code(UPLOAD_PARTY_APPLICANT).build()).build() + : null; caseData.getDraftOrdersWrapper().getUploadSuggestedDraftOrder().setUploadParty(uploadParty); when(caseAssignedRoleService.getCaseAssignedUserRole(String.valueOf(caseID), AUTH_TOKEN)) .thenReturn(CaseAssignedUserRolesResource.builder().caseAssignedUserRoles(Collections.emptyList()).build()); - UserDetails mockUserInfo = mock(UserDetails.class); - when(idamAuthService.getUserDetails(AUTH_TOKEN)).thenReturn(mockUserInfo); - when(mockUserInfo.getFullName()).thenReturn("Hamzah"); - when(mockUserInfo.getEmail()).thenReturn("Hamzah@hamzah.com"); - doNothing().when(draftOrdersCategoriser).categoriseDocuments(any(FinremCaseData.class), anyString()); when(draftOrderService.isOrdersSelected(List.of(ORDER_TYPE, PSA_TYPE))).thenReturn(true); @@ -143,19 +161,19 @@ void givenValidPsaAndOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { SuggestedDraftOrder draftOrderResult = response.getData().getDraftOrdersWrapper().getSuggestedDraftOrderCollection().get(0).getValue(); assertThat(draftOrderResult.getSubmittedBy()).isNotNull(); - assertThat(draftOrderResult.getSubmittedByEmail()).isNotNull(); + assertThat(draftOrderResult.getSubmittedByEmail()).isEqualTo(withUploadParty ? null : "Hamzah@hamzah.com"); assertThat(draftOrderResult.getPensionSharingAnnex()).isNull(); assertThat(draftOrderResult.getDraftOrder()).isNotNull(); assertThat(draftOrderResult.getAttachments()).isNotNull(); - assertThat(draftOrderResult.getUploadedOnBehalfOf()).isEqualTo(UPLOAD_PARTY_APPLICANT); + assertThat(draftOrderResult.getUploadedOnBehalfOf()).isEqualTo(withUploadParty ? UPLOAD_PARTY_APPLICANT : null); SuggestedDraftOrder psaResult = response.getData().getDraftOrdersWrapper().getSuggestedDraftOrderCollection().get(1).getValue(); assertThat(psaResult.getSubmittedBy()).isNotNull(); - assertThat(psaResult.getSubmittedByEmail()).isNotNull(); + assertThat(psaResult.getSubmittedByEmail()).isEqualTo(withUploadParty ? null : "Hamzah@hamzah.com"); assertThat(psaResult.getPensionSharingAnnex()).isNotNull(); assertThat(psaResult.getDraftOrder()).isNull(); assertThat(psaResult.getAttachments()).isNull(); - assertThat(psaResult.getUploadedOnBehalfOf()).isEqualTo(UPLOAD_PARTY_APPLICANT); + assertThat(psaResult.getUploadedOnBehalfOf()).isEqualTo(withUploadParty ? UPLOAD_PARTY_APPLICANT : null); } @Test @@ -208,10 +226,6 @@ void givenMultipleOrderDetailsWithAttachments_whenHandle_thenMapCorrectly() { when(caseAssignedRoleService.getCaseAssignedUserRole(String.valueOf(caseID), AUTH_TOKEN)) .thenReturn(CaseAssignedUserRolesResource.builder().caseAssignedUserRoles(Collections.emptyList()).build()); - UserInfo mockUserInfo = mock(UserInfo.class); - when(idamAuthService.getUserInfo(AUTH_TOKEN)).thenReturn(mockUserInfo); - when(mockUserInfo.getName()).thenReturn("Hamzah"); - doNothing().when(draftOrdersCategoriser).categoriseDocuments(any(FinremCaseData.class), anyString()); when(draftOrderService.isOrdersSelected(List.of(ORDER_TYPE))).thenReturn(true); From 83d5d664f7be2eca24ec02056b2006b41f45f027 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 11:53:42 +0000 Subject: [PATCH 179/336] remove a blank line. --- .../upload/UploadDraftOrderAboutToSubmitHandlerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java index a51056b734..7b5f8a9c6f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java @@ -94,7 +94,6 @@ void canHandle() { @BeforeEach void setup() { - UserDetails mockedUserDetails = mock(UserDetails.class); lenient().when(idamAuthService.getUserDetails(AUTH_TOKEN)).thenReturn(mockedUserDetails); lenient().when(mockedUserDetails.getFullName()).thenReturn("Hamzah"); From 5c50b42b45f898f4b93c0683291899741f00ef8e Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 10 Dec 2024 12:28:55 +0000 Subject: [PATCH 180/336] Improve tests in JudgeApprovalResolverTest and add getters --- .../model/ccd/Approvable.java | 6 ++ .../draftorders/agreed/AgreedDraftOrder.java | 21 +++++ .../review/DraftOrderDocumentReview.java | 15 ++++ .../draftorders/review/PsaDocumentReview.java | 15 ++++ .../JudgeApprovalResolverTest.java | 88 ++++++++++--------- 5 files changed, 105 insertions(+), 40 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index db665e24ca..451d1c52d1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -8,6 +8,12 @@ public interface Approvable extends DocumentMatcher { OrderStatus getOrderStatus(); + LocalDateTime getApprovalDate(); + + String getApprovalJudge(); + + CaseDocument getReplaceDocument(); + void setOrderStatus(OrderStatus orderStatus); void setApprovalDate(LocalDateTime approvalDate); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index a355d6d8e1..7da38d4dbe 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -46,6 +46,27 @@ public boolean match(CaseDocument targetDoc) { .isPresent(); } + @Override + public LocalDateTime getApprovalDate() { + return null; + } + + @Override + public String getApprovalJudge() { + return null; + } + + @Override + public CaseDocument getReplaceDocument() { + if (draftOrder != null) { + return draftOrder; + } else if (pensionSharingAnnex != null) { + return pensionSharingAnnex; + } else { + return null; + } + } + @Override public void setApprovalDate(LocalDateTime approvalDate) { // no approval date; Ignore it. diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index e8322d0b08..fa26314972 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -45,6 +45,21 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; + @Override + public LocalDateTime getApprovalDate() { + return approvalDate; + } + + @Override + public String getApprovalJudge() { + return approvalJudge; + } + + @Override + public CaseDocument getReplaceDocument() { + return draftOrderDocument; + } + @Override public void replaceDocument(CaseDocument amendedDocument) { this.setDraftOrderDocument(amendedDocument); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 0bb1c37675..96a4d05269 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -42,6 +42,21 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvabl @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; + @Override + public LocalDateTime getApprovalDate() { + return approvalDate; + } + + @Override + public String getApprovalJudge() { + return approvalJudge; + } + + @Override + public CaseDocument getReplaceDocument() { + return psaDocument; + } + @Override public boolean match(CaseDocument targetDoc) { return Optional.ofNullable(targetDoc).map(CaseDocument::getDocumentUrl).equals(Optional.ofNullable(psaDocument) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 9647c8150c..e9d4db833c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -26,17 +25,17 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; +import java.time.LocalDateTime; import java.util.List; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @@ -44,8 +43,6 @@ @ExtendWith(MockitoExtension.class) class JudgeApprovalResolverTest { - - @Spy @InjectMocks private JudgeApprovalResolver judgeApprovalResolver; @@ -108,39 +105,45 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { @ParameterizedTest @MethodSource("provideProcessApprovableCollectionDataWithHandleApprovable") - void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, - List approvables, - JudgeApproval judgeApproval, - boolean shouldCallHandleApprovable, - CaseDocument targetDoc - ) { + void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersWrapper, + List approvables, + JudgeApproval judgeApproval, + boolean shouldBeApproved, + CaseDocument targetDoc, + OrderStatus expectedOrderStatus, + CaseDocument expectedAmendedDocument) { + + // Mocking IDAM service for getting judge's full name + lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn("Judge Full Name"); - judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, "auth"); + judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); if (approvables != null) { - verify(judgeApprovalResolver, times(1)) - .processApprovableCollection(approvables, targetDoc, judgeApproval, "auth"); - - approvables.forEach(approvable -> { - if (shouldCallHandleApprovable) { - verify(judgeApprovalResolver, times(1)) - .handleApprovable(approvable, judgeApproval, "auth"); - assertEquals(OrderStatus.APPROVED_BY_JUDGE, approvable.getOrderStatus()); - } else { - verify(judgeApprovalResolver, never()) - .handleApprovable(any(), any(), any()); + for (Approvable approvable : approvables) { + if (approvable.match(targetDoc)) { + if (shouldBeApproved) { + assertEquals(expectedOrderStatus, approvable.getOrderStatus()); + assertEquals(LocalDateTime.now().getDayOfYear(), approvable.getApprovalDate().getDayOfYear()); + assertEquals("Judge Full Name", approvable.getApprovalJudge()); + if (expectedAmendedDocument != null) { + assertEquals(expectedAmendedDocument, approvable.getReplaceDocument()); + } + } else { + assertNull(approvable.getOrderStatus()); + assertNull(approvable.getApprovalDate()); + assertNull(approvable.getApprovalJudge()); + } } - }); - } else { - verify(judgeApprovalResolver, never()) - .processApprovableCollection(any(), any(), any(), any()); + } } } static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { - //Mock approvable objects to ensure they match the target document + + // Mock approvable objects CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); CaseDocument psaDocument = CaseDocument.builder().documentUrl("NEW_DOC2.doc").build(); + CaseDocument amendedDocument = CaseDocument.builder().documentUrl("AMENDED_DOC.doc").build(); DraftOrderDocumentReview draftReview = DraftOrderDocumentReview.builder() .draftOrderDocument(draftOrderDocument) @@ -149,7 +152,6 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .psaDocument(psaDocument) .build(); - List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); JudgeApproval approvedJudgeApproval = JudgeApproval.builder() @@ -158,10 +160,10 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova JudgeApproval approvedJudgeApprovalWithChanges = JudgeApproval.builder() .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) + .amendedDocument(amendedDocument) .build(); - JudgeApproval notApprovedJudgeApproval = mock(JudgeApproval.class); - when(notApprovedJudgeApproval.getJudgeDecision()).thenReturn(null); + JudgeApproval notApprovedJudgeApproval = JudgeApproval.builder().judgeDecision(null).build(); return Stream.of( Arguments.of( @@ -173,9 +175,11 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build()).build())) .build(), List.of(draftReview), - approvedJudgeApprovalWithChanges , - true, // should call handleApprovable - draftOrderDocument + approvedJudgeApprovalWithChanges, + true, // should be approved + draftOrderDocument, + OrderStatus.APPROVED_BY_JUDGE, + amendedDocument ), Arguments.of( DraftOrdersWrapper.builder() @@ -187,8 +191,10 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build(), List.of(psaReview), approvedJudgeApproval, - true, // should call handleApprovable - psaDocument + true, // should be approved + psaDocument, + OrderStatus.APPROVED_BY_JUDGE, + null ), Arguments.of( DraftOrdersWrapper.builder() @@ -197,10 +203,12 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build(), agreedDrafts, notApprovedJudgeApproval, - false, // should not call handleApprovable - CaseDocument.builder().build() + false, // should not be approved + CaseDocument.builder().build(), + null, + null ), - Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false, CaseDocument.builder().build()) + Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false, null, null, null) ); } } From fd7cc410e93423f32c5c9332297aabd75a3333fc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 12:35:06 +0000 Subject: [PATCH 181/336] Setting refusalOrderIdsToBeSent --- .../model/ccd/UUIDCollection.java | 18 ++++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 3 + .../judgeapproval/JudgeApprovalResolver.java | 58 +++++++++---------- 3 files changed, 47 insertions(+), 32 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java new file mode 100644 index 0000000000..13f5e310f3 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java @@ -0,0 +1,18 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class UUIDCollection { + private UUID value; +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index ab7dfd01f9..8b455e9456 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -12,6 +12,7 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UUIDCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; @@ -84,6 +85,8 @@ public class DraftOrdersWrapper implements HasCaseDocument { private String generatedOrderJudgeName; + private List refusalOrderIdsToBeSent; + public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index abb42e1a38..e5f5c0421c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -10,6 +10,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UUIDCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -31,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.UUID; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; @@ -147,13 +149,13 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde List removedPsaItems = new ArrayList<>(); // remove refused draft orders/PSAs from agreedDraftOrderCollection - filterAgreedDraftOrderCollections(draftOrdersWrapper, REFUSED); + filterRefusedDraftOrderCollections(draftOrdersWrapper); // remove refused draft orders/PSAs from PsaDocReviewCollection and DraftOrderDocReviewCollection and collect them - draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRemovedItemsFromDraftOrderDocReviewCollection(removedItems, - draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); - draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRemovedItemsFromPsaDocReviewCollection(removedPsaItems, - draftOrdersWrapper.getDraftOrdersReviewCollection(), REFUSED)); + draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection(removedItems, + draftOrdersWrapper.getDraftOrdersReviewCollection())); + draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromPsaDocReviewCollection(removedPsaItems, + draftOrdersWrapper.getDraftOrdersReviewCollection())); // create RefusedOrder from collected items. String judgeFeedback = judgeApproval.getChangesRequestedByJudge(); @@ -162,8 +164,13 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde List existingRefusedOrders = ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new); + List refusalOrderIds = new ArrayList<>(); + Function toRefusedOrderCollection = item -> { if (item.getValue() instanceof RefusalOrderConvertible refusalOrderConvertible) { + UUID uuid = UUID.randomUUID(); + refusalOrderIds.add(uuid); + RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() .draftOrderOrPsa(refusalOrderConvertible.getDraftOrderOrPsa()) .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), @@ -176,7 +183,7 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde .judgeFeedback(judgeFeedback) .hearingDate(hearingDate); - return RefusedOrderCollection.builder().value(orderBuilder.build()).build(); + return RefusedOrderCollection.builder().id(uuid).value(orderBuilder.build()).build(); } else { return null; } @@ -190,38 +197,34 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde draftOrdersWrapper.setRefusedOrdersCollection( Stream.concat(existingRefusedOrders.stream(), newRefusedOrders.stream()).toList() ); + draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UUIDCollection::new).toList()); } - private List filterAndCollectRemovedItemsFromDraftOrderDocReviewCollection( + private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( List removedItems, - List draftOrdersReviewCollection, - OrderStatus statusToRemove) { - return filterAndCollectRemovedItemsFromReviewCollection( + List draftOrdersReviewCollection) { + return filterAndCollectRefusedItemsFromReviewCollection( removedItems, draftOrdersReviewCollection, - statusToRemove, DraftOrdersReview::getDraftOrderDocReviewCollection, DraftOrdersReview.DraftOrdersReviewBuilder::draftOrderDocReviewCollection ); } - private List filterAndCollectRemovedItemsFromPsaDocReviewCollection( + private List filterAndCollectRefusedItemsFromPsaDocReviewCollection( List removedItems, - List draftOrdersReviewCollection, - OrderStatus statusToRemove) { - return filterAndCollectRemovedItemsFromReviewCollection( + List draftOrdersReviewCollection) { + return filterAndCollectRefusedItemsFromReviewCollection( removedItems, draftOrdersReviewCollection, - statusToRemove, DraftOrdersReview::getPsaDocReviewCollection, DraftOrdersReview.DraftOrdersReviewBuilder::psaDocReviewCollection ); } - private List filterAndCollectRemovedItemsFromReviewCollection( + private List filterAndCollectRefusedItemsFromReviewCollection( List removedItemsCollector, List draftOrdersReviewCollection, - OrderStatus statusToRemove, Function> getReviewCollection, BiConsumer> setReviewCollection) { @@ -231,10 +234,7 @@ private List filterAndCol // Partition items into kept and removed Map> partitioned = - partitionDraftOrderDocReviewCollection( - getReviewCollection.apply(draftOrdersReview.getValue()), - statusToRemove - ); + partitionRefusedDraftOrderDocReviewCollection(getReviewCollection.apply(draftOrdersReview.getValue())); // Keep the items not matching the status setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); @@ -252,25 +252,19 @@ private List filterAndCol .toList(); } - private void filterAgreedDraftOrderCollections(DraftOrdersWrapper draftOrdersWrapper, - OrderStatus statusToRemove) { + private void filterRefusedDraftOrderCollections(DraftOrdersWrapper draftOrdersWrapper) { Map> partitioned = - partitionDraftOrderDocReviewCollection( - draftOrdersWrapper.getAgreedDraftOrderCollection(), - statusToRemove - ); + partitionRefusedDraftOrderDocReviewCollection(draftOrdersWrapper.getAgreedDraftOrderCollection()); draftOrdersWrapper.setAgreedDraftOrderCollection(partitioned.get(false)); } - private Map> partitionDraftOrderDocReviewCollection( - List draftOrderDocReviewCollection, - OrderStatus statusToRemove) { + private Map> partitionRefusedDraftOrderDocReviewCollection(List draftOrderDocReviewCollection) { return draftOrderDocReviewCollection.stream() .collect(Collectors.partitioningBy( docReview -> ofNullable(docReview) .map(HasApprovable::getValue) .map(Approvable::getOrderStatus) - .filter(statusToRemove::equals) + .filter(REFUSED::equals) .isPresent() )); } From bfa132c8861faa56acb7edab89984edbda0612ac Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 13:59:54 +0000 Subject: [PATCH 182/336] clear refusalOrderIdsToBeSent on about-to-start --- .../ApproveDraftOrdersAboutToStartHandler.java | 3 +++ .../ApproveDraftOrdersAboutToStartHandlerTest.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 4c5841e968..5a6996a481 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -66,6 +66,9 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + // clear a temporary field which was used on submitted event. + draftOrdersWrapper.setRefusalOrderIdsToBeSent(null); + List errors = validateDraftOrdersWrapper(draftOrdersWrapper); if (errors.isEmpty()) { List outstanding = draftOrdersWrapper.getOutstandingDraftOrdersReviewCollection(); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index ef38017c47..9f0a9d903e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -19,6 +19,7 @@ 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.UUIDCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -38,6 +39,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.UUID; import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; @@ -122,6 +124,18 @@ void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { } } + @Test + void givenRefusalOrderIdsToBeSentWasSet_whenHandle_thenClearThem() { + FinremCaseData caseData = new FinremCaseData(); + caseData.getDraftOrdersWrapper().setRefusalOrderIdsToBeSent(List.of(UUIDCollection.builder().value(UUID.randomUUID()).build())); + + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( + FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); + + var draftOrdersWrapper = response.getData().getDraftOrdersWrapper(); + assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).isNull(); + } + @SneakyThrows @ParameterizedTest(name = "{index} => draftOrdersWrapper={0}, expectedJudgeApproval1={1}, expectedJudgeApproval2={2}," + "expectedJudgeApproval3={3}, expectedJudgeApproval4={4}, expectedJudgeApproval5={5}," From 8c2fc6d3a0209464891242710e958f94e93fcfd2 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:03:09 +0000 Subject: [PATCH 183/336] throw exception instead --- .../ApproveDraftOrdersMidEventHandler.java | 7 +- ...ApproveDraftOrdersMidEventHandlerTest.java | 187 ++++++++---------- 2 files changed, 90 insertions(+), 104 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index dcfa278686..87a56f95c8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -131,9 +131,10 @@ private String getDocumentFileName(JudgeApproval judgeApproval) { ? judgeApproval.getAmendedDocument().getDocumentFilename() : "Unknown Filename"; } else if (READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { - filename = judgeApproval.getDocument() != null - ? judgeApproval.getDocument().getDocumentFilename() - : "Unknown Filename"; + if (judgeApproval.getDocument() == null) { + throw new IllegalStateException("No Document found."); + } + filename = judgeApproval.getDocument().getDocumentFilename(); } return filename; } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 1bffa56eea..4cd0c4e247 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,12 +1,7 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; -import lombok.SneakyThrows; -import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -18,7 +13,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; 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.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -27,20 +21,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @@ -58,92 +43,92 @@ void canHandle() { assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); } - @SneakyThrows - @ParameterizedTest(name = "{index} => judgeApproval1={0}" - + "judgeApproval2={1}" - + "judgeApproval3={2}" - + "judgeApproval4={3}" - + "judgeApproval5={4}" - + "expectedShowRequireAnotherHearingQuestion={5}") - @MethodSource("provideJudgeApprovals") - @DisplayName("Test handle method with different DraftOrdersWrapper inputs") - void handle_withVariousDraftOrdersWrapperData(JudgeApproval judgeApproval1, JudgeApproval judgeApproval2, - JudgeApproval judgeApproval3, JudgeApproval judgeApproval4, - JudgeApproval judgeApproval5, - YesOrNo expectedShowRequireAnotherHearingQuestion) { - - // Arrange - FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() - .caseDetails(FinremCaseDetails.builder() - .id(12345L) - .data(FinremCaseData.builder() - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .judgeApproval1(judgeApproval1) - .judgeApproval2(judgeApproval2) - .judgeApproval3(judgeApproval3) - .judgeApproval4(judgeApproval4) - .judgeApproval5(judgeApproval5) - .build()) - .build()) - .build()) - .build(); - when(approveOrderService.resolveJudgeApproval(any(), anyInt())).thenCallRealMethod(); - - // Act - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); - - // Assert - assertNotNull(response); - FinremCaseData responseData = response.getData(); - DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); - - var hearingInstruction = responseDraftOrdersWrapper.getHearingInstruction(); - assertNotNull(hearingInstruction); - - assertEquals(expectedShowRequireAnotherHearingQuestion, hearingInstruction.getShowRequireAnotherHearingQuestion()); - } - - private static Stream provideJudgeApprovals() { - return Stream.of( - Arguments.of(null, null, null, null, null, NO), - Arguments.of(JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), null, null, null, null, YES), - Arguments.of(JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), null, null, null, null, YES), - Arguments.of(JudgeApproval.builder().judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE).build(), null, null, null, null, NO), - Arguments.of(JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), null, null, null, null, NO), - Arguments.of( - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - YES - ), - Arguments.of( - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - YES - ), - Arguments.of( - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), - YES - ), - Arguments.of( - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), - NO - ) - ); - } +// @SneakyThrows +// @ParameterizedTest(name = "{index} => judgeApproval1={0}" +// + "judgeApproval2={1}" +// + "judgeApproval3={2}" +// + "judgeApproval4={3}" +// + "judgeApproval5={4}" +// + "expectedShowRequireAnotherHearingQuestion={5}") +// @MethodSource("provideJudgeApprovals") +// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") +// void handle_withVariousDraftOrdersWrapperData(JudgeApproval judgeApproval1, JudgeApproval judgeApproval2, +// JudgeApproval judgeApproval3, JudgeApproval judgeApproval4, +// JudgeApproval judgeApproval5, +// YesOrNo expectedShowRequireAnotherHearingQuestion) { +// +// // Arrange +// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() +// .caseDetails(FinremCaseDetails.builder() +// .id(12345L) +// .data(FinremCaseData.builder() +// .draftOrdersWrapper(DraftOrdersWrapper.builder() +// .judgeApproval1(judgeApproval1) +// .judgeApproval2(judgeApproval2) +// .judgeApproval3(judgeApproval3) +// .judgeApproval4(judgeApproval4) +// .judgeApproval5(judgeApproval5) +// .build()) +// .build()) +// .build()) +// .build(); +// when(approveOrderService.resolveJudgeApproval(any(), anyInt())).thenCallRealMethod(); +// +// // Act +// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); +// +// // Assert +// assertNotNull(response); +// FinremCaseData responseData = response.getData(); +// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); +// +// var hearingInstruction = responseDraftOrdersWrapper.getHearingInstruction(); +// assertNotNull(hearingInstruction); +// +// assertEquals(expectedShowRequireAnotherHearingQuestion, hearingInstruction.getShowRequireAnotherHearingQuestion()); +// } +// +// private static Stream provideJudgeApprovals() { +// return Stream.of( +// Arguments.of(null, null, null, null, null, NO), +// Arguments.of(JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), null, null, null, null, YES), +// Arguments.of(JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), null, null, null, null, YES), +// Arguments.of(JudgeApproval.builder().judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE).build(), null, null, null, null, NO), +// Arguments.of(JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), null, null, null, null, NO), +// Arguments.of( +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// YES +// ), +// Arguments.of( +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// YES +// ), +// Arguments.of( +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), +// YES +// ), +// Arguments.of( +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), +// NO +// ) +// ); +// } @Test void shouldPopulateAnEmptyAnotherHearingRequestEntry() { From 08d2d0a0797c8ba49a1b07485c475a7ab1b4b074 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:13:45 +0000 Subject: [PATCH 184/336] EL --- src/test/resources/fixtures/refusal-order-contested.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/fixtures/refusal-order-contested.json b/src/test/resources/fixtures/refusal-order-contested.json index 9efc3d7793..49db5ddf92 100644 --- a/src/test/resources/fixtures/refusal-order-contested.json +++ b/src/test/resources/fixtures/refusal-order-contested.json @@ -182,4 +182,4 @@ "generatedOrderJudgeType": "District Judge" } } -} \ No newline at end of file +} From a0f4eba6aad8a5cdc9ce0ba77a4f9de010d6e560 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:18:35 +0000 Subject: [PATCH 185/336] Remove test --- ...ApproveDraftOrdersMidEventHandlerTest.java | 87 ------------------- 1 file changed, 87 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 4cd0c4e247..70d4478806 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -43,93 +43,6 @@ void canHandle() { assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); } -// @SneakyThrows -// @ParameterizedTest(name = "{index} => judgeApproval1={0}" -// + "judgeApproval2={1}" -// + "judgeApproval3={2}" -// + "judgeApproval4={3}" -// + "judgeApproval5={4}" -// + "expectedShowRequireAnotherHearingQuestion={5}") -// @MethodSource("provideJudgeApprovals") -// @DisplayName("Test handle method with different DraftOrdersWrapper inputs") -// void handle_withVariousDraftOrdersWrapperData(JudgeApproval judgeApproval1, JudgeApproval judgeApproval2, -// JudgeApproval judgeApproval3, JudgeApproval judgeApproval4, -// JudgeApproval judgeApproval5, -// YesOrNo expectedShowRequireAnotherHearingQuestion) { -// -// // Arrange -// FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() -// .caseDetails(FinremCaseDetails.builder() -// .id(12345L) -// .data(FinremCaseData.builder() -// .draftOrdersWrapper(DraftOrdersWrapper.builder() -// .judgeApproval1(judgeApproval1) -// .judgeApproval2(judgeApproval2) -// .judgeApproval3(judgeApproval3) -// .judgeApproval4(judgeApproval4) -// .judgeApproval5(judgeApproval5) -// .build()) -// .build()) -// .build()) -// .build(); -// when(approveOrderService.resolveJudgeApproval(any(), anyInt())).thenCallRealMethod(); -// -// // Act -// GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); -// -// // Assert -// assertNotNull(response); -// FinremCaseData responseData = response.getData(); -// DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); -// -// var hearingInstruction = responseDraftOrdersWrapper.getHearingInstruction(); -// assertNotNull(hearingInstruction); -// -// assertEquals(expectedShowRequireAnotherHearingQuestion, hearingInstruction.getShowRequireAnotherHearingQuestion()); -// } -// -// private static Stream provideJudgeApprovals() { -// return Stream.of( -// Arguments.of(null, null, null, null, null, NO), -// Arguments.of(JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), null, null, null, null, YES), -// Arguments.of(JudgeApproval.builder().judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES).build(), null, null, null, null, YES), -// Arguments.of(JudgeApproval.builder().judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE).build(), null, null, null, null, NO), -// Arguments.of(JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), null, null, null, null, NO), -// Arguments.of( -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// YES -// ), -// Arguments.of( -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// YES -// ), -// Arguments.of( -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), -// YES -// ), -// Arguments.of( -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// JudgeApproval.builder().judgeDecision(REVIEW_LATER).build(), -// NO -// ) -// ); -// } - @Test void shouldPopulateAnEmptyAnotherHearingRequestEntry() { // Arrange From def5e8ced832a034b10f573ab28b102df2d2b532 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:22:06 +0000 Subject: [PATCH 186/336] revert --- .../reform/finrem/caseorchestration/model/ccd/Approvable.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index 89897a2c33..db665e24ca 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -15,5 +15,4 @@ public interface Approvable extends DocumentMatcher { void setApprovalJudge(String approvalJudge); void replaceDocument(CaseDocument amendedDocument); - } From d6c31c744b560f027d5cb27928fd7bbc64c132fa Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:22:43 +0000 Subject: [PATCH 187/336] revert --- .../draftorders/agreed/AgreedDraftOrder.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 5373544f01..ed3028440f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -47,6 +47,16 @@ public boolean match(CaseDocument targetDoc) { .isPresent(); } + @Override + public void setApprovalDate(LocalDateTime approvalDate) { + // ignore + } + + @Override + public void setApprovalJudge(String approvalJudge) { + // ignore + } + @Override public void replaceDocument(CaseDocument amendedDocument) { if (this.draftOrder != null) { @@ -61,14 +71,4 @@ public void replaceDocument(CaseDocument amendedDocument) { } } - @Override - public void setApprovalDate(LocalDateTime approvalDate) { - // ignore - } - - @Override - public void setApprovalJudge(String approvalJudge) { - // ignore - } - } From 863db32a9d1b05c991ccd10a28475d74b6603296 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:23:20 +0000 Subject: [PATCH 188/336] revert comment --- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index ed3028440f..4504beaf3b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -49,12 +49,12 @@ public boolean match(CaseDocument targetDoc) { @Override public void setApprovalDate(LocalDateTime approvalDate) { - // ignore + // no approval date; Ignore it. } @Override public void setApprovalJudge(String approvalJudge) { - // ignore + // no approval date; Ignore it. } @Override From 38a0e0464f565a2bc50458bebb9de8155ea6ec0b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:30:27 +0000 Subject: [PATCH 189/336] Email notification logic. --- .../ApproveDraftOrdersSubmittedHandler.java | 14 +++++++++++++- .../judgeapproval/JudgeApprovalResolverTest.java | 5 +++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 3ec5310c41..ad6ed2e8e8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -12,9 +12,15 @@ 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.UUIDCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; +import java.util.List; +import java.util.UUID; + +import static java.util.Optional.ofNullable; + @Slf4j @Service public class ApproveDraftOrdersSubmittedHandler extends FinremCallbackHandler { @@ -46,7 +52,13 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - // TODO get refusal order by ids and send email to those refused order. + List refusalOrderIdsToBeSent = + ofNullable(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).orElse(List.of()).stream().map(UUIDCollection::getValue).toList(); + + draftOrdersWrapper.getRefusedOrdersCollection().stream() + .filter(d -> refusalOrderIdsToBeSent.contains(d.getId())) + .forEach(a -> notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper + .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue()))); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 9647c8150c..2cd27217e1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -10,6 +10,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; @@ -59,7 +60,7 @@ class JudgeApprovalResolverTest { @MethodSource("provideShouldInvokeProcessHearingInstructionData") void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { // Execute the method being tested - judgeApprovalResolver.populateJudgeDecision( + judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder().build(), draftOrdersWrapper, CaseDocument.builder().build(), JudgeApproval.builder().judgeDecision(READY_TO_BE_SEALED).build(), @@ -115,7 +116,7 @@ void shouldInvokeHandleApprovable(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc ) { - judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, "auth"); + judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder().build(), draftOrdersWrapper, targetDoc, judgeApproval, "auth"); if (approvables != null) { verify(judgeApprovalResolver, times(1)) From 348472f49b1c9c2213638490ff3f07fb44b81ce3 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:38:45 +0000 Subject: [PATCH 190/336] use @JsonIgnore --- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 3 ++- .../model/ccd/draftorders/review/DraftOrderDocumentReview.java | 3 ++- .../model/ccd/draftorders/review/PsaDocumentReview.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 7da38d4dbe..51670c128c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; @@ -56,7 +57,7 @@ public String getApprovalJudge() { return null; } - @Override + @JsonIgnore public CaseDocument getReplaceDocument() { if (draftOrder != null) { return draftOrder; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index fa26314972..4b5433d58e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; @@ -55,7 +56,7 @@ public String getApprovalJudge() { return approvalJudge; } - @Override + @JsonIgnore public CaseDocument getReplaceDocument() { return draftOrderDocument; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 96a4d05269..da9fe09107 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; @@ -52,7 +53,7 @@ public String getApprovalJudge() { return approvalJudge; } - @Override + @JsonIgnore public CaseDocument getReplaceDocument() { return psaDocument; } From 68220c55d6cb7ace41a643b2f9df9bad25cf254e Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:52:36 +0000 Subject: [PATCH 191/336] javadoc --- .../caseorchestration/config/DocumentConfiguration.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java index 9dd3133d08..3bca5d7c2d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/config/DocumentConfiguration.java @@ -182,6 +182,15 @@ public String getContestedDraftOrderNotApprovedTemplate(CaseDetails caseDetails) : contestedDraftOrderNotApprovedTemplate; } + /** + * Retrieves the appropriate contested refusal order template filename based on the selected court type in the provided case details. + * + * @param caseDetails the details of the financial remedy case, which determine the court type and corresponding template. + * @return the contested refusal order template filename. + * Returns {@code contestedDraftOrderNotApprovedHighCourtTemplate} if + * the High Court is selected; otherwise, returns + * {@code contestedDraftOrderNotApprovedTemplate}. + */ public String getContestedDraftOrderNotApprovedTemplate(FinremCaseDetails caseDetails) { return isHighCourtSelected(caseDetails) ? contestedDraftOrderNotApprovedHighCourtTemplate : contestedDraftOrderNotApprovedTemplate; From d02fd6705fa8fb8c558810fb22a5fed3b60a899c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:54:59 +0000 Subject: [PATCH 192/336] Fix NPE --- .../service/judgeapproval/JudgeApprovalResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 33310d4ad9..3fcdd65f01 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -294,7 +294,7 @@ private void filterRefusedDraftOrderCollections(DraftOrdersWrapper draftOrdersWr } private Map> partitionRefusedDraftOrderDocReviewCollection(List draftOrderDocReviewCollection) { - return draftOrderDocReviewCollection.stream() + return ofNullable(draftOrderDocReviewCollection).orElse(List.of()).stream() .collect(Collectors.partitioningBy( docReview -> ofNullable(docReview) .map(HasApprovable::getValue) From 72309e4b5e911dc1b4d31995a5b4af53d0476d2c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 14:58:06 +0000 Subject: [PATCH 193/336] Fix NPE --- .../service/judgeapproval/JudgeApprovalResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 3fcdd65f01..4788a4fff1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -263,7 +263,7 @@ private List filterAndCol Function> getReviewCollection, BiConsumer> setReviewCollection) { - return draftOrdersReviewCollection.stream() + return ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream() .map(draftOrdersReview -> { DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); From 91135f355dec230bc824a1434b692952247b628e Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:45:30 +0000 Subject: [PATCH 194/336] use @JsonIgnore for getters --- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 3 +++ .../model/ccd/draftorders/review/DraftOrderDocumentReview.java | 3 +++ .../model/ccd/draftorders/review/PsaDocumentReview.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 51670c128c..42d51c7bbd 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -47,17 +47,20 @@ public boolean match(CaseDocument targetDoc) { .isPresent(); } + @JsonIgnore @Override public LocalDateTime getApprovalDate() { return null; } + @JsonIgnore @Override public String getApprovalJudge() { return null; } @JsonIgnore + @Override public CaseDocument getReplaceDocument() { if (draftOrder != null) { return draftOrder; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 4b5433d58e..d899cf37be 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -46,17 +46,20 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Ap @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; + @JsonIgnore @Override public LocalDateTime getApprovalDate() { return approvalDate; } + @JsonIgnore @Override public String getApprovalJudge() { return approvalJudge; } @JsonIgnore + @Override public CaseDocument getReplaceDocument() { return draftOrderDocument; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index da9fe09107..1f9ad589b3 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -43,17 +43,20 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, Approvabl @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; + @JsonIgnore @Override public LocalDateTime getApprovalDate() { return approvalDate; } + @JsonIgnore @Override public String getApprovalJudge() { return approvalJudge; } @JsonIgnore + @Override public CaseDocument getReplaceDocument() { return psaDocument; } From 77f8e7002dc92378e59c0fb7cea374e4623d2e62 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 16:31:52 +0000 Subject: [PATCH 195/336] Use fixedDateTime --- .../JudgeApprovalResolverTest.java | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index e9d4db833c..8b3fddc56e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -6,6 +6,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -116,22 +118,26 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW // Mocking IDAM service for getting judge's full name lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn("Judge Full Name"); - judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); - - if (approvables != null) { - for (Approvable approvable : approvables) { - if (approvable.match(targetDoc)) { - if (shouldBeApproved) { - assertEquals(expectedOrderStatus, approvable.getOrderStatus()); - assertEquals(LocalDateTime.now().getDayOfYear(), approvable.getApprovalDate().getDayOfYear()); - assertEquals("Judge Full Name", approvable.getApprovalJudge()); - if (expectedAmendedDocument != null) { - assertEquals(expectedAmendedDocument, approvable.getReplaceDocument()); + LocalDateTime fixedDateTime = LocalDateTime.of(2024, 11, 4, 9, 0, 0); + try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { + mockedStatic.when(LocalDateTime::now).thenReturn(fixedDateTime); + judgeApprovalResolver.populateJudgeDecision(draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); + + if (approvables != null) { + for (Approvable approvable : approvables) { + if (approvable.match(targetDoc)) { + if (shouldBeApproved) { + assertEquals(expectedOrderStatus, approvable.getOrderStatus()); + assertEquals(fixedDateTime, approvable.getApprovalDate()); + assertEquals("Judge Full Name", approvable.getApprovalJudge()); + if (expectedAmendedDocument != null) { + assertEquals(expectedAmendedDocument, approvable.getReplaceDocument()); + } + } else { + assertNull(approvable.getOrderStatus()); + assertNull(approvable.getApprovalDate()); + assertNull(approvable.getApprovalJudge()); } - } else { - assertNull(approvable.getOrderStatus()); - assertNull(approvable.getApprovalDate()); - assertNull(approvable.getApprovalJudge()); } } } From 609bdf891e3ca21b2def3fe369b8dadf504fe488 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 16:36:13 +0000 Subject: [PATCH 196/336] code format --- .../service/judgeapproval/JudgeApprovalResolver.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 2540129bcd..a945f6cdf6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -39,8 +39,7 @@ class JudgeApprovalResolver { * @param judgeApproval the judge's approval information containing the decision * @param userAuthorisation the user authorization string used to fetch the judge's full name */ - void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, - String userAuthorisation) { + void populateJudgeDecision(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) .ifPresent(collection -> processApprovableCollection(collection.stream() .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) From b72cd08c553e9494bfa29667f082844ebba1efcf Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 16:42:15 +0000 Subject: [PATCH 197/336] Renamed --- .../reform/finrem/caseorchestration/model/ccd/Approvable.java | 2 +- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 2 +- .../model/ccd/draftorders/review/DraftOrderDocumentReview.java | 2 +- .../model/ccd/draftorders/review/PsaDocumentReview.java | 2 +- .../service/judgeapproval/JudgeApprovalResolverTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java index 451d1c52d1..1da8cdf81b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java @@ -12,7 +12,7 @@ public interface Approvable extends DocumentMatcher { String getApprovalJudge(); - CaseDocument getReplaceDocument(); + CaseDocument getReplacedDocument(); void setOrderStatus(OrderStatus orderStatus); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 42d51c7bbd..c40d36834c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -61,7 +61,7 @@ public String getApprovalJudge() { @JsonIgnore @Override - public CaseDocument getReplaceDocument() { + public CaseDocument getReplacedDocument() { if (draftOrder != null) { return draftOrder; } else if (pensionSharingAnnex != null) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index d899cf37be..1e272ab75e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -60,7 +60,7 @@ public String getApprovalJudge() { @JsonIgnore @Override - public CaseDocument getReplaceDocument() { + public CaseDocument getReplacedDocument() { return draftOrderDocument; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 1f9ad589b3..62a6e60877 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -57,7 +57,7 @@ public String getApprovalJudge() { @JsonIgnore @Override - public CaseDocument getReplaceDocument() { + public CaseDocument getReplacedDocument() { return psaDocument; } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 8b3fddc56e..13def6ca46 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -131,7 +131,7 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW assertEquals(fixedDateTime, approvable.getApprovalDate()); assertEquals("Judge Full Name", approvable.getApprovalJudge()); if (expectedAmendedDocument != null) { - assertEquals(expectedAmendedDocument, approvable.getReplaceDocument()); + assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); } } else { assertNull(approvable.getOrderStatus()); From 1cd169468adc4efe47e679f748c8d7c13597abf0 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 17:05:47 +0000 Subject: [PATCH 198/336] add test case --- .../ApproveDraftOrdersMidEventHandler.java | 9 +-- ...ApproveDraftOrdersMidEventHandlerTest.java | 56 +++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 87a56f95c8..741137520e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -127,12 +127,13 @@ private DynamicList buildWhichOrderDynamicList(DraftOrdersWrapper draftOrdersWra private String getDocumentFileName(JudgeApproval judgeApproval) { String filename = null; if (JUDGE_NEEDS_TO_MAKE_CHANGES == judgeApproval.getJudgeDecision()) { - filename = judgeApproval.getAmendedDocument() != null - ? judgeApproval.getAmendedDocument().getDocumentFilename() - : "Unknown Filename"; + if (judgeApproval.getAmendedDocument() == null) { + throw new IllegalStateException("Expected amended document was not found."); + } + filename = judgeApproval.getAmendedDocument().getDocumentFilename(); } else if (READY_TO_BE_SEALED == judgeApproval.getJudgeDecision()) { if (judgeApproval.getDocument() == null) { - throw new IllegalStateException("No Document found."); + throw new IllegalStateException("Expected document was not found."); } filename = judgeApproval.getDocument().getDocumentFilename(); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 70d4478806..693e14efad 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -9,13 +9,16 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; 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.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @@ -25,7 +28,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @@ -82,4 +88,54 @@ void shouldPopulateAnEmptyAnotherHearingRequestEntry() { assertNull(actualRequest.getAdditionalTime(), "additionalTime should be null"); assertNull(actualRequest.getAnyOtherListingInstructions(), "anyOtherListingInstructions should be null"); } + + @Test + void shouldPopulateWhichOrder() { + // Arrange + DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder().build(); + + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build()) + .build(); + + when(approveOrderService.resolveJudgeApproval(draftOrdersWrapper, 1)).thenReturn( + JudgeApproval.builder() + .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) + .docType(JudgeApprovalDocType.DRAFT_ORDER) + .amendedDocument(CaseDocument.builder().documentFilename("AMENDED_DOC.doc").build()) + .build()); + when(approveOrderService.resolveJudgeApproval(draftOrdersWrapper, 2)).thenReturn( + JudgeApproval.builder() + .judgeDecision(READY_TO_BE_SEALED) + .docType(JudgeApprovalDocType.PSA) + .document(CaseDocument.builder().documentFilename("PSA.doc").build()) + .build()); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + List actualCollection = + responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); + + assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); + assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); + AnotherHearingRequest actualRequest = actualCollection.get(0).getValue(); + assertNotNull(actualRequest, "The AnotherHearingRequest object should not be null"); + + DynamicList expectedDynamicList = DynamicList.builder().listItems(List.of( + DynamicListElement.builder().code("DRAFT_ORDER#1").label("AMENDED_DOC.doc").build(), + DynamicListElement.builder().code("PSA#2").label("PSA.doc").build() + )).build(); + assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); + } } From 83a8b340e0f34469e5a5cd32678a7902412e750f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 17:22:02 +0000 Subject: [PATCH 199/336] checkstyle --- .../judgeapproval/ApproveDraftOrdersSubmittedHandler.java | 4 ++-- .../finrem/caseorchestration/model/ccd/UUIDCollection.java | 2 +- .../model/ccd/wrapper/DraftOrdersWrapper.java | 4 ++-- .../caseorchestration/service/NotificationService.java | 2 +- .../service/judgeapproval/JudgeApprovalResolver.java | 4 ++-- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index ad6ed2e8e8..92900a1ce9 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -12,7 +12,7 @@ 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.UUIDCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; @@ -53,7 +53,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); List refusalOrderIdsToBeSent = - ofNullable(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).orElse(List.of()).stream().map(UUIDCollection::getValue).toList(); + ofNullable(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).orElse(List.of()).stream().map(UuidCollection::getValue).toList(); draftOrdersWrapper.getRefusedOrdersCollection().stream() .filter(d -> refusalOrderIdsToBeSent.contains(d.getId())) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java index 13f5e310f3..f55f3c67df 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java @@ -13,6 +13,6 @@ @Builder @AllArgsConstructor @NoArgsConstructor -public class UUIDCollection { +public class UuidCollection { private UUID value; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 8b455e9456..e6304978bc 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UUIDCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; @@ -85,7 +85,7 @@ public class DraftOrdersWrapper implements HasCaseDocument { private String generatedOrderJudgeName; - private List refusalOrderIdsToBeSent; + private List refusalOrderIdsToBeSent; public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java index 576204d92c..cbee8e45f5 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java @@ -66,6 +66,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_CONSENT_ORDER_APPROVED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_GENERAL_APPLICATION_OUTCOME; @@ -83,7 +84,6 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_UPDATE_FRC_COURT; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_UPDATE_FRC_SOL; -import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTEST_ORDER_APPROVED_APPLICANT; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTEST_ORDER_APPROVED_INTERVENER1; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTEST_ORDER_APPROVED_INTERVENER2; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 4788a4fff1..fd32118296 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -10,7 +10,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UUIDCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -232,7 +232,7 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde draftOrdersWrapper.setRefusedOrdersCollection( Stream.concat(existingRefusedOrders.stream(), newRefusedOrders.stream()).toList() ); - draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UUIDCollection::new).toList()); + draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UuidCollection::new).toList()); } private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 9f0a9d903e..3355cd56e5 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -19,7 +19,7 @@ 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.UUIDCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; @@ -127,7 +127,7 @@ void givenUserHasNoDraftOrders_whenHandle_thenReturnError() { @Test void givenRefusalOrderIdsToBeSentWasSet_whenHandle_thenClearThem() { FinremCaseData caseData = new FinremCaseData(); - caseData.getDraftOrdersWrapper().setRefusalOrderIdsToBeSent(List.of(UUIDCollection.builder().value(UUID.randomUUID()).build())); + caseData.getDraftOrdersWrapper().setRefusalOrderIdsToBeSent(List.of(UuidCollection.builder().value(UUID.randomUUID()).build())); GenericAboutToStartOrSubmitCallbackResponse response = handler.handle( FinremCallbackRequestFactory.from(1727874196328932L, caseData), AUTH_TOKEN); @@ -293,7 +293,7 @@ private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, List attachments) { return JudgeApproval.builder() .hearingInfo(hearingInfo) - .hearingDate(LocalDate.of(2024, "hearingServiceFormattedString1".equals(hearingInfo) ? 10: 11 , 30)) + .hearingDate(LocalDate.of(2024, "hearingServiceFormattedString1".equals(hearingInfo) ? 10 : 11, 30)) .title(docType.getTitle()) .inlineDocType(docType.getDescription()) .document(document) From 0038afac4cd7c2eeb18241bd68897b14b1e0ab01 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 18:17:19 +0000 Subject: [PATCH 200/336] Add a TODO for sending notification by post. --- .../ApproveDraftOrdersSubmittedHandler.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 92900a1ce9..dd6c657b5a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -20,6 +20,7 @@ import java.util.UUID; import static java.util.Optional.ofNullable; +import static org.apache.commons.lang3.StringUtils.isEmpty; @Slf4j @Service @@ -57,8 +58,14 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem draftOrdersWrapper.getRefusedOrdersCollection().stream() .filter(d -> refusalOrderIdsToBeSent.contains(d.getId())) - .forEach(a -> notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper - .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue()))); + .forEach(a -> { + if (!isEmpty(a.getValue().getSubmittedByEmail())) { + notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper + .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); + } else { + // TODO by post + } + }); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } From fa70644bb4ec208ef9a913d5e6dbabcb069bf429 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 18:26:07 +0000 Subject: [PATCH 201/336] JavaDoc --- ...stedDraftOrderNotApprovedDetailsMapper.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java index b48bfe2a16..2e824ce9d8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/letterdetails/contestordernotapproved/ContestedDraftOrderNotApprovedDetailsMapper.java @@ -18,13 +18,31 @@ import static java.util.Optional.ofNullable; + +/** + * Repurpose this mapper class to transform FinremCaseDetails and court list information + * into a document template details object specific to refusal order scenario. + */ @Component public class ContestedDraftOrderNotApprovedDetailsMapper extends AbstractLetterDetailsMapper { + /** + * Constructs an instance of ContestedDraftOrderNotApprovedDetailsMapper. + * + * @param courtDetailsMapper the mapper for court details + * @param objectMapper the object mapper for handling JSON operations + */ public ContestedDraftOrderNotApprovedDetailsMapper(CourtDetailsMapper courtDetailsMapper, ObjectMapper objectMapper) { super(courtDetailsMapper, objectMapper); } + /** + * Builds a document template details object for a contested draft order not approved. + * + * @param caseDetails the case details containing the required data + * @param courtList the court list wrapper containing court information + * @return a populated {@link DocumentTemplateDetails} object + */ @Override public DocumentTemplateDetails buildDocumentTemplateDetails(FinremCaseDetails caseDetails, CourtListWrapper courtList) { DraftOrdersWrapper draftOrdersWrapper = caseDetails.getData().getDraftOrdersWrapper(); From b2a71f3ad1339471a7d2fdb7634039a4d9a61430 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 18:28:29 +0000 Subject: [PATCH 202/336] Java docs --- .../finrem/caseorchestration/model/ccd/HasApprovable.java | 3 +++ .../caseorchestration/model/ccd/RefusalOrderConvertible.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java index 2707039f28..657974f321 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java @@ -1,5 +1,8 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; +/** + * Interface representing a container for an {@link Approvable} object. + */ public interface HasApprovable { Approvable getValue(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java index 71d78e9fb1..4dcedbd015 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java @@ -2,6 +2,10 @@ import java.time.LocalDateTime; +/** + * Interface defining the methods required to convert + * a refusal order from draft orders or pension sharing annexes. + */ public interface RefusalOrderConvertible extends Approvable { String getApprovalJudge(); From 8b5e3ba9349b28845adf8a27e0f522260d5b6411 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 18:29:52 +0000 Subject: [PATCH 203/336] JavaDoc --- .../finrem/caseorchestration/model/ccd/UUIDCollection.java | 5 +++++ .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java index f55f3c67df..6634e37917 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java @@ -8,6 +8,11 @@ import java.util.UUID; + +/** + * Represents a collection containing a single UUID value. + * This class is used to encapsulate a UUID in a structured format. + */ @JsonIgnoreProperties(ignoreUnknown = true) @Data @Builder diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 8f82f7386b..5ce6d11abb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -79,7 +79,7 @@ public void setApprovalDate(LocalDateTime approvalDate) { @Override public void setApprovalJudge(String approvalJudge) { - // no approval date; Ignore it. + // no approval judge; Ignore it. } @Override From c68b36a9ffc40c7a69417984526c2a295ef1aa51 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 18:31:32 +0000 Subject: [PATCH 204/336] JavaDoc --- .../mapper/DraftOrdersNotificationRequestMapper.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java index 087b080b0a..f2f4e8fd1a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java @@ -57,6 +57,14 @@ public NotificationRequest buildCaseworkerDraftOrderReviewOverdue(FinremCaseDeta .build(); } + /** + * Builds a {@link NotificationRequest} for a refused draft order or Pension Sharing Annex (PSA). + * + * @param caseDetails the case details containing case and party information. + * @param refusedOrder the refused order details, including the reason and associated document. + * @return a {@link NotificationRequest} containing all required notification details. + * @throws IllegalArgumentException if the draft order or PSA document filename is not available. + */ public NotificationRequest buildRefusedDraftOrderOrPsaNotificationRequest(FinremCaseDetails caseDetails, RefusedOrder refusedOrder) { FinremCaseData caseData = caseDetails.getData(); String notificationEmail = refusedOrder.getSubmittedByEmail(); From bcb8ff72f10cf9f993214dd2a9cb220cc3e77ad0 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 10 Dec 2024 18:33:09 +0000 Subject: [PATCH 205/336] remove extra spaces --- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index c40d36834c..0ebd6f337d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -73,12 +73,12 @@ public CaseDocument getReplacedDocument() { @Override public void setApprovalDate(LocalDateTime approvalDate) { - // no approval date; Ignore it. + // no approval date; Ignore it. } @Override public void setApprovalJudge(String approvalJudge) { - // no approval judge; Ignore it. + // no approval judge; Ignore it. } @Override From 1e3ce569eb35047fa4089d9c8b39abc72a9b8bf0 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 09:31:55 +0000 Subject: [PATCH 206/336] tidy up --- .../service/judgeapproval/ApproveOrderServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java index 14747e6e5f..28dcb22af0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/ApproveOrderServiceTest.java @@ -41,7 +41,8 @@ void testPopulateJudgeDecisions(DraftOrdersWrapper draftOrdersWrapper, int expec underTest.populateJudgeDecisions(FinremCaseDetails.builder().build(), draftOrdersWrapper, AUTH_TOKEN); verify(judgeApprovalResolver, times(expectedPopulateJudgeDecisionInvoked)) - .populateJudgeDecision(any(), eq(draftOrdersWrapper), any(CaseDocument.class), any(JudgeApproval.class), eq(AUTH_TOKEN)); + .populateJudgeDecision(any(FinremCaseDetails.class), eq(draftOrdersWrapper), any(CaseDocument.class), any(JudgeApproval.class), + eq(AUTH_TOKEN)); } static Stream providePopulateJudgeDecisionsData() { From 437f4f00d963edb9c9517c6373ab70259cb03035 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 09:33:33 +0000 Subject: [PATCH 207/336] Rename --- .../model/ccd/{UUIDCollection.java => UuidCollection.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/{UUIDCollection.java => UuidCollection.java} (100%) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UuidCollection.java similarity index 100% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UUIDCollection.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/UuidCollection.java From b40c2558524657cd8de0308681c4dc58f3a24c8d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 09:44:51 +0000 Subject: [PATCH 208/336] Renamed --- .../mapper/DraftOrdersNotificationRequestMapper.java | 2 +- .../caseorchestration/model/ccd/RefusalOrderConvertible.java | 2 +- .../model/ccd/draftorders/review/DraftOrderDocumentReview.java | 2 +- .../model/ccd/draftorders/review/PsaDocumentReview.java | 2 +- .../model/ccd/draftorders/review/RefusedOrder.java | 2 +- .../service/judgeapproval/JudgeApprovalResolver.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java index f2f4e8fd1a..6c4aa6718f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java @@ -68,7 +68,7 @@ public NotificationRequest buildCaseworkerDraftOrderReviewOverdue(FinremCaseDeta public NotificationRequest buildRefusedDraftOrderOrPsaNotificationRequest(FinremCaseDetails caseDetails, RefusedOrder refusedOrder) { FinremCaseData caseData = caseDetails.getData(); String notificationEmail = refusedOrder.getSubmittedByEmail(); - String documentName = ofNullable(refusedOrder.getDraftOrderOrPsa()).map(CaseDocument::getDocumentFilename) + String documentName = ofNullable(refusedOrder.getRefusedDocument()).map(CaseDocument::getDocumentFilename) .orElseThrow(IllegalArgumentException::new); return NotificationRequest.builder() diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java index 4dcedbd015..f2294732fb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java @@ -10,7 +10,7 @@ public interface RefusalOrderConvertible extends Approvable { String getApprovalJudge(); - CaseDocument getDraftOrderOrPsa(); + CaseDocument getRefusedDocument(); LocalDateTime getRefusedDate(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 1d538967d6..009c3edf75 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -78,7 +78,7 @@ public boolean match(CaseDocument targetDoc) { @Override @JsonIgnore - public CaseDocument getDraftOrderOrPsa() { + public CaseDocument getRefusedDocument() { return getDraftOrderDocument(); } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 4066a86d27..7fc8756467 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -75,7 +75,7 @@ public void replaceDocument(CaseDocument amendedDocument) { @Override @JsonIgnore - public CaseDocument getDraftOrderOrPsa() { + public CaseDocument getRefusedDocument() { return getPsaDocument(); } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java index f9307e9702..845b585ae1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java @@ -25,7 +25,7 @@ @EqualsAndHashCode public class RefusedOrder implements HasCaseDocument { - private CaseDocument draftOrderOrPsa; + private CaseDocument refusedDocument; private CaseDocument refusalOrder; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index fd32118296..7dfb416c1b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -207,7 +207,7 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde refusalOrderIds.add(uuid); RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() - .draftOrderOrPsa(refusalOrderConvertible.getDraftOrderOrPsa()) + .refusedDocument(refusalOrderConvertible.getRefusedDocument()) .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), refusalOrderConvertible.getApprovalJudge(), null, userAuthorisation)) .refusedDate(refusalOrderConvertible.getRefusedDate()) From 448f5fb3874c2d722c1f8ca5e93a3b74629d71cb Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 09:58:19 +0000 Subject: [PATCH 209/336] missing colon --- src/test/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index bb1029f67a..344b966ff8 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -217,7 +217,7 @@ uk.gov.notify.email.templates=${UK_GOV_NOTIFY_EMAIL_TEMPLATES:\ FR_CONTESTED_PREPARE_FOR_HEARING: 'f1ee98aa-c6fe-4226-a309-d75e4dd0f8dd',\ FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT: '5166e828-2226-49d1-91b7-7407c682ff86',\ FR_CONTESTED_PREPARE_FOR_HEARING_INTERVENER_SOL: 'f5a55b88-7df6-4c54-8370-713e3ff5d152',\ - FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED '2cf0a3b6-f186-4437-b28a-0e961305a0f5',\ + FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED: '2cf0a3b6-f186-4437-b28a-0e961305a0f5',\ FR_CONTEST_ORDER_NOT_APPROVED: '394e1407-cce5-4fa7-98df-431618b2eba4',\ FR_CONTESTED_CONSENT_ORDER_APPROVED: 'edc2be64-37f0-4104-80d5-5a7c10d0b6dd',\ FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED: '4f725f63-65c2-4e23-8967-874de5142b65',\ From 1ce96495eb26b388cf686e5ee8d11061b907b306 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 10:24:33 +0000 Subject: [PATCH 210/336] Test case fixed. --- .../service/DraftOrderServiceTest.java | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java index 2e85e2ca2b..d0de4a9d40 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java @@ -119,8 +119,7 @@ void testIsPsaSelected(String input, boolean expectedResult) { @ParameterizedTest @MethodSource("provideAgreedDraftOrderTestCases") void testProcessAgreedDraftOrders(UploadAgreedDraftOrder uploadAgreedDraftOrder, - List expectedOrders, - boolean havingMissingUploadPartyLog) { + List expectedOrders) { // Mock dependencies lenient().when(idamAuthService.getUserDetails(AUTH_TOKEN)).thenReturn(UserDetails.builder().forename("James").surname("Bond") .email("jamesbond@fake.com").build()); @@ -152,10 +151,6 @@ void testProcessAgreedDraftOrders(UploadAgreedDraftOrder uploadAgreedDraftOrder, assertTrue(matches, "No matching expected order found for: " + actualOrder); } - - if (havingMissingUploadPartyLog) { - assertThat(logs.getErrors()).containsExactly("Unexpected null 'uploadedParty' on upload agreed order journey."); - } } } @@ -288,31 +283,28 @@ private static Stream provideAgreedDraftOrderTestCases() { return Stream.of( // Case 1: One draft order with one attachment - Arguments.of(uploadOrder1.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(expectedOrder1), - false), - Arguments.of(uploadOrder1.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of(), false), - Arguments.of(uploadOrder1.toBuilder().uploadOrdersOrPsas(List.of(PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(), false), + Arguments.of(uploadOrder1.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(expectedOrder1)), + Arguments.of(uploadOrder1.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of()), + Arguments.of(uploadOrder1.toBuilder().uploadOrdersOrPsas(List.of(PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of()), // Case 2: No documents provided - Arguments.of(uploadOrder2.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(), false), - Arguments.of(uploadOrder2.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of(), false), - Arguments.of(uploadOrder2.toBuilder().uploadOrdersOrPsas(List.of(PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(), false), + Arguments.of(uploadOrder2.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of()), + Arguments.of(uploadOrder2.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of()), + Arguments.of(uploadOrder2.toBuilder().uploadOrdersOrPsas(List.of(PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of()), // Case 3: One draft order with multiple attachments - Arguments.of(uploadOrder3.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(expectedOrder3), - false), - Arguments.of(uploadOrder3.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of(), false), - Arguments.of(uploadOrder3.toBuilder().uploadOrdersOrPsas(List.of(PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(), false), + Arguments.of(uploadOrder3.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(expectedOrder3)), + Arguments.of(uploadOrder3.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of()), + Arguments.of(uploadOrder3.toBuilder().uploadOrdersOrPsas(List.of(PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of()), // Case 4: One draft order with a pension sharing annex - Arguments.of(uploadOrder4.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(expectedOrder4), - false), - Arguments.of(uploadOrder4.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of(), false), + Arguments.of(uploadOrder4.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(UPLOAD_PARTY).build(), List.of(expectedOrder4)), + Arguments.of(uploadOrder4.toBuilder().uploadParty(UPLOAD_PARTY).build(), List.of()), Arguments.of(uploadOrder4.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE, PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), - List.of(expectedOrder4, expectedOrder5), false), + List.of(expectedOrder4, expectedOrder5)), // Case 5: resubmission = YES Arguments.of(uploadOrder5.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE, PSA_TYPE)).uploadParty(UPLOAD_PARTY).build(), - List.of(expectedOrder4.toBuilder().resubmission(YesOrNo.YES).build(), expectedOrder5), false), + List.of(expectedOrder4.toBuilder().resubmission(YesOrNo.YES).build(), expectedOrder5)), // Case 6: Arguments.of(uploadOrder1.toBuilder().uploadOrdersOrPsas(List.of(ORDER_TYPE)).uploadParty(null).build(), - List.of(expectedOrder1.toBuilder().uploadedOnBehalfOf(null).build()), true) + List.of(expectedOrder1.toBuilder().uploadedOnBehalfOf(null).build())) ); } From c3a415ccb6cde5349be29fb1ff496f2a34d7067f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 10:28:07 +0000 Subject: [PATCH 211/336] add a comment. --- .../finrem/caseorchestration/service/DraftOrderService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java index 3e735c822e..0e38aa2f51 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java @@ -102,6 +102,7 @@ public List processAgreedDraftOrders(UploadAgreedDra private void setUploadedOnBehalfOf(UploadAgreedDraftOrder uploadAgreedDraftOrder, AgreedDraftOrder.AgreedDraftOrderBuilder builder) { + // The `uploadParty` could be null if the draft order is uploaded by external parties. ofNullable(uploadAgreedDraftOrder.getUploadParty()) .map(DynamicRadioList::getValue) .map(DynamicRadioListElement::getCode) From 953d352ad38218ceea2e55e7789981277c681e0c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 13:28:41 +0000 Subject: [PATCH 212/336] Sending Post Logic (WIP) --- .../ApproveDraftOrdersSubmittedHandler.java | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index dd6c657b5a..ad5d2e8742 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -6,19 +6,24 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackHandler; import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.DraftOrdersNotificationRequestMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.BulkPrintService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.PaperNotificationService; import java.util.List; import java.util.UUID; +import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.isEmpty; @@ -30,11 +35,23 @@ public class ApproveDraftOrdersSubmittedHandler extends FinremCallbackHandler { private final DraftOrdersNotificationRequestMapper notificationRequestMapper; + private final BulkPrintService bulkPrintService; + + private final PaperNotificationService paperNotificationService; + + private final DocumentHelper documentHelper; + public ApproveDraftOrdersSubmittedHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, NotificationService notificationService, - DraftOrdersNotificationRequestMapper notificationRequestMapper) { + DraftOrdersNotificationRequestMapper notificationRequestMapper, + BulkPrintService bulkPrintService, + PaperNotificationService paperNotificationService, + DocumentHelper documentHelper) { super(finremCaseDetailsMapper); this.notificationService = notificationService; this.notificationRequestMapper = notificationRequestMapper; + this.bulkPrintService = bulkPrintService; + this.paperNotificationService = paperNotificationService; + this.documentHelper = documentHelper; } @Override @@ -63,10 +80,24 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); } else { - // TODO by post + // cloned the logic from ContestedDraftOrderNotApprovedController.sendRefusalReason + // TODO uncomment below +// CaseDocument refusalOrder = a.getValue().getRefusalOrder(); +// +// if (paperNotificationService.shouldPrintForApplicant(caseDetails)) { +// bulkPrintService.printApplicantDocuments(caseDetails, userAuthorisation, +// singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); +// } +// +// if (paperNotificationService.shouldPrintForRespondent(caseDetails)) { +// bulkPrintService.printRespondentDocuments(caseDetails, userAuthorisation, +// singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); +// } + } }); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } + } From 1a7b3ea39549450fb8fb2a59810df8d15bea656d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 14:18:08 +0000 Subject: [PATCH 213/336] Refactoring CaseDataService - deprecating methods and making use of FinremCaseData and FinremCaseDetails --- .../service/CaseDataService.java | 79 +++++++++++++++++++ .../service/PaperNotificationService.java | 52 ++++++++++++ .../controllers/CaseDataControllerTest.java | 17 ++-- ...edDraftOrderNotApprovedControllerTest.java | 8 +- .../NotificationsControllerTest.java | 6 +- .../service/ConsentHearingServiceTest.java | 2 +- .../service/NoticeOfChangeServiceTest.java | 10 +-- .../service/NotificationServiceTest.java | 27 +++---- .../service/PaperNotificationServiceTest.java | 4 +- .../BarristerLetterServiceTest.java | 64 ++++++++------- ...teFrcInfoApplicantDocumentServiceTest.java | 12 +-- .../UpdateFrcInfoRespondentServiceTest.java | 7 +- 12 files changed, 206 insertions(+), 82 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataService.java index 9b5aa756c6..f94b7cccac 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataService.java @@ -65,6 +65,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.SOLICITOR_EMAIL; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; @Service @Slf4j @@ -182,10 +183,46 @@ public void setFinancialRemediesCourtDetails(CaseDetails caseDetails) { caseDetails.getData().put(CONSENT_ORDER_FRC_PHONE, courtDetails.get(COURT_DETAILS_PHONE_KEY)); } + /** + * Checks if the applicant is represented by a solicitor. + * + * @param caseData the case data as a {@code Map} + * @return true if the applicant is represented by a solicitor, otherwise false + * @deprecated since 11-December-2024. Use {@link #isApplicantRepresentedByASolicitor(FinremCaseData)} + * instead. This method is deprecated due to the transition to the {@code FinremCaseData} class, + * which provides a strongly typed representation of case data. + */ + @Deprecated(since = "11-December-2024") public boolean isApplicantRepresentedByASolicitor(Map caseData) { return YES_VALUE.equalsIgnoreCase(nullToEmpty(caseData.get(APPLICANT_REPRESENTED))); } + /** + * Checks if the applicant is represented by a solicitor. + * + *

    This method uses the {@link FinremCaseData} object to determine whether + * the applicant has legal representation.

    + * + * @param caseData the {@link FinremCaseData} containing the case details + * @return true if the applicant is represented by a solicitor, otherwise false + */ + public boolean isApplicantRepresentedByASolicitor(FinremCaseData caseData) { + return caseData.isApplicantRepresentedByASolicitor(); + } + + /** + * Checks if the applicant's solicitor agrees to receive emails. + * + *

    This method determines the solicitor's agreement based on the type of application + * (contested or consented) and the respective case data fields.

    + * + * @param caseDetails the {@link CaseDetails} containing the case data + * @return true if the applicant's solicitor agrees to receive emails, otherwise false + * @deprecated since 11-December-2024. Use {@link #isApplicantSolicitorAgreeToReceiveEmails(FinremCaseDetails)} + * instead. This method is deprecated due to the migration to the {@code FinremCaseDetails} class, + * which provides enhanced type safety and consistency with the updated data model. + */ + @Deprecated(since = "11-December-2024") public boolean isApplicantSolicitorAgreeToReceiveEmails(CaseDetails caseDetails) { boolean isContestedApplication = isContestedApplication(caseDetails); Map caseData = caseDetails.getData(); @@ -193,6 +230,22 @@ public boolean isApplicantSolicitorAgreeToReceiveEmails(CaseDetails caseDetails) || (!isContestedApplication && YES_VALUE.equalsIgnoreCase(nullToEmpty(caseData.get(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONSENTED)))); } + /** + * Checks if the applicant's solicitor agrees to receive emails. + * + *

    This method determines the solicitor's agreement based on the type of application + * (contested or consented) and the respective case data fields.

    + * + * @param caseDetails the {@link FinremCaseDetails} containing the case data + * @return true if the applicant's solicitor agrees to receive emails, otherwise false + */ + public boolean isApplicantSolicitorAgreeToReceiveEmails(FinremCaseDetails caseDetails) { + boolean isContestedApplication = isContestedApplication(caseDetails); + FinremCaseData caseData = caseDetails.getData(); + return (isContestedApplication && YES == caseData.getContactDetailsWrapper().getApplicantSolicitorConsentForEmails()) + || (!isContestedApplication && YES == caseData.getContactDetailsWrapper().getSolicitorAgreeToReceiveEmails()); + } + public boolean isApplicantSolicitorEmailPopulated(CaseDetails caseDetails) { boolean isContestedApplication = isContestedApplication(caseDetails); Map caseData = caseDetails.getData(); @@ -205,11 +258,37 @@ public boolean isRespondentSolicitorAgreeToReceiveEmails(CaseDetails caseDetails return YES_VALUE.equalsIgnoreCase(nullToEmpty(caseData.get(RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT))); } + /** + * Checks if the respondent is represented by a solicitor. + * + *

    This method evaluates the representation status of the respondent by checking + * both consented and contested application fields in the case data map.

    + * + * @param caseData the case data as a {@code Map} + * @return true if the respondent is represented by a solicitor, otherwise false + * @deprecated since 11-December-2024. Use {@link #isRespondentRepresentedByASolicitor(FinremCaseData)} instead. + * This method is deprecated due to the transition to the {@code FinremCaseData} class, which provides a + * strongly typed data structure for better consistency and maintainability. + */ + @Deprecated(since = "11-December-2024") public boolean isRespondentRepresentedByASolicitor(Map caseData) { return YES_VALUE.equalsIgnoreCase(nullToEmpty(caseData.get(CONSENTED_RESPONDENT_REPRESENTED))) || YES_VALUE.equalsIgnoreCase(nullToEmpty(caseData.get(CONTESTED_RESPONDENT_REPRESENTED))); } + /** + * Checks if the respondent is represented by a solicitor. + * + *

    This method evaluates the representation status of the respondent by checking + * both consented and contested application fields in the {@link FinremCaseData}.

    + * + * @param caseData the {@link FinremCaseData} containing the case details + * @return true if the respondent is represented by a solicitor, otherwise false + */ + public boolean isRespondentRepresentedByASolicitor(FinremCaseData caseData) { + return YES == caseData.getContactDetailsWrapper().getConsentedRespondentRepresented() + || YES == caseData.getContactDetailsWrapper().getContestedRespondentRepresented(); + } public boolean isPaperApplication(Map caseData) { return YES_VALUE.equalsIgnoreCase(Objects.toString(caseData.get(PAPER_APPLICATION))); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java index 95e28325a9..c5347fb3ed 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java @@ -7,6 +7,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.intevener.IntervenerWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.generalapplication.service.RejectGeneralApplicationDocumentService; @@ -17,6 +18,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper.PaperNotificationRecipient.APPLICANT; import static uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper.PaperNotificationRecipient.RESPONDENT; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; import static uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseDataService.nullToEmpty; @Service @@ -53,17 +55,67 @@ public void printAssignToJudgeNotification(CaseDetails caseDetails, String authT } } + /** + * Determines if a case should print for the applicant. + * + * @param caseDetails the case details + * @return true if the case should print for the applicant, otherwise false + * @deprecated Use {@link #shouldPrintForApplicant(FinremCaseDetails)} instead. + * This method is deprecated due to the introduction of the {@code FinremCaseDetails} class, + * which provides better encapsulation and alignment with the updated data model. + */ + @Deprecated(since = "11-December-2024") public boolean shouldPrintForApplicant(CaseDetails caseDetails) { return !caseDataService.isApplicantRepresentedByASolicitor(caseDetails.getData()) || !caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails) || caseDataService.isPaperApplication(caseDetails.getData()); } + /** + * Determines if a case should print for the applicant. + * + * @param caseDetails the {@link FinremCaseDetails} containing the case data + * @return true if the case should print for the applicant, otherwise false + * + */ + public boolean shouldPrintForApplicant(FinremCaseDetails caseDetails) { + return !caseDataService.isApplicantRepresentedByASolicitor(caseDetails.getData()) + || !caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails) + || caseDataService.isPaperApplication(caseDetails.getData()); + } + + /** + * Determines if a case should print for the respondent. + * + *

    This method evaluates if the respondent requires a printed version of the case information + * based on their legal representation status and consent to email notifications.

    + * + * @param caseDetails the {@link CaseDetails} containing the case data + * @return true if the case should print for the respondent, otherwise false + * @deprecated since 11-December-2024. Use {@link #shouldPrintForRespondent(FinremCaseDetails)} instead. + * This method is deprecated due to the migration to the {@code FinremCaseDetails} class, which aligns + * with the updated data model and improves type safety. + */ + @Deprecated(since = "11-December-2024") public boolean shouldPrintForRespondent(CaseDetails caseDetails) { return !caseDataService.isRespondentRepresentedByASolicitor(caseDetails.getData()) || !YES_VALUE.equalsIgnoreCase(nullToEmpty(caseDetails.getData().get(RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT))); } + /** + * Determines if a case should print for the respondent. + * + *

    This method evaluates if the respondent requires a printed version of the case information + * based on their legal representation status and consent to email notifications.

    + * + * @param caseDetails the {@link FinremCaseDetails} containing the case data + * @return true if the case should print for the respondent, otherwise false + */ + public boolean shouldPrintForRespondent(FinremCaseDetails caseDetails) { + return !caseDataService.isRespondentRepresentedByASolicitor(caseDetails.getData()) + || YES != caseDetails.getData().getRespSolNotificationsEmailConsent(); + } + private boolean shouldPrintNotificationForRespondentSolicitor(CaseDetails caseDetails) { return caseDataService.isRespondentRepresentedByASolicitor(caseDetails.getData()) && !YES_VALUE.equalsIgnoreCase(nullToEmpty(caseDetails.getData().get(RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT))); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java index bcf1be3f7a..5d2030c7b4 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java @@ -12,6 +12,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.UpdateSolicitorDetailsService; import java.io.InputStream; +import java.util.Map; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.hasItem; @@ -184,7 +185,7 @@ public void shouldNotSetOrgPolicyIfInvalidCaseType() throws Exception { @Test public void shouldSuccessfullyPopulateApplicantSolicitorAddressContested() { - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); CallbackRequest callbackRequest = buildCallbackRequest(); @@ -195,7 +196,7 @@ public void shouldSuccessfullyPopulateApplicantSolicitorAddressContested() { @Test public void shouldNotPopulateApplicantSolicitorAddressContested_notRepresented() { - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); caseDataController.setContestedDefaultValues(AUTH_TOKEN, buildCallbackRequest()); @@ -204,7 +205,7 @@ public void shouldNotPopulateApplicantSolicitorAddressContested_notRepresented() @Test public void shouldSuccessfullyPopulateApplicantSolicitorAddressConsented() { - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); CallbackRequest callbackRequest = buildCallbackRequest(); @@ -215,7 +216,7 @@ public void shouldSuccessfullyPopulateApplicantSolicitorAddressConsented() { @Test public void shouldNotPopulateApplicantSolicitorAddressConsented_notRepresented() { - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); caseDataController.setConsentedDefaultValues(AUTH_TOKEN, buildCallbackRequest()); @@ -233,8 +234,8 @@ public void createRequest(String payload) throws Exception { @Test public void shouldSuccessfullySetOrgPolicies() throws Exception { createRequest(PATH + "no-org-policies.json"); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(false); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); mvc.perform(post("/case-orchestration/org-policies") .content(objectMapper.writeValueAsString(request)) .header(AUTHORIZATION_HEADER, AUTH_TOKEN) @@ -251,8 +252,8 @@ public void shouldSuccessfullySetOrgPolicies() throws Exception { @Test public void shouldNotSetOrgPolicies() throws Exception { createRequest(PATH + "no-orgs-is-represented.json"); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); mvc.perform(post("/case-orchestration/org-policies") .content(objectMapper.writeValueAsString(request)) .header(AUTHORIZATION_HEADER, AUTH_TOKEN) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/ContestedDraftOrderNotApprovedControllerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/ContestedDraftOrderNotApprovedControllerTest.java index c4534a529c..910e181991 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/ContestedDraftOrderNotApprovedControllerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/ContestedDraftOrderNotApprovedControllerTest.java @@ -186,8 +186,8 @@ public void submitRefusalOrder400Error() throws Exception { public void submitSendRefusalReasonWithRefusalAndShouldPrintForApplicantTrue() throws Exception { doValidRefusalOrder(); when(contestedDraftOrderNotApprovedService.getLatestRefusalReason(any())).thenReturn(Optional.of(caseDocument())); - when(paperNotificationService.shouldPrintForApplicant(any())).thenReturn(true); - when(paperNotificationService.shouldPrintForRespondent(any())).thenReturn(true); + when(paperNotificationService.shouldPrintForApplicant(any(CaseDetails.class))).thenReturn(true); + when(paperNotificationService.shouldPrintForRespondent(any(CaseDetails.class))).thenReturn(true); mvc.perform(post(SUBMIT_REFUSAL_REASON_URL) .content(requestContent.toString()) .header(AUTHORIZATION_HEADER, AUTH_TOKEN) @@ -202,8 +202,8 @@ public void submitSendRefusalReasonWithRefusalAndShouldPrintForApplicantTrue() t public void submitSendRefusalReasonWithRefusalAndShouldNotPrintForParties() throws Exception { doValidRefusalOrder(); when(contestedDraftOrderNotApprovedService.getLatestRefusalReason(any())).thenReturn(Optional.of(caseDocument())); - when(paperNotificationService.shouldPrintForApplicant(any())).thenReturn(false); - when(paperNotificationService.shouldPrintForRespondent(any())).thenReturn(false); + when(paperNotificationService.shouldPrintForApplicant(any(CaseDetails.class))).thenReturn(false); + when(paperNotificationService.shouldPrintForRespondent(any(CaseDetails.class))).thenReturn(false); mvc.perform(post(SUBMIT_REFUSAL_REASON_URL) .content(requestContent.toString()) .header(AUTHORIZATION_HEADER, AUTH_TOKEN) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/NotificationsControllerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/NotificationsControllerTest.java index 2ef89f2f04..df0d1f268b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/NotificationsControllerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/NotificationsControllerTest.java @@ -214,7 +214,7 @@ public void sendConsentOrderNotApprovedEmail() { @Test public void shouldNotSendConsentOrderNotApprovedEmail() { when(caseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(true); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(false); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(false); notificationsController.sendConsentOrderNotApprovedEmail(buildCallbackRequest()); @@ -266,7 +266,7 @@ public void shouldNotSendContestedHwfSuccessfulEmail() { @Test public void sendDraftOrderEmailWhenApplicantSolicitorIsNominatedAndIsAcceptingEmails() { when(caseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(true); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(true); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(true); when(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(any())).thenReturn(true); notificationsController.sendDraftOrderEmail(createCallbackRequestWithFinalOrder()); @@ -360,7 +360,7 @@ public void sendContestedGeneralApplicationReferToJudgeEmail() { @Test public void sendContestedGeneralApplicationOutcomeEmail() throws IOException { when(caseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(false); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(true); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(true); notificationsController.sendGeneralApplicationOutcomeEmail(buildCallbackRequest()); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/ConsentHearingServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/ConsentHearingServiceTest.java index 854e9bd3bc..479add62c8 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/ConsentHearingServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/ConsentHearingServiceTest.java @@ -129,7 +129,7 @@ public void givenFinremCaseDetailsConsentedPaperCase_WhenPaperCase_ThenItShouldN service.sendNotification(caseDetails, caseDetailsBefore); - verify(caseDataService, never()).isApplicantSolicitorAgreeToReceiveEmails(any()); + verify(caseDataService, never()).isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class)); verify(notificationService, never()).isRespondentSolicitorEmailCommunicationEnabled(any()); verify(notificationService, never()) .sendConsentHearingNotificationEmailToApplicantSolicitor(any(FinremCaseDetails.class), anyMap()); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java index dfdb8ad712..cd019d49a3 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java @@ -61,7 +61,6 @@ public class NoticeOfChangeServiceTest extends BaseServiceTest { private final Function, List>> getFirstChangeElement = this::convertToUpdateHistory; - @Before public void setUp() { mapper.registerModule(new JavaTimeModule()); @@ -297,8 +296,8 @@ public void shouldUpdateRepresentationUpdateHistory_whenNatureIsReplacing() thro public void shouldUpdateRepresentationUpdateHistoryRespondent() throws Exception { setUpCaseDetails("change-of-representatives-respondent.json"); when(mockIdamService.getIdamFullName(any())).thenReturn("Claire Mumford"); - when(mockCaseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); - when(mockCaseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(mockCaseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(mockCaseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(mockCaseDataService.buildFullRespondentName((CaseDetails) any())).thenReturn("Jane Smith"); when(addedSolicitorService.getAddedSolicitorAsCaseworker(any())).thenReturn( ChangedRepresentative.builder() @@ -386,10 +385,9 @@ private void setUpHelper() { when(mockIdamService.getIdamFullName(any())).thenReturn("Claire Mumford"); when(mockCaseDataService.buildFullApplicantName((CaseDetails) any())).thenReturn("John Smith"); when(mockCaseDataService.buildFullRespondentName((CaseDetails) any())).thenReturn("Jane Smith"); - when(mockCaseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); - when(mockCaseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(mockCaseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(mockCaseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(mockCaseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(false); } } - diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java index d2e84d4e2e..89b84e3d77 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java @@ -148,7 +148,6 @@ public class NotificationServiceTest extends BaseServiceTest { private NotificationRequest notificationRequest; private SolicitorCaseDataKeysWrapper dataKeysWrapper; - @Before public void setUp() { callbackRequest = getConsentedCallbackRequest(); @@ -176,7 +175,6 @@ public void sendHwfSuccessfulNotificationEmail() { verify(emailService).sendConfirmationEmail(notificationRequest, FR_HWF_SUCCESSFUL); } - @Test public void sendAssignToJudgeNotificationEmailToApplicantSolicitor() { notificationService.sendAssignToJudgeConfirmationEmailToApplicantSolicitor(callbackRequest.getCaseDetails()); @@ -279,7 +277,6 @@ public void sendFinremPrepareForHearingNotificationEmailToIntervenerSolicitor() verify(emailService).sendConfirmationEmail(notificationRequest, FR_CONTESTED_PREPARE_FOR_HEARING_INTERVENER_SOL); } - @Test public void sendPrepareForHearingAfterSentNotificationEmailApplicant() { callbackRequest = getContestedCallbackRequest(); @@ -347,7 +344,6 @@ public void sendConsentOrderAvailableNotificationCtscEmail() { verify(emailService).sendConfirmationEmail(notificationRequest, FR_CONSENT_ORDER_AVAILABLE_CTSC); } - @Test public void sendContestedApplicationIssuedEmail() { notificationService.sendContestedApplicationIssuedEmailToApplicantSolicitor(callbackRequest.getCaseDetails()); @@ -356,7 +352,6 @@ public void sendContestedApplicationIssuedEmail() { verify(emailService).sendConfirmationEmail(notificationRequest, FR_CONTESTED_APPLICATION_ISSUED); } - @Test public void sendContestOrderApprovedEmailApplicantSolicitor() { notificationService.sendContestOrderApprovedEmailApplicant(callbackRequest.getCaseDetails()); @@ -366,7 +361,6 @@ public void sendContestOrderApprovedEmailApplicantSolicitor() { verify(emailService).sendConfirmationEmail(notificationRequest, FR_CONTEST_ORDER_APPROVED_APPLICANT); } - @Test public void sendContestOrderApprovedEmailRespondentSolicitor() { notificationService.sendContestOrderApprovedEmailRespondent(callbackRequest.getCaseDetails()); @@ -424,7 +418,6 @@ public void sendSolicitorToDraftOrderEmailRespondent() { verify(emailService).sendConfirmationEmail(notificationRequest, FR_CONTESTED_DRAFT_ORDER); } - @Test public void sendSolicitorToDraftOrderEmailApplicant() { notificationService.sendSolicitorToDraftOrderEmailApplicant(callbackRequest.getCaseDetails()); @@ -706,7 +699,7 @@ public void shouldEmailRespondentSolicitor() { caseData.put(RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT, YES_VALUE); when(caseDataService.isPaperApplication(anyMap())).thenReturn(false); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(caseDataService.isNotEmpty(RESP_SOLICITOR_EMAIL, caseData)).thenReturn(true); assertTrue(notificationService.isRespondentSolicitorEmailCommunicationEnabled(caseData)); @@ -715,7 +708,7 @@ public void shouldEmailRespondentSolicitor() { @Test public void shouldNotEmailRespondentSolicitor() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); assertFalse(notificationService.isRespondentSolicitorEmailCommunicationEnabled(any())); } @@ -723,7 +716,7 @@ public void shouldNotEmailRespondentSolicitor() { @Test public void shouldEmailRespondentSolicitorWhenNullEmailConsent() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(false); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(caseDataService.isNotEmpty(any(), any())).thenReturn(true); Map caseData = new HashMap<>(); @@ -741,7 +734,7 @@ public void shouldEmailContestedAppSolicitor() { caseData.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONTESTED, YES_VALUE); when(caseDataService.isPaperApplication(anyMap())).thenReturn(false); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(caseDataService.isNotEmpty(CONTESTED_SOLICITOR_EMAIL, caseData)).thenReturn(true); assertTrue(notificationService.isContestedApplicantSolicitorEmailCommunicationEnabled(caseData)); @@ -750,7 +743,7 @@ public void shouldEmailContestedAppSolicitor() { @Test public void shouldNotEmailContestedAppSolicitor() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); assertFalse(notificationService.isContestedApplicantSolicitorEmailCommunicationEnabled(any())); } @@ -1102,11 +1095,10 @@ public void shouldNotEmailApplicantSolicitorWhenApplicantSolicitorIsDigitalAndEm assertFalse(notificationService.isApplicantSolicitorDigitalAndEmailPopulated(caseDetails)); } - @Test public void shouldNotEmailApplicantSolicitorWhenApplicantSolicitorIsNotRegisteredButIsAcceptingEmails() { when(checkSolicitorIsDigitalService.isApplicantSolicitorDigital(any())).thenReturn(false); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(true); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(true); assertFalse(notificationService.isApplicantSolicitorDigitalAndEmailPopulated(CaseDetails.builder() .id(1234567890L).build())); @@ -1115,7 +1107,7 @@ public void shouldNotEmailApplicantSolicitorWhenApplicantSolicitorIsNotRegistere @Test public void shouldNotEmailApplicantSolicitorWhenApplicantSolicitorIsNotDigital() { when(checkSolicitorIsDigitalService.isApplicantSolicitorDigital(any())).thenReturn(false); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(true); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(true); assertFalse(notificationService.isApplicantSolicitorDigitalAndEmailPopulated(CaseDetails.builder() .id(1234567890L).build())); @@ -1176,7 +1168,6 @@ public void shouldEmailRespondentSolicitorWhenRespondentSolicitorIsDigitalAndEma assertTrue(notificationService.isRespondentSolicitorDigitalAndEmailPopulated(caseDetails)); } - @Test public void shouldNotEmailRespondentSolicitorWhenRespondentSolicitorIsNotDigitalAndEmailIsPopulated() { when(checkSolicitorIsDigitalService.isRespondentSolicitorDigital(any())).thenReturn(false); @@ -1337,7 +1328,7 @@ public void givenAppIsNotContestedAndApplicantSolicitorIsRegisteredAndAcceptingE when(checkSolicitorIsDigitalService.isRespondentSolicitorDigital(any())).thenReturn(true); when(caseDataService.isNotEmpty(RESP_SOLICITOR_EMAIL, caseData)).thenReturn(true); when(caseDataService.isPaperApplication(any(FinremCaseData.class))).thenReturn(false); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); CaseDetails caseDetails = CaseDetails.builder().data(caseData).build(); @@ -1348,7 +1339,7 @@ public void givenAppIsNotContestedAndApplicantSolicitorIsRegisteredAndAcceptingE public void isContestedAndRespondentSolicitorIsNotRegisteredOrAcceptingEmails() { when(caseDataService.isContestedPaperApplication(any())).thenReturn(true); when(checkSolicitorIsDigitalService.isRespondentSolicitorDigital(any())).thenReturn(true); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); Map caseData = new HashMap<>(); when(caseDataService.isNotEmpty(RESP_SOLICITOR_EMAIL, caseData)).thenReturn(false); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java index e2adec1a49..2d1b9950b3 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java @@ -11,6 +11,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.IntervenerOne; import uk.gov.hmcts.reform.finrem.caseorchestration.service.generalapplication.service.RejectGeneralApplicationDocumentService; +import java.util.Map; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; @@ -42,7 +44,7 @@ public class PaperNotificationServiceTest extends BaseServiceTest { public void sendAssignToJudgeNotificationLetterIfIsPaperApplication() { when(caseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(true); when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); paperNotificationService.printAssignToJudgeNotification(buildCaseDetails(), AUTH_TOKEN); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java index 79e1ddc1a0..a3b9e39e03 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java @@ -1,15 +1,15 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.barristers; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; + +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; @@ -41,8 +41,8 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CASE_DATA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CASE_DETAILS; -@RunWith(MockitoJUnitRunner.class) -public class BarristerLetterServiceTest { +@ExtendWith(MockitoExtension.class) +class BarristerLetterServiceTest { private static final String APP_BARR_NAME = "app_Barr_name"; private static final String APP_BARR_EMAIL = "app_Barr_email"; @@ -82,15 +82,15 @@ public class BarristerLetterServiceTest { @Captor ArgumentCaptor> placeholdersMapCaptor; - @Before - public void setUp() { + @BeforeEach + void setUp() { Map caseData = new HashMap<>(); caseDetails = CaseDetails.builder().id(Long.valueOf(CASE_ID)).data(caseData).build(); } @Test - public void givenApplicantIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); + void givenApplicantIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); barristerLetterTuple = BarristerLetterTuple.of(APPLICANT, AUTH_TOKEN, ADDED); barrister = applicantBarrister(); @@ -98,10 +98,9 @@ public void givenApplicantIsRepresentedBySolicitor_whenSendBarristerLetter_thenN verify(bulkPrintService, never()).sendDocumentForPrint(any(), any(CaseDetails.class), any(), any()); } - @Test - public void givenRespondentIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + void givenRespondentIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); barristerLetterTuple = BarristerLetterTuple.of(RESPONDENT, AUTH_TOKEN, ADDED); barrister = respondentBarrister(); @@ -111,12 +110,12 @@ public void givenRespondentIsRepresentedBySolicitor_whenSendBarristerLetter_then } @Test - public void givenApplicantUnrepresentedAndAddedBarrister_whenSendBarristerLetter_thenSendLetter() { + void givenApplicantUnrepresentedAndAddedBarrister_whenSendBarristerLetter_thenSendLetter() { BarristerLetterDetails letterDetails = barristerLetterDetails(); CaseDocument addedCaseDocument = addedCaseDocument(); when(bulkPrintService.getRecipient(DocumentHelper.PaperNotificationRecipient.APPLICANT.toString())) .thenReturn(CCDConfigConstant.APPLICANT); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(APPLICANT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerAddedTemplate()).thenReturn(BARRISTER_ADDED_TEMPLATE); when(documentConfiguration.getBarristerAddedFilename()).thenReturn(BARRISTER_ADDED_FILENAME); @@ -133,17 +132,17 @@ public void givenApplicantUnrepresentedAndAddedBarrister_whenSendBarristerLetter verify(bulkPrintService).sendDocumentForPrint(addedCaseDocument, caseDetails, CCDConfigConstant.APPLICANT, AUTH_TOKEN); Map caseData = getPlaceholdersMap(placeholdersMapCaptor); - assertThat(caseData.get("barristerFirmName"), is(BARR_FIRM_NAME)); - assertThat(caseData.get("caseNumber"), is(CASE_NUMBER)); + assertThat(caseData.get("barristerFirmName")).isEqualTo(BARR_FIRM_NAME); + assertThat(caseData.get("caseNumber")).isEqualTo(CASE_NUMBER); } @Test - public void givenApplicantUnrepresentedAndRemovedBarrister_whenSendBarristerLetter_thenSendLetter() { + void givenApplicantUnrepresentedAndRemovedBarrister_whenSendBarristerLetter_thenSendLetter() { BarristerLetterDetails letterDetails = barristerLetterDetails(); CaseDocument removed = removedCaseDocument(); when(bulkPrintService.getRecipient(DocumentHelper.PaperNotificationRecipient.APPLICANT.toString())) .thenReturn(CCDConfigConstant.APPLICANT); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(APPLICANT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerRemovedTemplate()).thenReturn(BARRISTER_REMOVED_TEMPLATE); when(documentConfiguration.getBarristerRemovedFilename()).thenReturn(BARRISTER_REMOVED_FILENAME); @@ -160,17 +159,17 @@ public void givenApplicantUnrepresentedAndRemovedBarrister_whenSendBarristerLett verify(bulkPrintService).sendDocumentForPrint(removed, caseDetails, CCDConfigConstant.APPLICANT, AUTH_TOKEN); Map caseData = getPlaceholdersMap(placeholdersMapCaptor); - assertThat(caseData.get("barristerFirmName"), is(BARR_FIRM_NAME)); - assertThat(caseData.get("caseNumber"), is(CASE_NUMBER)); + assertThat(caseData.get("barristerFirmName")).isEqualTo(BARR_FIRM_NAME); + assertThat(caseData.get("caseNumber")).isEqualTo(CASE_NUMBER); } @Test - public void givenRespondentUnrepresentedAndAddedBarrister_whenSendBarristerLetter_thenSendLetter() { + void givenRespondentUnrepresentedAndAddedBarrister_whenSendBarristerLetter_thenSendLetter() { BarristerLetterDetails letterDetails = barristerLetterDetails(); CaseDocument addedCaseDocument = addedCaseDocument(); when(bulkPrintService.getRecipient(RESPONDENT.toString())) .thenReturn(CCDConfigConstant.RESPONDENT); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(RESPONDENT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerAddedTemplate()).thenReturn(BARRISTER_ADDED_TEMPLATE); when(documentConfiguration.getBarristerAddedFilename()).thenReturn(BARRISTER_ADDED_FILENAME); @@ -187,17 +186,17 @@ public void givenRespondentUnrepresentedAndAddedBarrister_whenSendBarristerLette verify(bulkPrintService).sendDocumentForPrint(addedCaseDocument, caseDetails, CCDConfigConstant.RESPONDENT, AUTH_TOKEN); Map caseData = getPlaceholdersMap(placeholdersMapCaptor); - assertThat(caseData.get("barristerFirmName"), is(BARR_FIRM_NAME)); - assertThat(caseData.get("caseNumber"), is(CASE_NUMBER)); + assertThat(caseData.get("barristerFirmName")).isEqualTo(BARR_FIRM_NAME); + assertThat(caseData.get("caseNumber")).isEqualTo(CASE_NUMBER); } @Test - public void givenRespondentUnrepresentedAndRemovedBarrister_whenSendBarristerLetter_thenSendLetter() { + void givenRespondentUnrepresentedAndRemovedBarrister_whenSendBarristerLetter_thenSendLetter() { BarristerLetterDetails letterDetails = barristerLetterDetails(); CaseDocument removed = removedCaseDocument(); when(bulkPrintService.getRecipient(RESPONDENT.toString())) .thenReturn(CCDConfigConstant.RESPONDENT); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(RESPONDENT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerRemovedTemplate()).thenReturn(BARRISTER_REMOVED_TEMPLATE); when(documentConfiguration.getBarristerRemovedFilename()).thenReturn(BARRISTER_REMOVED_FILENAME); @@ -214,11 +213,10 @@ public void givenRespondentUnrepresentedAndRemovedBarrister_whenSendBarristerLet verify(bulkPrintService).sendDocumentForPrint(removed, caseDetails, CCDConfigConstant.RESPONDENT, AUTH_TOKEN); Map caseData = getPlaceholdersMap(placeholdersMapCaptor); - assertThat(caseData.get("barristerFirmName"), is(BARR_FIRM_NAME)); - assertThat(caseData.get("caseNumber"), is(CASE_NUMBER)); + assertThat(caseData.get("barristerFirmName")).isEqualTo(BARR_FIRM_NAME); + assertThat(caseData.get("caseNumber")).isEqualTo(CASE_NUMBER); } - private Barrister applicantBarrister() { return Barrister.builder() .name(APP_BARR_NAME) @@ -262,4 +260,4 @@ private Map getPlaceholdersMap(ArgumentCaptor map = (Map) placeholdersMapCaptor.getValue().get(CASE_DETAILS); return (Map) map.get(CASE_DATA); } -} \ No newline at end of file +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java index fe02680eda..f022d8a81b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java @@ -4,8 +4,10 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; +import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import java.util.Map; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -61,7 +63,7 @@ public void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenRe private void setUpLitigantMockContext() { when(documentConfiguration.getUpdateFRCInformationLitigantTemplate()).thenReturn(LIT_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationLitigantFilename()).thenReturn(LIT_DOC_FILENAME); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), eq(LIT_DOC_TEMPLATE), @@ -73,8 +75,8 @@ private void setUpLitigantMockContext() { private void setUpSolicitorMockContext() { when(documentConfiguration.getUpdateFRCInformationSolicitorTemplate()).thenReturn(SOL_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationSolicitorFilename()).thenReturn(SOL_DOC_FILENAME); - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), eq(SOL_DOC_TEMPLATE), @@ -84,7 +86,7 @@ private void setUpSolicitorMockContext() { } private void setUpNoLetterMockContext() { - when(caseDataService.isApplicantRepresentedByASolicitor(any())).thenReturn(true); - when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any())).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(true); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java index 084cc4ed17..d50d39a51a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java @@ -6,6 +6,7 @@ import org.mockito.junit.MockitoJUnitRunner; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import java.util.Map; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -61,7 +62,7 @@ public void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenRe private void setUpLitigantMockContext() { when(documentConfiguration.getUpdateFRCInformationLitigantTemplate()).thenReturn(LIT_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationLitigantFilename()).thenReturn(LIT_DOC_FILENAME); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), eq(LIT_DOC_TEMPLATE), @@ -73,7 +74,7 @@ private void setUpLitigantMockContext() { private void setUpSolicitorMockContext() { when(documentConfiguration.getUpdateFRCInformationSolicitorTemplate()).thenReturn(SOL_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationSolicitorFilename()).thenReturn(SOL_DOC_FILENAME); - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(caseDataService.isRespondentSolicitorAgreeToReceiveEmails(any())).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), @@ -84,7 +85,7 @@ private void setUpSolicitorMockContext() { } private void setUpNoLetterMockContext() { - when(caseDataService.isRespondentRepresentedByASolicitor(any())).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); when(caseDataService.isRespondentSolicitorAgreeToReceiveEmails(any())).thenReturn(true); } } From e3b5bdaedf7af50bd0a2c8b6ad2367714f7d0517 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 14:31:59 +0000 Subject: [PATCH 214/336] checkstyle --- .../service/barristers/BarristerLetterServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java index a3b9e39e03..58cdb394bd 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java @@ -98,6 +98,7 @@ void givenApplicantIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetter verify(bulkPrintService, never()).sendDocumentForPrint(any(), any(CaseDetails.class), any(), any()); } + @Test void givenRespondentIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); From 7dff6e8b0575b808ba73edc5a78bb7857437fc34 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 16:56:59 +0000 Subject: [PATCH 215/336] checkstyle --- .../caseorchestration/service/PaperNotificationService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java index c5347fb3ed..4c9cb08096 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationService.java @@ -61,8 +61,8 @@ public void printAssignToJudgeNotification(CaseDetails caseDetails, String authT * @param caseDetails the case details * @return true if the case should print for the applicant, otherwise false * @deprecated Use {@link #shouldPrintForApplicant(FinremCaseDetails)} instead. - * This method is deprecated due to the introduction of the {@code FinremCaseDetails} class, - * which provides better encapsulation and alignment with the updated data model. + * This method is deprecated due to the introduction of the {@code FinremCaseDetails} class, + * which provides better encapsulation and alignment with the updated data model. */ @Deprecated(since = "11-December-2024") public boolean shouldPrintForApplicant(CaseDetails caseDetails) { From 2e71fe7cce537f7fee9f74e2aadd6450266e8da8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 17:39:19 +0000 Subject: [PATCH 216/336] update test case --- .../service/CaseDataServiceTest.java | 362 +++++++++--------- 1 file changed, 181 insertions(+), 181 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java index 24f89d6b28..b2dc7f64da 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java @@ -7,14 +7,14 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import com.google.common.collect.ImmutableMap; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.ccd.client.model.CallbackRequest; import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; -import uk.gov.hmcts.reform.finrem.caseorchestration.BaseServiceTest; import uk.gov.hmcts.reform.finrem.caseorchestration.TestSetUpUtils; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -33,12 +33,9 @@ import java.util.Map; import static java.util.Arrays.asList; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.NO_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.YES_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.GENERAL_ORDER_CONSENT_IN_CONTESTED; @@ -72,14 +69,17 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.RESPONDENT_SOLICITOR; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER; -public class CaseDataServiceTest extends BaseServiceTest { +@ExtendWith(MockitoExtension.class) +class CaseDataServiceTest { - @Autowired + @InjectMocks CaseDataService caseDataService; + + @Mock FinremCaseDetailsMapper finremCaseDetailsMapper; - @Before - public void setup() { + @BeforeEach + void setup() { ObjectMapper objectMapper = JsonMapper .builder() .addModule(new JavaTimeModule()) @@ -91,101 +91,100 @@ public void setup() { finremCaseDetailsMapper = new FinremCaseDetailsMapper(objectMapper); } - @Test - public void isRespondentSolicitorResponsibleToDraftOrder_shouldReturnTrue() { + void isRespondentSolicitorResponsibleToDraftOrder_shouldReturnTrue() { Map caseData = new HashMap<>(); caseData.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, RESPONDENT_SOLICITOR); - assertTrue(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)); + assertThat(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)).isTrue(); } @Test - public void isRespondentSolicitorResponsibleToDraftOrder_appSolicitor() { + void isRespondentSolicitorResponsibleToDraftOrder_appSolicitor() { Map caseData = new HashMap<>(); caseData.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, APPLICANT_SOLICITOR); - assertFalse(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)); + assertThat(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)).isFalse(); } @Test - public void isRespondentSolicitorResponsibleToDraftOrder_fieldNotExist() { + void isRespondentSolicitorResponsibleToDraftOrder_fieldNotExist() { Map caseData = new HashMap<>(); - assertFalse(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)); + assertThat(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)).isFalse(); } @Test - public void shouldSuccessfullyMoveValues() { + void shouldSuccessfullyMoveValues() { Map caseData = TestSetUpUtils.caseDataWithUploadHearingOrder(); caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(((Collection) caseData.get("uploadHearingOrderRO")), hasSize(3)); - assertThat(caseData.get(HEARING_ORDER_COLLECTION), Matchers.nullValue()); + assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(3); + assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isNull(); } @Test - public void shouldSuccessfullyMoveValuesToNewCollections() { + void shouldSuccessfullyMoveValuesToNewCollections() { Map caseData = TestSetUpUtils.caseDataWithUploadHearingOrder(); caseData.put("uploadHearingOrderRO", null); caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(((Collection) caseData.get("uploadHearingOrderRO")), hasSize(1)); - assertThat(caseData.get(HEARING_ORDER_COLLECTION), Matchers.nullValue()); + assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(1); + assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isNull(); } @Test - public void shouldDoNothingWithNonArraySourceValueMove() { + void shouldDoNothingWithNonArraySourceValueMove() { Map caseData = TestSetUpUtils.caseDataWithUploadHearingOrder(); caseData.put(HEARING_ORDER_COLLECTION, "nonarrayValue"); caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(((Collection) caseData.get("uploadHearingOrderRO")), hasSize(2)); - assertThat(caseData.get(HEARING_ORDER_COLLECTION), Matchers.is("nonarrayValue")); + assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(2); + assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isEqualTo("nonarrayValue"); } @Test - public void shouldDoNothingWithNonArrayDestinationValueMove() { + void shouldDoNothingWithNonArrayDestinationValueMove() { Map caseData = TestSetUpUtils.caseDataWithUploadHearingOrder(); caseData.put("uploadHearingOrderRO", "nonarrayValue"); caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(caseData.get("uploadHearingOrderRO"), Matchers.is("nonarrayValue")); - assertThat(((Collection) caseData.get(HEARING_ORDER_COLLECTION)), hasSize(1)); + assertThat(caseData.get("uploadHearingOrderRO")).isEqualTo("nonarrayValue"); + assertThat((Collection) caseData.get(HEARING_ORDER_COLLECTION)).hasSize(1); } @Test - public void shouldDoNothingWhenSourceIsEmptyMove() { + void shouldDoNothingWhenSourceIsEmptyMove() { Map caseData = TestSetUpUtils.caseDataWithUploadHearingOrder(); caseData.put(HEARING_ORDER_COLLECTION, null); caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(((Collection) caseData.get("uploadHearingOrderRO")), hasSize(2)); - assertThat(caseData.get(HEARING_ORDER_COLLECTION), Matchers.nullValue()); + assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(2); + assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isNull(); } @Test - public void shouldOverwriteTargetCollection() { + void shouldOverwriteTargetCollection() { Map caseData = TestSetUpUtils.caseDataWithUploadHearingOrder(); - assertThat(((Collection) caseData.get(HEARING_ORDER_COLLECTION)), hasSize(1)); - assertThat(((Collection) caseData.get("uploadHearingOrderRO")), hasSize(2)); + assertThat((Collection) caseData.get(HEARING_ORDER_COLLECTION)).hasSize(1); + assertThat(((Collection) caseData.get("uploadHearingOrderRO"))).hasSize(2); caseDataService.overwriteCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(((Collection) caseData.get("uploadHearingOrderRO")), hasSize(1)); + assertThat(((Collection) caseData.get("uploadHearingOrderRO"))).hasSize(1); } @Test - public void nullToEmptyShouldReturnEmptyWhenNull() { - assertThat(caseDataService.nullToEmpty(null), is("")); + void nullToEmptyShouldReturnEmptyWhenNull() { + assertThat(caseDataService.nullToEmpty(null)).isEqualTo(""); } @Test - public void nullToEmptyShouldReturnEmptyWhenEmpty() { - assertThat(caseDataService.nullToEmpty(""), is("")); + void nullToEmptyShouldReturnEmptyWhenEmpty() { + assertThat(caseDataService.nullToEmpty("")).isEqualTo(""); } @Test - public void nullToEmptyShouldReturnStringWhenString() { - assertThat(caseDataService.nullToEmpty("this is my value"), is("this is my value")); + void nullToEmptyShouldReturnStringWhenString() { + assertThat(caseDataService.nullToEmpty("this is my value")).isEqualTo("this is my value"); } private final ObjectMapper mapper = new ObjectMapper(); @@ -193,26 +192,26 @@ public void nullToEmptyShouldReturnStringWhenString() { private static final String L_NAME = "l"; @Test - public void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnTrueWhenLineOneAndPostCodeArePopulated() { + void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnTrueWhenLineOneAndPostCodeArePopulated() { assertThat( - caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(asList("London Road", "sw2 3rf"))), is(true) - ); + caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(asList("London Road", "sw2 3rf"))) + ).isTrue(); } @Test - public void addressLineOneAndPostCodeAreBothEmptyShouldReturnFalse() { + void addressLineOneAndPostCodeAreBothEmptyShouldReturnFalse() { assertThat( - caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null), is(false) - ); + caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null) + ).isFalse(); } @Test - public void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalseWhenNull() { - assertThat(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null), is(false)); + void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalseWhenNull() { + assertThat(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null)).isFalse(); } @Test - public void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalse() { + void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalse() { asList( asList("", "sw2 3rf"), asList("", ""), @@ -221,24 +220,23 @@ public void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalse() { asList(null, null), asList(null, "Sw8 7ty") ).forEach(data -> assertThat( - caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(data)), - is(false)) + caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(data))).isFalse() ); } @Test - public void buildFullNameShouldBuildFullName() { - assertThat(caseDataService.buildFullName(fullName("Pit", "Smith"), F_NAME, L_NAME), is("Pit Smith")); - assertThat(caseDataService.buildFullName(fullName("", "Smith"), F_NAME, L_NAME), is("Smith")); - assertThat(caseDataService.buildFullName(fullName("Pit Adam", "Smith"), F_NAME, L_NAME), is("Pit Adam Smith")); - assertThat(caseDataService.buildFullName(fullName("Pit", "Smith-Johnson"), F_NAME, L_NAME), is("Pit Smith-Johnson")); - assertThat(caseDataService.buildFullName(fullName("Pit JK", "Smith"), F_NAME, L_NAME), is("Pit JK Smith")); - assertThat(caseDataService.buildFullName(fullName("Pit", ""), F_NAME, L_NAME), is("Pit")); - assertThat(caseDataService.buildFullName(fullName("", ""), F_NAME, L_NAME), is("")); - assertThat(caseDataService.buildFullName(fullName(null, ""), F_NAME, L_NAME), is("")); - assertThat(caseDataService.buildFullName(fullName("", null), F_NAME, L_NAME), is("")); - assertThat(caseDataService.buildFullName(fullName(" ", " "), F_NAME, L_NAME), is("")); - assertThat(caseDataService.buildFullName(fullName(" Pit ", " Smith "), F_NAME, L_NAME), is("Pit Smith")); + void buildFullNameShouldBuildFullName() { + assertThat(caseDataService.buildFullName(fullName("Pit", "Smith"), F_NAME, L_NAME)).isEqualTo("Pit Smith"); + assertThat(caseDataService.buildFullName(fullName("", "Smith"), F_NAME, L_NAME)).isEqualTo("Smith"); + assertThat(caseDataService.buildFullName(fullName("Pit Adam", "Smith"), F_NAME, L_NAME)).isEqualTo("Pit Adam Smith"); + assertThat(caseDataService.buildFullName(fullName("Pit", "Smith-Johnson"), F_NAME, L_NAME)).isEqualTo("Pit Smith-Johnson"); + assertThat(caseDataService.buildFullName(fullName("Pit JK", "Smith"), F_NAME, L_NAME)).isEqualTo("Pit JK Smith"); + assertThat(caseDataService.buildFullName(fullName("Pit", ""), F_NAME, L_NAME)).isEqualTo("Pit"); + assertThat(caseDataService.buildFullName(fullName("", ""), F_NAME, L_NAME)).isEmpty(); + assertThat(caseDataService.buildFullName(fullName(null, ""), F_NAME, L_NAME)).isEmpty(); + assertThat(caseDataService.buildFullName(fullName("", null), F_NAME, L_NAME)).isEmpty(); + assertThat(caseDataService.buildFullName(fullName(" ", " "), F_NAME, L_NAME)).isEmpty(); + assertThat(caseDataService.buildFullName(fullName(" Pit ", " Smith "), F_NAME, L_NAME)).isEqualTo("Pit Smith"); } private static Map createAddressObject(List data) { @@ -259,7 +257,7 @@ private static Map fullName(String firstName, String lastName) { } @Test - public void shouldPopulateFinancialRemediesCourtDetails() { + void shouldPopulateFinancialRemediesCourtDetails() { Map data = new HashMap<>(); data.put(REGION, LONDON); data.put(LONDON_FRC_LIST, LONDON_CFC); @@ -268,110 +266,111 @@ public void shouldPopulateFinancialRemediesCourtDetails() { caseDataService.setFinancialRemediesCourtDetails(caseDetails); - assertThat(caseDetails.getData().get(CONSENT_ORDER_FRC_NAME), is("East London Family Court")); - assertThat(caseDetails.getData().get(CONSENT_ORDER_FRC_ADDRESS), - is("East London Family Court, 6th and 7th Floor, 11 Westferry Circus, London, E14 4HD")); - assertThat(caseDetails.getData().get(CONSENT_ORDER_FRC_EMAIL), is("FRCLondon@justice.gov.uk")); - assertThat(caseDetails.getData().get(CONSENT_ORDER_FRC_PHONE), is("0300 123 5577")); + assertThat(caseDetails.getData()).containsEntry(CONSENT_ORDER_FRC_NAME, + "East London Family Court"); + assertThat(caseDetails.getData()).containsEntry(CONSENT_ORDER_FRC_ADDRESS, + "East London Family Court, 6th and 7th Floor, 11 Westferry Circus, London, E14 4HD"); + assertThat(caseDetails.getData()).containsEntry(CONSENT_ORDER_FRC_EMAIL, "FRCLondon@justice.gov.uk"); + assertThat(caseDetails.getData()).containsEntry(CONSENT_ORDER_FRC_PHONE, "0300 123 5577"); } @Test - public void isApplicantRepresentedByASolicitorShouldReturnTrueWhenApplicantRepresentedIsYes() { - assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(YES_VALUE)), is(true)); + void isApplicantRepresentedByASolicitorShouldReturnTrueWhenApplicantRepresentedIsYes() { + assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(YES_VALUE))).isTrue(); } @Test - public void isApplicantRepresentedByASolicitorShouldReturnFalse() { + void isApplicantRepresentedByASolicitorShouldReturnFalse() { asList( NO_VALUE, "", null, "this is some random string, that doesn't make any sense" - ).forEach(value -> assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(value)), is(false))); + ).forEach(value -> assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(value))).isFalse()); } @Test - public void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToReceiveEmailsIsYesForConsented() { + void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToReceiveEmailsIsYesForConsented() { Map data = new HashMap<>(); data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONSENTED, YES_VALUE); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONSENTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails), is(true)); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isTrue(); } @Test - public void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedToReceiveEmailsIsNoForConsented() { + void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedToReceiveEmailsIsNoForConsented() { Map data = new HashMap<>(); data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONSENTED, null); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONSENTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails), is(false)); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isFalse(); } @Test - public void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToReceiveEmailsIsYesForContested() { + void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToReceiveEmailsIsYesForContested() { Map data = new HashMap<>(); data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONTESTED, YES_VALUE); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONTESTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails), is(true)); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isTrue(); } @Test - public void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedToReceiveEmailsIsNoForContested() { + void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedToReceiveEmailsIsNoForContested() { Map data = new HashMap<>(); data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONTESTED, null); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONTESTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails), is(false)); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isFalse(); } @Test - public void isConsentedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(YES_VALUE)), is(true)); + void isConsentedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(YES_VALUE))).isTrue(); } @Test - public void isContestedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(YES_VALUE)), is(true)); + void isContestedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(YES_VALUE))).isTrue(); } @Test - public void isConsentedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(NO_VALUE)), is(false)); + void isConsentedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(NO_VALUE))).isFalse(); } @Test - public void isContestedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(NO_VALUE)), is(false)); + void isContestedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(NO_VALUE))).isFalse(); } @Test - public void isConsentedInContestedCaseShouldReturnTrueWhenIsContestedCaseAndConsentD81QuestionIsPopulated() throws IOException { + void isConsentedInContestedCaseShouldReturnTrueWhenIsContestedCaseAndConsentD81QuestionIsPopulated() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/general-order-consented-in-contested.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedInContestedCase(caseDetails), is(true)); + assertThat(caseDataService.isConsentedInContestedCase(caseDetails)).isTrue(); } @Test - public void isConsentedInContestedCaseShouldReturnFalseWhenIsContestedCaseAndConsentD81QuestionIsNull() throws IOException { + void isConsentedInContestedCaseShouldReturnFalseWhenIsContestedCaseAndConsentD81QuestionIsNull() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/general-order-contested.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedInContestedCase(caseDetails), is(false)); + assertThat(caseDataService.isConsentedInContestedCase(caseDetails)).isFalse(); } @Test - public void isConsentedInContestedCaseShouldReturnFalseWhenIsConsentedCaseAndConsentD81QuestionIsNull() throws IOException { + void isConsentedInContestedCaseShouldReturnFalseWhenIsConsentedCaseAndConsentD81QuestionIsNull() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/general-order-consented.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedInContestedCase(caseDetails), is(false)); + assertThat(caseDataService.isConsentedInContestedCase(caseDetails)).isFalse(); } @Test - public void isNotEmptyShouldReturnTrueWhenPopulated() { + void isNotEmptyShouldReturnTrueWhenPopulated() { asList( YES_VALUE, " ", @@ -379,226 +378,226 @@ public void isNotEmptyShouldReturnTrueWhenPopulated() { "1234", "@#$R@#F@$T" ).forEach(value -> assertThat( - caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(value)), is(true)) + caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(value))).isTrue() ); } @Test - public void isNotEmptyShouldReturnFalseWhenEmptyMap() { - assertThat(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, ImmutableMap.of()), is(false)); + void isNotEmptyShouldReturnFalseWhenEmptyMap() { + assertThat(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, Map.of())).isFalse(); } @Test - public void isNotEmptyShouldReturnFalseWhenFieldIsEmpty() { - assertThat(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented("")), is(false)); + void isNotEmptyShouldReturnFalseWhenFieldIsEmpty() { + assertThat(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(""))).isFalse(); } - @Test(expected = NullPointerException.class) - public void isNotEmptyShouldThrowNullPointerException() { - caseDataService.isNotEmpty(APPLICANT_REPRESENTED, null); + @Test + void isNotEmptyShouldThrowNullPointerException() { + assertThrows(NullPointerException.class, + () -> caseDataService.isNotEmpty(APPLICANT_REPRESENTED, null)); } @Test - public void isAmendedConsentOrderTypeShouldReturnFalseForDefaultEmptyObject() { + void isAmendedConsentOrderTypeShouldReturnFalseForDefaultEmptyObject() { RespondToOrderData data = new RespondToOrderData(); data.setRespondToOrder(new RespondToOrder()); - assertThat(caseDataService.isAmendedConsentOrderType(data), is(false)); + assertThat(caseDataService.isAmendedConsentOrderType(data)).isFalse(); } @Test - public void isAmendedConsentOrderTypeShouldReturnFalseWhenDocumentTypeIsNotAmendedConsentOrder() { - assertThat(caseDataService.isAmendedConsentOrderType(getRespondToOrderData("ble ble ble")), is(false)); + void isAmendedConsentOrderTypeShouldReturnFalseWhenDocumentTypeIsNotAmendedConsentOrder() { + assertThat(caseDataService.isAmendedConsentOrderType(getRespondToOrderData("ble ble ble"))).isFalse(); } - @Test(expected = NullPointerException.class) - public void isAmendedConsentOrderTypeShouldThrowNullPointerException() { - caseDataService.isAmendedConsentOrderType(null); + @Test + void isAmendedConsentOrderTypeShouldThrowNullPointerException() { + assertThrows(NullPointerException.class, + () -> caseDataService.isAmendedConsentOrderType(null)); } @Test - public void isAmendedConsentOrderTypeShouldReturnTrueWhenDocumentTypeIsAmendedConsentOrder() { - assertThat(caseDataService.isAmendedConsentOrderType(getRespondToOrderData(AMEND_CONSENT_ORDER)), is(true)); + void isAmendedConsentOrderTypeShouldReturnTrueWhenDocumentTypeIsAmendedConsentOrder() { + assertThat(caseDataService.isAmendedConsentOrderType(getRespondToOrderData(AMEND_CONSENT_ORDER))).isTrue(); } @Test - public void isApplicantSolicitorResponsibleToDraftOrderTrueWhenTheyHaveBeenNominated() { + void isApplicantSolicitorResponsibleToDraftOrderTrueWhenTheyHaveBeenNominated() { Map data = new HashMap<>(); data.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, APPLICANT_SOLICITOR); - assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data), is(true)); + assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)).isTrue(); } @Test - public void isApplicantSolicitorResponsibleToDraftOrderFalseWhenRespondentSolicitorIsNominated() { + void isApplicantSolicitorResponsibleToDraftOrderFalseWhenRespondentSolicitorIsNominated() { Map data = new HashMap<>(); data.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, RESPONDENT_SOLICITOR); - assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data), is(false)); + assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)).isFalse(); } @Test - public void isApplicantSolicitorResponsibleToDraftOrderFalseWhenNull() { + void isApplicantSolicitorResponsibleToDraftOrderFalseWhenNull() { Map data = new HashMap<>(); data.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, null); - assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data), is(false)); + assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)).isFalse(); } @Test - public void isConsentedApplicationShouldReturnTrueWheCaseTypeIsSetToConsentedCaseType() throws IOException { + void isConsentedApplicationShouldReturnTrueWheCaseTypeIsSetToConsentedCaseType() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/valid-latest-consent-order.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedApplication(caseDetails), is(true)); + assertThat(caseDataService.isConsentedApplication(caseDetails)).isTrue(); } @Test - public void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsSetToContested() throws IOException { + void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsSetToContested() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedApplication(caseDetails), is(false)); + assertThat(caseDataService.isConsentedApplication(caseDetails)).isFalse(); } @Test - public void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsNull() throws IOException { + void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsNull() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/empty-casedata.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedApplication(caseDetails), is(false)); + assertThat(caseDataService.isConsentedApplication(caseDetails)).isFalse(); } @Test - public void isContestedApplicationShouldReturnTrueWheCaseTypeIsSetToContested() throws IOException { + void isContestedApplicationShouldReturnTrueWheCaseTypeIsSetToContested() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedApplication(caseDetails), is(true)); + assertThat(caseDataService.isContestedApplication(caseDetails)).isTrue(); } @Test - public void isContestedApplicationShouldReturnFalseWheCaseTypeIsSetToConsented() throws IOException { + void isContestedApplicationShouldReturnFalseWheCaseTypeIsSetToConsented() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/valid-latest-consent-order.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedApplication(caseDetails), is(false)); + assertThat(caseDataService.isContestedApplication(caseDetails)).isFalse(); } @Test - public void isContestedApplicationShouldReturnFalseWheCaseTypeIsSetToNull() throws IOException { + void isContestedApplicationShouldReturnFalseWheCaseTypeIsSetToNull() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/empty-casedata.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedApplication(caseDetails), is(false)); + assertThat(caseDataService.isContestedApplication(caseDetails)).isFalse(); } @Test - public void isContestedPaperApplicationShouldReturnTrueWhenCaseTypeIsSetToContestedAndIsPaperCase() throws IOException { + void isContestedPaperApplicationShouldReturnTrueWhenCaseTypeIsSetToContestedAndIsPaperCase() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/validate-hearing-with-fastTrackDecision-paperApplication.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails), is(true)); + assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isTrue(); } @Test - public void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsentedAndIsPaperCase() throws IOException { + void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsentedAndIsPaperCase() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/bulkprint/bulk-print-paper-application.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails), is(false)); + assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); } @Test - public void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToContestedAndNotPaperCase() throws IOException { + void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToContestedAndNotPaperCase() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails), is(false)); + assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); } @Test - public void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsented() throws IOException { + void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsented() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/valid-latest-consent-order.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails), is(false)); + assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); } @Test - public void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToNull() throws IOException { + void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToNull() throws IOException { CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/empty-casedata.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails), is(false)); + assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); } @Test - public void isApplicantAddressConfidentialTrueWhenApplicantAddressIsMarkedAsConfidential() { + void isApplicantAddressConfidentialTrueWhenApplicantAddressIsMarkedAsConfidential() { Map data = new HashMap<>(); data.put(APPLICANT_CONFIDENTIAL_ADDRESS, "Yes"); - assertThat(caseDataService.isApplicantAddressConfidential(data), is(true)); + assertThat(caseDataService.isApplicantAddressConfidential(data)).isTrue(); } @Test - public void isApplicantAddressConfidentialFalseWhenApplicantAddressIsNotMarkedAsConfidential() { + void isApplicantAddressConfidentialFalseWhenApplicantAddressIsNotMarkedAsConfidential() { Map data = new HashMap<>(); data.put(APPLICANT_CONFIDENTIAL_ADDRESS, "No"); - assertThat(caseDataService.isApplicantAddressConfidential(data), is(false)); + assertThat(caseDataService.isApplicantAddressConfidential(data)).isFalse(); } @Test - public void isApplicantAddressConfidentialFalseWhenApplicantAddressConfidentialFieldIsNotPresent() { + void isApplicantAddressConfidentialFalseWhenApplicantAddressConfidentialFieldIsNotPresent() { Map data = new HashMap<>(); - assertThat(caseDataService.isApplicantAddressConfidential(data), is(false)); + assertThat(caseDataService.isApplicantAddressConfidential(data)).isFalse(); } @Test - public void isRespondentAddressConfidentialTrueWhenRespondentAddressIsMarkedAsConfidential() { + void isRespondentAddressConfidentialTrueWhenRespondentAddressIsMarkedAsConfidential() { Map data = new HashMap<>(); data.put(RESPONDENT_CONFIDENTIAL_ADDRESS, "Yes"); - assertThat(caseDataService.isRespondentAddressConfidential(data), is(true)); + assertThat(caseDataService.isRespondentAddressConfidential(data)).isTrue(); } @Test - public void isRespondentAddressConfidentialFalseWhenRespondentAddressIsNotMarkedAsConfidential() { + void isRespondentAddressConfidentialFalseWhenRespondentAddressIsNotMarkedAsConfidential() { Map data = new HashMap<>(); data.put(RESPONDENT_CONFIDENTIAL_ADDRESS, "No"); - assertThat(caseDataService.isRespondentAddressConfidential(data), is(false)); + assertThat(caseDataService.isRespondentAddressConfidential(data)).isFalse(); } @Test - public void isRespondentAddressConfidentialFalseWhenRespondentAddressConfidentialFieldIsNotPresent() { + void isRespondentAddressConfidentialFalseWhenRespondentAddressConfidentialFieldIsNotPresent() { Map data = new HashMap<>(); - assertThat(caseDataService.isRespondentAddressConfidential(data), is(false)); + assertThat(caseDataService.isRespondentAddressConfidential(data)).isFalse(); } @Test - public void shouldBuildFullIntervener1Name() { + void shouldBuildFullIntervener1Name() { Map data = new HashMap<>(); data.put(INTERVENER1_FIRST_MIDDLE_NAME, "Sarah John"); data.put(INTERVENER1_LAST_NAME, "Smith"); CaseDetails caseDetails = CaseDetails.builder().data(data).build(); - assertEquals( - "Sarah John Smith", caseDataService.buildFullIntervener1Name(caseDetails) - ); + assertEquals("Sarah John Smith", caseDataService.buildFullIntervener1Name(caseDetails)); } @Test - public void isContestedFinremCaseDetailsApplication() { + void isContestedFinremCaseDetailsApplication() { FinremCaseDetails finremCaseDetails = FinremCaseDetails.builder().caseType(CaseType.CONTESTED).id(123L).build(); - assertTrue(caseDataService.isContestedApplication(finremCaseDetails)); + assertThat(caseDataService.isContestedApplication(finremCaseDetails)).isTrue(); } @Test - public void shouldBuildFullIntervener2Name() { + void shouldBuildFullIntervener2Name() { Map data = new HashMap<>(); data.put(INTERVENER2_FIRST_MIDDLE_NAME, "John Taylor"); data.put(INTERVENER2_LAST_NAME, "Fitzgerald"); @@ -609,7 +608,7 @@ public void shouldBuildFullIntervener2Name() { } @Test - public void shouldBuildFullIntervener3Name() { + void shouldBuildFullIntervener3Name() { Map data = new HashMap<>(); data.put(INTERVENER3_FIRST_MIDDLE_NAME, "Sam Tyler"); data.put(INTERVENER3_LAST_NAME, "Peters"); @@ -620,7 +619,7 @@ public void shouldBuildFullIntervener3Name() { } @Test - public void shouldBuildFullIntervener4Name() { + void shouldBuildFullIntervener4Name() { Map data = new HashMap<>(); data.put(INTERVENER4_FIRST_MIDDLE_NAME, "Yousef Luke"); data.put(INTERVENER4_LAST_NAME, "Brown"); @@ -631,27 +630,28 @@ public void shouldBuildFullIntervener4Name() { } @Test - public void testHasConsentOrderIsTrue() { + void testHasConsentOrderIsTrue() { ConsentOrderWrapper consentOrderWrapper = new ConsentOrderWrapper(); consentOrderWrapper.setConsentD81Question(YesOrNo.YES); FinremCaseData caseData = FinremCaseData.builder() .consentOrderWrapper(consentOrderWrapper) .build(); - assertTrue(caseDataService.hasConsentOrder(caseData)); + assertThat(caseDataService.hasConsentOrder(caseData)).isTrue(); } @Test - public void testHasConsentOrderIsFalse() { - assertFalse(caseDataService.hasConsentOrder(new FinremCaseData())); + void testHasConsentOrderIsFalse() { + assertThat(caseDataService.hasConsentOrder(new FinremCaseData())).isFalse(); } @Test - public void shouldReturnTrueIfConsentInContestedEvent() { - assertTrue(caseDataService.isConsentInContestedGeneralOrderEvent(GENERAL_ORDER_CONSENT_IN_CONTESTED)); + void shouldReturnTrueIfConsentInContestedEvent() { + assertThat(caseDataService.isConsentInContestedGeneralOrderEvent(GENERAL_ORDER_CONSENT_IN_CONTESTED)).isTrue(); } - public void givenRepresentedFlagOnApplicant_whenIsLitigantRepresented_thenTrue() { + @Test + void givenRepresentedFlagOnApplicant_whenIsLitigantRepresented_thenTrue() { Map caseData = new HashMap<>(); caseData.put(APPLICANT_REPRESENTED, "Yes"); CaseDetails finremCaseDetails @@ -659,11 +659,11 @@ public void givenRepresentedFlagOnApplicant_whenIsLitigantRepresented_thenTrue() boolean result = caseDataService.isLitigantRepresented(finremCaseDetails, true); - assertThat(result, is(true)); + assertThat(result).isTrue(); } @Test - public void givenContestedRepresentedFlagOnRespondent_whenIsLitigantRepresented_thenTrue() { + void givenContestedRepresentedFlagOnRespondent_whenIsLitigantRepresented_thenTrue() { Map caseData = new HashMap<>(); caseData.put(APPLICANT_REPRESENTED, "No"); caseData.put(CONTESTED_RESPONDENT_REPRESENTED, "Yes"); @@ -672,11 +672,11 @@ public void givenContestedRepresentedFlagOnRespondent_whenIsLitigantRepresented_ boolean result = caseDataService.isLitigantRepresented(finremCaseDetails, false); - assertThat(result, is(true)); + assertThat(result).isTrue(); } @Test - public void givenConsentedRepresentedFlagOnRespondent_whenIsLitigantRepresented_thenTrue() { + void givenConsentedRepresentedFlagOnRespondent_whenIsLitigantRepresented_thenTrue() { Map caseData = new HashMap<>(); caseData.put(APPLICANT_REPRESENTED, "No"); caseData.put(CONSENTED_RESPONDENT_REPRESENTED, "Yes"); @@ -685,7 +685,7 @@ public void givenConsentedRepresentedFlagOnRespondent_whenIsLitigantRepresented_ boolean result = caseDataService.isLitigantRepresented(finremCaseDetails, false); - assertThat(result, is(true)); + assertThat(result).isTrue(); } private static RespondToOrderData getRespondToOrderData(String s) { From b8795a977b0930bd92a8ccc4a8b0f89b712bcedc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 11 Dec 2024 17:44:32 +0000 Subject: [PATCH 217/336] Added test cases --- .../service/CaseDataServiceTest.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java index b2dc7f64da..4e52a5c1b4 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java @@ -25,6 +25,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RespondToOrderData; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ConsentOrderWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper; import java.io.IOException; import java.util.Collection; @@ -35,7 +36,9 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.NO_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.YES_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.GENERAL_ORDER_CONSENT_IN_CONTESTED; @@ -717,4 +720,44 @@ private static Map createCaseDataRespRepresentedContested(String return data; } + + @Test + void testIsApplicantRepresentedByASolicitor_True() { + // Arrange + FinremCaseData caseData = FinremCaseData.builder().contactDetailsWrapper(ContactDetailsWrapper.builder() + .applicantRepresented(YesOrNo.YES) + .build()).build(); + + // Act + boolean result = caseDataService.isApplicantRepresentedByASolicitor(caseData); + + // Assert + assertTrue(result, "Applicant should be represented by a solicitor"); + } + + @Test + void testIsApplicantRepresentedByASolicitor_False() { + // Arrange + FinremCaseData caseData = FinremCaseData.builder().contactDetailsWrapper(ContactDetailsWrapper.builder() + .applicantRepresented(YesOrNo.NO) + .build()).build(); + + // Act + boolean result = caseDataService.isApplicantRepresentedByASolicitor(caseData); + + // Assert + assertFalse(result, "Applicant should not be represented by a solicitor"); + } + + @Test + void testIsApplicantRepresentedByASolicitor_NullCaseData() { + // Arrange + FinremCaseData caseData = null; + + // Act & Assert + assertThrows(NullPointerException.class, + () -> caseDataService.isApplicantRepresentedByASolicitor(caseData), + "Method should throw NullPointerException when caseData is null"); + } + } From 54bbc226f0cd31f670238ad2da1dbeadd64902ed Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:00:40 +0000 Subject: [PATCH 218/336] Add test cases --- .../mapper/FinremCaseDetailsMapper.java | 8 +- .../service/CaseDataServiceTest.java | 77 +++++++++---------- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java index c042f85fab..552629b8ea 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java @@ -36,9 +36,15 @@ public FinremCaseDetails mapToFinremCaseDetails(CaseDetails caseDetails) { .build(); } + public FinremCaseData mapToFinremCaseData(Map caseData) { + return mapToFinremCaseData(caseData, null); + } + public FinremCaseData mapToFinremCaseData(Map caseData, String caseTypeId) { FinremCaseData data = objectMapper.convertValue(caseData, FinremCaseData.class); - data.setCcdCaseType(CaseType.forValue(caseTypeId)); + if (caseTypeId != null) { + data.setCcdCaseType(CaseType.forValue(caseTypeId)); + } return data; } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java index 4e52a5c1b4..2504771c2f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java @@ -25,7 +25,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RespondToOrderData; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ConsentOrderWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper; import java.io.IOException; import java.util.Collection; @@ -36,9 +35,7 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.NO_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.YES_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.GENERAL_ORDER_CONSENT_IN_CONTESTED; @@ -280,6 +277,7 @@ void shouldPopulateFinancialRemediesCourtDetails() { @Test void isApplicantRepresentedByASolicitorShouldReturnTrueWhenApplicantRepresentedIsYes() { assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(YES_VALUE))).isTrue(); + assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(finremCaseDetailsMapper, YES_VALUE))).isTrue(); } @Test @@ -289,7 +287,19 @@ void isApplicantRepresentedByASolicitorShouldReturnFalse() { "", null, "this is some random string, that doesn't make any sense" - ).forEach(value -> assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(value))).isFalse()); + ).forEach(value -> { + assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(value))).isFalse(); + }); + } + + @Test + void isApplicantRepresentedByASolicitorShouldReturnFalseAfterRefactoring() { + asList( + NO_VALUE, + null + ).forEach(value -> { + assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(finremCaseDetailsMapper, value))).isFalse(); + }); } @Test @@ -299,6 +309,7 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToR CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONSENTED.getCcdType()).data(data).build(); assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isTrue(); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))).isTrue(); } @Test @@ -307,7 +318,7 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedTo data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONSENTED, null); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONSENTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isFalse(); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))).isFalse(); } @Test @@ -317,6 +328,7 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToR CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONTESTED.getCcdType()).data(data).build(); assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isTrue(); + assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))).isTrue(); } @Test @@ -331,21 +343,29 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedTo @Test void isConsentedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(YES_VALUE))).isTrue(); + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(finremCaseDetailsMapper, + YES_VALUE))).isTrue(); } @Test void isContestedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(YES_VALUE))).isTrue(); + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(finremCaseDetailsMapper, + YES_VALUE))).isTrue(); } @Test void isConsentedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(NO_VALUE))).isFalse(); + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(finremCaseDetailsMapper, + NO_VALUE))).isFalse(); } @Test void isContestedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(NO_VALUE))).isFalse(); + assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(finremCaseDetailsMapper, + NO_VALUE))).isFalse(); } @Test @@ -707,6 +727,10 @@ private static Map createCaseDataApplRepresented(String value) { return data; } + private static FinremCaseData createCaseDataApplRepresented(FinremCaseDetailsMapper objectMapper, String value) { + return objectMapper.mapToFinremCaseData(createCaseDataApplRepresented(value)); + } + private static Map createCaseDataRespRepresentedConsented(String value) { Map data = new HashMap<>(); data.put(CONSENTED_RESPONDENT_REPRESENTED, value); @@ -714,6 +738,10 @@ private static Map createCaseDataRespRepresentedConsented(String return data; } + private static FinremCaseData createCaseDataRespRepresentedConsented(FinremCaseDetailsMapper objectMapper, String value) { + return objectMapper.mapToFinremCaseData(createCaseDataRespRepresentedConsented(value)); + } + private static Map createCaseDataRespRepresentedContested(String value) { Map data = new HashMap<>(); data.put(CONTESTED_RESPONDENT_REPRESENTED, value); @@ -721,43 +749,8 @@ private static Map createCaseDataRespRepresentedContested(String return data; } - @Test - void testIsApplicantRepresentedByASolicitor_True() { - // Arrange - FinremCaseData caseData = FinremCaseData.builder().contactDetailsWrapper(ContactDetailsWrapper.builder() - .applicantRepresented(YesOrNo.YES) - .build()).build(); - - // Act - boolean result = caseDataService.isApplicantRepresentedByASolicitor(caseData); - - // Assert - assertTrue(result, "Applicant should be represented by a solicitor"); - } - - @Test - void testIsApplicantRepresentedByASolicitor_False() { - // Arrange - FinremCaseData caseData = FinremCaseData.builder().contactDetailsWrapper(ContactDetailsWrapper.builder() - .applicantRepresented(YesOrNo.NO) - .build()).build(); - - // Act - boolean result = caseDataService.isApplicantRepresentedByASolicitor(caseData); - - // Assert - assertFalse(result, "Applicant should not be represented by a solicitor"); - } - - @Test - void testIsApplicantRepresentedByASolicitor_NullCaseData() { - // Arrange - FinremCaseData caseData = null; - - // Act & Assert - assertThrows(NullPointerException.class, - () -> caseDataService.isApplicantRepresentedByASolicitor(caseData), - "Method should throw NullPointerException when caseData is null"); + private static FinremCaseData createCaseDataRespRepresentedContested(FinremCaseDetailsMapper objectMapper, String value) { + return objectMapper.mapToFinremCaseData(createCaseDataRespRepresentedContested(value)); } } From c7ef996211308b65a04e7d729ddf79fed8bfab1e Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:19:31 +0000 Subject: [PATCH 219/336] tidy up --- .../service/CaseDataServiceTest.java | 191 +++++++++--------- 1 file changed, 90 insertions(+), 101 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java index 2504771c2f..cd1ae5c24f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java @@ -35,7 +35,10 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.NO_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.OrchestrationConstants.YES_VALUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.GENERAL_ORDER_CONSENT_IN_CONTESTED; @@ -95,20 +98,20 @@ void setup() { void isRespondentSolicitorResponsibleToDraftOrder_shouldReturnTrue() { Map caseData = new HashMap<>(); caseData.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, RESPONDENT_SOLICITOR); - assertThat(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)).isTrue(); + assertTrue(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)); } @Test void isRespondentSolicitorResponsibleToDraftOrder_appSolicitor() { Map caseData = new HashMap<>(); caseData.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, APPLICANT_SOLICITOR); - assertThat(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)).isFalse(); + assertFalse(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)); } @Test void isRespondentSolicitorResponsibleToDraftOrder_fieldNotExist() { Map caseData = new HashMap<>(); - assertThat(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)).isFalse(); + assertFalse(caseDataService.isRespondentSolicitorResponsibleToDraftOrder(caseData)); } @Test @@ -118,7 +121,7 @@ void shouldSuccessfullyMoveValues() { caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(3); - assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isNull(); + assertNull(caseData.get(HEARING_ORDER_COLLECTION)); } @Test @@ -128,7 +131,7 @@ void shouldSuccessfullyMoveValuesToNewCollections() { caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(1); - assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isNull(); + assertNull(caseData.get(HEARING_ORDER_COLLECTION)); } @Test @@ -147,7 +150,7 @@ void shouldDoNothingWithNonArrayDestinationValueMove() { caseData.put("uploadHearingOrderRO", "nonarrayValue"); caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); - assertThat(caseData.get("uploadHearingOrderRO")).isEqualTo("nonarrayValue"); + assertEquals("nonarrayValue", caseData.get("uploadHearingOrderRO")); assertThat((Collection) caseData.get(HEARING_ORDER_COLLECTION)).hasSize(1); } @@ -158,7 +161,7 @@ void shouldDoNothingWhenSourceIsEmptyMove() { caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(2); - assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isNull(); + assertNull(caseData.get(HEARING_ORDER_COLLECTION)); } @Test @@ -174,17 +177,17 @@ void shouldOverwriteTargetCollection() { @Test void nullToEmptyShouldReturnEmptyWhenNull() { - assertThat(caseDataService.nullToEmpty(null)).isEqualTo(""); + assertEquals("", caseDataService.nullToEmpty(null)); } @Test void nullToEmptyShouldReturnEmptyWhenEmpty() { - assertThat(caseDataService.nullToEmpty("")).isEqualTo(""); + assertEquals("", caseDataService.nullToEmpty("")); } @Test void nullToEmptyShouldReturnStringWhenString() { - assertThat(caseDataService.nullToEmpty("this is my value")).isEqualTo("this is my value"); + assertEquals("this is my value", caseDataService.nullToEmpty("this is my value")); } private final ObjectMapper mapper = new ObjectMapper(); @@ -193,21 +196,17 @@ void nullToEmptyShouldReturnStringWhenString() { @Test void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnTrueWhenLineOneAndPostCodeArePopulated() { - assertThat( - caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(asList("London Road", "sw2 3rf"))) - ).isTrue(); + assertTrue(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(asList("London Road", "sw2 3rf")))); } @Test void addressLineOneAndPostCodeAreBothEmptyShouldReturnFalse() { - assertThat( - caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null) - ).isFalse(); + assertFalse(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null)); } @Test void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalseWhenNull() { - assertThat(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null)).isFalse(); + assertFalse(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(null)); } @Test @@ -219,24 +218,22 @@ void addressLineOneAndPostCodeAreBothNotEmptyShouldReturnFalse() { asList("London Road", null), asList(null, null), asList(null, "Sw8 7ty") - ).forEach(data -> assertThat( - caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(data))).isFalse() - ); + ).forEach(data -> assertFalse(caseDataService.addressLineOneAndPostCodeAreBothNotEmpty(createAddressObject(data)))); } @Test void buildFullNameShouldBuildFullName() { - assertThat(caseDataService.buildFullName(fullName("Pit", "Smith"), F_NAME, L_NAME)).isEqualTo("Pit Smith"); - assertThat(caseDataService.buildFullName(fullName("", "Smith"), F_NAME, L_NAME)).isEqualTo("Smith"); - assertThat(caseDataService.buildFullName(fullName("Pit Adam", "Smith"), F_NAME, L_NAME)).isEqualTo("Pit Adam Smith"); - assertThat(caseDataService.buildFullName(fullName("Pit", "Smith-Johnson"), F_NAME, L_NAME)).isEqualTo("Pit Smith-Johnson"); - assertThat(caseDataService.buildFullName(fullName("Pit JK", "Smith"), F_NAME, L_NAME)).isEqualTo("Pit JK Smith"); - assertThat(caseDataService.buildFullName(fullName("Pit", ""), F_NAME, L_NAME)).isEqualTo("Pit"); - assertThat(caseDataService.buildFullName(fullName("", ""), F_NAME, L_NAME)).isEmpty(); - assertThat(caseDataService.buildFullName(fullName(null, ""), F_NAME, L_NAME)).isEmpty(); - assertThat(caseDataService.buildFullName(fullName("", null), F_NAME, L_NAME)).isEmpty(); - assertThat(caseDataService.buildFullName(fullName(" ", " "), F_NAME, L_NAME)).isEmpty(); - assertThat(caseDataService.buildFullName(fullName(" Pit ", " Smith "), F_NAME, L_NAME)).isEqualTo("Pit Smith"); + assertEquals("Pit Smith", caseDataService.buildFullName(fullName("Pit", "Smith"), F_NAME, L_NAME)); + assertEquals("Smith", caseDataService.buildFullName(fullName("", "Smith"), F_NAME, L_NAME)); + assertEquals("Pit Adam Smith", caseDataService.buildFullName(fullName("Pit Adam", "Smith"), F_NAME, L_NAME)); + assertEquals("Pit Smith-Johnson", caseDataService.buildFullName(fullName("Pit", "Smith-Johnson"), F_NAME, L_NAME)); + assertEquals("Pit JK Smith", caseDataService.buildFullName(fullName("Pit JK", "Smith"), F_NAME, L_NAME)); + assertEquals("Pit", caseDataService.buildFullName(fullName("Pit", ""), F_NAME, L_NAME)); + assertEquals("", caseDataService.buildFullName(fullName("", ""), F_NAME, L_NAME)); + assertEquals("", caseDataService.buildFullName(fullName(null, ""), F_NAME, L_NAME)); + assertEquals("", caseDataService.buildFullName(fullName("", null), F_NAME, L_NAME)); + assertEquals("", caseDataService.buildFullName(fullName(" ", " "), F_NAME, L_NAME)); + assertEquals("Pit Smith", caseDataService.buildFullName(fullName(" Pit ", " Smith "), F_NAME, L_NAME)); } private static Map createAddressObject(List data) { @@ -276,8 +273,8 @@ void shouldPopulateFinancialRemediesCourtDetails() { @Test void isApplicantRepresentedByASolicitorShouldReturnTrueWhenApplicantRepresentedIsYes() { - assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(YES_VALUE))).isTrue(); - assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(finremCaseDetailsMapper, YES_VALUE))).isTrue(); + assertTrue(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(YES_VALUE))); + assertTrue(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(finremCaseDetailsMapper, YES_VALUE))); } @Test @@ -287,9 +284,9 @@ void isApplicantRepresentedByASolicitorShouldReturnFalse() { "", null, "this is some random string, that doesn't make any sense" - ).forEach(value -> { - assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(value))).isFalse(); - }); + ).forEach(value -> + assertFalse(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(value))) + ); } @Test @@ -297,9 +294,9 @@ void isApplicantRepresentedByASolicitorShouldReturnFalseAfterRefactoring() { asList( NO_VALUE, null - ).forEach(value -> { - assertThat(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(finremCaseDetailsMapper, value))).isFalse(); - }); + ).forEach(value -> + assertFalse(caseDataService.isApplicantRepresentedByASolicitor(createCaseDataApplRepresented(finremCaseDetailsMapper, value))) + ); } @Test @@ -308,8 +305,8 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToR data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONSENTED, YES_VALUE); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONSENTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isTrue(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))).isTrue(); + assertTrue(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)); + assertTrue(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))); } @Test @@ -318,7 +315,7 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedTo data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONSENTED, null); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONSENTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))).isFalse(); + assertFalse(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))); } @Test @@ -327,8 +324,8 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnTrueWhenAppSolAgreedToR data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONTESTED, YES_VALUE); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONTESTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isTrue(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))).isTrue(); + assertTrue(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)); + assertTrue(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))); } @Test @@ -337,35 +334,35 @@ void isApplicantSolicitorAgreeToReceiveEmailsShouldReturnFalseWhenAppSolAgreedTo data.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONTESTED, null); CaseDetails caseDetails = CaseDetails.builder().caseTypeId(CaseType.CONTESTED.getCcdType()).data(data).build(); - assertThat(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).isFalse(); + assertFalse(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)); } @Test void isConsentedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(YES_VALUE))).isTrue(); - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(finremCaseDetailsMapper, - YES_VALUE))).isTrue(); + assertTrue(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(YES_VALUE))); + assertTrue(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(finremCaseDetailsMapper, + YES_VALUE))); } @Test void isContestedRespondentRepresentedByASolicitorShouldReturnTrueWhenRepresentedSolicitorIsYes() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(YES_VALUE))).isTrue(); - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(finremCaseDetailsMapper, - YES_VALUE))).isTrue(); + assertTrue(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(YES_VALUE))); + assertTrue(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(finremCaseDetailsMapper, + YES_VALUE))); } @Test void isConsentedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(NO_VALUE))).isFalse(); - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(finremCaseDetailsMapper, - NO_VALUE))).isFalse(); + assertFalse(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(NO_VALUE))); + assertFalse(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedConsented(finremCaseDetailsMapper, + NO_VALUE))); } @Test void isContestedRespondentRepresentedByASolicitorShouldReturnFalseWhenRepresentedSolicitorIsNo() { - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(NO_VALUE))).isFalse(); - assertThat(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(finremCaseDetailsMapper, - NO_VALUE))).isFalse(); + assertFalse(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(NO_VALUE))); + assertFalse(caseDataService.isRespondentRepresentedByASolicitor(createCaseDataRespRepresentedContested(finremCaseDetailsMapper, + NO_VALUE))); } @Test @@ -373,7 +370,7 @@ void isConsentedInContestedCaseShouldReturnTrueWhenIsContestedCaseAndConsentD81Q CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/general-order-consented-in-contested.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedInContestedCase(caseDetails)).isTrue(); + assertTrue(caseDataService.isConsentedInContestedCase(caseDetails)); } @Test @@ -381,7 +378,7 @@ void isConsentedInContestedCaseShouldReturnFalseWhenIsContestedCaseAndConsentD81 CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/general-order-contested.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedInContestedCase(caseDetails)).isFalse(); + assertFalse(caseDataService.isConsentedInContestedCase(caseDetails)); } @Test @@ -389,7 +386,7 @@ void isConsentedInContestedCaseShouldReturnFalseWhenIsConsentedCaseAndConsentD81 CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/general-order-consented.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedInContestedCase(caseDetails)).isFalse(); + assertFalse(caseDataService.isConsentedInContestedCase(caseDetails)); } @Test @@ -400,19 +397,17 @@ void isNotEmptyShouldReturnTrueWhenPopulated() { "any value makes it not empty", "1234", "@#$R@#F@$T" - ).forEach(value -> assertThat( - caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(value))).isTrue() - ); + ).forEach(value -> assertTrue(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(value)))); } @Test void isNotEmptyShouldReturnFalseWhenEmptyMap() { - assertThat(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, Map.of())).isFalse(); + assertFalse(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, Map.of())); } @Test void isNotEmptyShouldReturnFalseWhenFieldIsEmpty() { - assertThat(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(""))).isFalse(); + assertFalse(caseDataService.isNotEmpty(APPLICANT_REPRESENTED, createCaseDataApplRepresented(""))); } @Test @@ -426,12 +421,12 @@ void isAmendedConsentOrderTypeShouldReturnFalseForDefaultEmptyObject() { RespondToOrderData data = new RespondToOrderData(); data.setRespondToOrder(new RespondToOrder()); - assertThat(caseDataService.isAmendedConsentOrderType(data)).isFalse(); + assertFalse(caseDataService.isAmendedConsentOrderType(data)); } @Test void isAmendedConsentOrderTypeShouldReturnFalseWhenDocumentTypeIsNotAmendedConsentOrder() { - assertThat(caseDataService.isAmendedConsentOrderType(getRespondToOrderData("ble ble ble"))).isFalse(); + assertFalse(caseDataService.isAmendedConsentOrderType(getRespondToOrderData("ble ble ble"))); } @Test @@ -442,7 +437,7 @@ void isAmendedConsentOrderTypeShouldThrowNullPointerException() { @Test void isAmendedConsentOrderTypeShouldReturnTrueWhenDocumentTypeIsAmendedConsentOrder() { - assertThat(caseDataService.isAmendedConsentOrderType(getRespondToOrderData(AMEND_CONSENT_ORDER))).isTrue(); + assertTrue(caseDataService.isAmendedConsentOrderType(getRespondToOrderData(AMEND_CONSENT_ORDER))); } @Test @@ -450,7 +445,7 @@ void isApplicantSolicitorResponsibleToDraftOrderTrueWhenTheyHaveBeenNominated() Map data = new HashMap<>(); data.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, APPLICANT_SOLICITOR); - assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)).isTrue(); + assertTrue(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)); } @Test @@ -458,7 +453,7 @@ void isApplicantSolicitorResponsibleToDraftOrderFalseWhenRespondentSolicitorIsNo Map data = new HashMap<>(); data.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, RESPONDENT_SOLICITOR); - assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)).isFalse(); + assertFalse(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)); } @Test @@ -466,7 +461,7 @@ void isApplicantSolicitorResponsibleToDraftOrderFalseWhenNull() { Map data = new HashMap<>(); data.put(SOLICITOR_RESPONSIBLE_FOR_DRAFTING_ORDER, null); - assertThat(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)).isFalse(); + assertFalse(caseDataService.isApplicantSolicitorResponsibleToDraftOrder(data)); } @Test @@ -474,7 +469,7 @@ void isConsentedApplicationShouldReturnTrueWheCaseTypeIsSetToConsentedCaseType() CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/valid-latest-consent-order.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedApplication(caseDetails)).isTrue(); + assertTrue(caseDataService.isConsentedApplication(caseDetails)); } @Test @@ -482,7 +477,7 @@ void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsSetToContested() throw CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isConsentedApplication(caseDetails))); } @Test @@ -490,7 +485,7 @@ void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsNull() throws IOExcept CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/empty-casedata.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isConsentedApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isConsentedApplication(caseDetails)); } @Test @@ -498,7 +493,7 @@ void isContestedApplicationShouldReturnTrueWheCaseTypeIsSetToContested() throws CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedApplication(caseDetails)).isTrue(); + assertTrue(caseDataService.isContestedApplication(caseDetails)); } @Test @@ -506,7 +501,7 @@ void isContestedApplicationShouldReturnFalseWheCaseTypeIsSetToConsented() throws CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/valid-latest-consent-order.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isContestedApplication(caseDetails)); } @Test @@ -514,7 +509,7 @@ void isContestedApplicationShouldReturnFalseWheCaseTypeIsSetToNull() throws IOEx CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/empty-casedata.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isContestedApplication(caseDetails)); } @Test @@ -522,7 +517,7 @@ void isContestedPaperApplicationShouldReturnTrueWhenCaseTypeIsSetToContestedAndI CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/validate-hearing-with-fastTrackDecision-paperApplication.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isTrue(); + assertTrue(caseDataService.isContestedPaperApplication(caseDetails)); } @Test @@ -530,7 +525,7 @@ void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsentedAnd CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/bulkprint/bulk-print-paper-application.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isContestedPaperApplication(caseDetails))); } @Test @@ -538,7 +533,7 @@ void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToContestedAnd CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isContestedPaperApplication(caseDetails)); } @Test @@ -546,7 +541,7 @@ void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsented() CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/valid-latest-consent-order.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isContestedPaperApplication(caseDetails)); } @Test @@ -554,7 +549,7 @@ void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToNull() throw CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/empty-casedata.json"), CallbackRequest.class).getCaseDetails(); - assertThat(caseDataService.isContestedPaperApplication(caseDetails)).isFalse(); + assertFalse(caseDataService.isContestedPaperApplication(caseDetails)); } @Test @@ -562,7 +557,7 @@ void isApplicantAddressConfidentialTrueWhenApplicantAddressIsMarkedAsConfidentia Map data = new HashMap<>(); data.put(APPLICANT_CONFIDENTIAL_ADDRESS, "Yes"); - assertThat(caseDataService.isApplicantAddressConfidential(data)).isTrue(); + assertTrue(caseDataService.isApplicantAddressConfidential(data)); } @Test @@ -570,14 +565,14 @@ void isApplicantAddressConfidentialFalseWhenApplicantAddressIsNotMarkedAsConfide Map data = new HashMap<>(); data.put(APPLICANT_CONFIDENTIAL_ADDRESS, "No"); - assertThat(caseDataService.isApplicantAddressConfidential(data)).isFalse(); + assertFalse(caseDataService.isApplicantAddressConfidential(data))); } @Test void isApplicantAddressConfidentialFalseWhenApplicantAddressConfidentialFieldIsNotPresent() { Map data = new HashMap<>(); - assertThat(caseDataService.isApplicantAddressConfidential(data)).isFalse(); + assertFalse(caseDataService.isApplicantAddressConfidential(data)); } @Test @@ -585,7 +580,7 @@ void isRespondentAddressConfidentialTrueWhenRespondentAddressIsMarkedAsConfident Map data = new HashMap<>(); data.put(RESPONDENT_CONFIDENTIAL_ADDRESS, "Yes"); - assertThat(caseDataService.isRespondentAddressConfidential(data)).isTrue(); + assertTrue(caseDataService.isRespondentAddressConfidential(data)); } @Test @@ -593,14 +588,14 @@ void isRespondentAddressConfidentialFalseWhenRespondentAddressIsNotMarkedAsConfi Map data = new HashMap<>(); data.put(RESPONDENT_CONFIDENTIAL_ADDRESS, "No"); - assertThat(caseDataService.isRespondentAddressConfidential(data)).isFalse(); + assertFalse(caseDataService.isRespondentAddressConfidential(data)); } @Test void isRespondentAddressConfidentialFalseWhenRespondentAddressConfidentialFieldIsNotPresent() { Map data = new HashMap<>(); - assertThat(caseDataService.isRespondentAddressConfidential(data)).isFalse(); + assertFalse(caseDataService.isRespondentAddressConfidential(data)); } @Test @@ -616,7 +611,7 @@ void shouldBuildFullIntervener1Name() { void isContestedFinremCaseDetailsApplication() { FinremCaseDetails finremCaseDetails = FinremCaseDetails.builder().caseType(CaseType.CONTESTED).id(123L).build(); - assertThat(caseDataService.isContestedApplication(finremCaseDetails)).isTrue(); + assertTrue(caseDataService.isContestedApplication(finremCaseDetails)); } @Test @@ -660,17 +655,17 @@ void testHasConsentOrderIsTrue() { .consentOrderWrapper(consentOrderWrapper) .build(); - assertThat(caseDataService.hasConsentOrder(caseData)).isTrue(); + assertTrue(caseDataService.hasConsentOrder(caseData)); } @Test void testHasConsentOrderIsFalse() { - assertThat(caseDataService.hasConsentOrder(new FinremCaseData())).isFalse(); + assertFalse(caseDataService.hasConsentOrder(new FinremCaseData())); } @Test void shouldReturnTrueIfConsentInContestedEvent() { - assertThat(caseDataService.isConsentInContestedGeneralOrderEvent(GENERAL_ORDER_CONSENT_IN_CONTESTED)).isTrue(); + assertTrue(caseDataService.isConsentInContestedGeneralOrderEvent(GENERAL_ORDER_CONSENT_IN_CONTESTED)); } @Test @@ -680,9 +675,7 @@ void givenRepresentedFlagOnApplicant_whenIsLitigantRepresented_thenTrue() { CaseDetails finremCaseDetails = CaseDetails.builder().data(caseData).caseTypeId(CaseType.CONTESTED.getCcdType()).id(123L).build(); - boolean result = caseDataService.isLitigantRepresented(finremCaseDetails, true); - - assertThat(result).isTrue(); + assertTrue(caseDataService.isLitigantRepresented(finremCaseDetails, true)); } @Test @@ -693,9 +686,7 @@ void givenContestedRepresentedFlagOnRespondent_whenIsLitigantRepresented_thenTru CaseDetails finremCaseDetails = CaseDetails.builder().data(caseData).caseTypeId(CaseType.CONTESTED.getCcdType()).id(123L).build(); - boolean result = caseDataService.isLitigantRepresented(finremCaseDetails, false); - - assertThat(result).isTrue(); + assertTrue(caseDataService.isLitigantRepresented(finremCaseDetails, false)); } @Test @@ -706,9 +697,7 @@ void givenConsentedRepresentedFlagOnRespondent_whenIsLitigantRepresented_thenTru CaseDetails finremCaseDetails = CaseDetails.builder().data(caseData).caseTypeId(CaseType.CONSENTED.getCcdType()).id(123L).build(); - boolean result = caseDataService.isLitigantRepresented(finremCaseDetails, false); - - assertThat(result).isTrue(); + assertTrue(caseDataService.isLitigantRepresented(finremCaseDetails, false)); } private static RespondToOrderData getRespondToOrderData(String s) { From 8dfe54e4236cf37e83514c2fe39d364ab4526afd Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:20:18 +0000 Subject: [PATCH 220/336] fix --- .../caseorchestration/service/CaseDataServiceTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java index cd1ae5c24f..d289f63c3f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java @@ -477,7 +477,7 @@ void isConsentedApplicationShouldReturnFalseWhenCaseTypeIsSetToContested() throw CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/contested/contested-hwf-without-solicitor-consent.json"), CallbackRequest.class).getCaseDetails(); - assertFalse(caseDataService.isConsentedApplication(caseDetails))); + assertFalse(caseDataService.isConsentedApplication(caseDetails)); } @Test @@ -525,7 +525,7 @@ void isContestedPaperApplicationShouldReturnFalseWhenCaseTypeIsSetToConsentedAnd CaseDetails caseDetails = mapper.readValue(getClass().getResourceAsStream( "/fixtures/bulkprint/bulk-print-paper-application.json"), CallbackRequest.class).getCaseDetails(); - assertFalse(caseDataService.isContestedPaperApplication(caseDetails))); + assertFalse(caseDataService.isContestedPaperApplication(caseDetails)); } @Test @@ -565,7 +565,7 @@ void isApplicantAddressConfidentialFalseWhenApplicantAddressIsNotMarkedAsConfide Map data = new HashMap<>(); data.put(APPLICANT_CONFIDENTIAL_ADDRESS, "No"); - assertFalse(caseDataService.isApplicantAddressConfidential(data))); + assertFalse(caseDataService.isApplicantAddressConfidential(data)); } @Test From d3a9ffe2a3251c2fd26f9e656314da1a2b75f612 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:23:45 +0000 Subject: [PATCH 221/336] Change to assertEquals --- .../finrem/caseorchestration/service/CaseDataServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java index d289f63c3f..f89694dca6 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/CaseDataServiceTest.java @@ -141,7 +141,7 @@ void shouldDoNothingWithNonArraySourceValueMove() { caseDataService.moveCollection(caseData, HEARING_ORDER_COLLECTION, "uploadHearingOrderRO"); assertThat((Collection) caseData.get("uploadHearingOrderRO")).hasSize(2); - assertThat(caseData.get(HEARING_ORDER_COLLECTION)).isEqualTo("nonarrayValue"); + assertEquals("nonarrayValue", caseData.get(HEARING_ORDER_COLLECTION)); } @Test From ea18ea97dd2c68a6dc8190c9552998bcde4f0d32 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:37:01 +0000 Subject: [PATCH 222/336] Update test cases --- .../service/PaperNotificationServiceTest.java | 66 +++++++++++++------ ...BaseUpdateFrcInfoDocumentServiceSetup.java | 4 +- ...teFrcInfoApplicantDocumentServiceTest.java | 17 ++--- .../UpdateFrcInfoRespondentServiceTest.java | 25 +++---- 4 files changed, 71 insertions(+), 41 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java index 2d1b9950b3..017a156b13 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java @@ -1,16 +1,23 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; -import uk.gov.hmcts.reform.finrem.caseorchestration.BaseServiceTest; import uk.gov.hmcts.reform.finrem.caseorchestration.TestSetUpUtils; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.IntervenerOne; import uk.gov.hmcts.reform.finrem.caseorchestration.service.generalapplication.service.RejectGeneralApplicationDocumentService; +import java.util.HashMap; +import java.util.List; import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,25 +33,32 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper.PaperNotificationRecipient.INTERVENER_ONE; import static uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper.PaperNotificationRecipient.RESPONDENT; -public class PaperNotificationServiceTest extends BaseServiceTest { +@ExtendWith(MockitoExtension.class) +class PaperNotificationServiceTest { - @Autowired + @InjectMocks private PaperNotificationService paperNotificationService; - @MockBean + @Mock private AssignedToJudgeDocumentService assignedToJudgeDocumentService; - @MockBean + @Mock private BulkPrintService bulkPrintService; - @MockBean + @Mock private CaseDataService caseDataService; - @MockBean + @Mock private RejectGeneralApplicationDocumentService rejectGeneralApplicationDocumentService; + private ObjectMapper mapper; + + @BeforeEach + void setup() { + mapper = new ObjectMapper(); + } + @Test - public void sendAssignToJudgeNotificationLetterIfIsPaperApplication() { - when(caseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(true); + void sendAssignToJudgeNotificationLetterIfIsPaperApplication() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); paperNotificationService.printAssignToJudgeNotification(buildCaseDetails(), AUTH_TOKEN); @@ -54,7 +68,7 @@ public void sendAssignToJudgeNotificationLetterIfIsPaperApplication() { } @Test - public void shouldPrintForApplicantIfNotRepresented() { + void shouldPrintForApplicantIfNotRepresented() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); @@ -66,7 +80,7 @@ public void shouldPrintForApplicantIfNotRepresented() { } @Test - public void shouldPrintForApplicantIfRepresentedButNotAgreedToEmail() { + void shouldPrintForApplicantIfRepresentedButNotAgreedToEmail() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); @@ -78,7 +92,7 @@ public void shouldPrintForApplicantIfRepresentedButNotAgreedToEmail() { } @Test - public void shouldPrintForApplicantIfPaperCase() { + void shouldPrintForApplicantIfPaperCase() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); @@ -88,7 +102,7 @@ public void shouldPrintForApplicantIfPaperCase() { } @Test - public void givenValidCaseData_whenPrintApplicantRejection_thenCallBulkPrintService() { + void givenValidCaseData_whenPrintApplicantRejection_thenCallBulkPrintService() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); @@ -102,7 +116,7 @@ public void givenValidCaseData_whenPrintApplicantRejection_thenCallBulkPrintServ } @Test - public void givenValidCaseData_whenPrintRespondentRejection_thenCallBulkPrintService() { + void givenValidCaseData_whenPrintRespondentRejection_thenCallBulkPrintService() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); @@ -116,7 +130,7 @@ public void givenValidCaseData_whenPrintRespondentRejection_thenCallBulkPrintSer } @Test - public void givenValidCaseData_whenPrintIntervenerRejection_thenCallBulkPrintService() { + void givenValidCaseData_whenPrintIntervenerRejection_thenCallBulkPrintService() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); @@ -129,4 +143,18 @@ public void givenValidCaseData_whenPrintIntervenerRejection_thenCallBulkPrintSer verify(bulkPrintService).sendDocumentForPrint(caseDocument, caseDetails, intervenerWrapper.getIntervenerType().getTypeValue(), AUTH_TOKEN); } + + protected CaseDetails buildCaseDetails() { + Map caseData = new HashMap<>(); + List natureOfApplication = List.of("Lump Sum Order", + "Periodical Payment Order", + "Pension Sharing Order", + "Pension Attachment Order", + "Pension Compensation Sharing Order", + "Pension Compensation Attachment Order", + "A settlement or a transfer of property", + "Property Adjustment Order"); + caseData.put("natureOfApplication2", natureOfApplication); + return CaseDetails.builder().id(123L).caseTypeId(CaseType.CONSENTED.getCcdType()).data(caseData).build(); + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/BaseUpdateFrcInfoDocumentServiceSetup.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/BaseUpdateFrcInfoDocumentServiceSetup.java index 25140ce69a..e099bca68a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/BaseUpdateFrcInfoDocumentServiceSetup.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/BaseUpdateFrcInfoDocumentServiceSetup.java @@ -1,6 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.updatefrc.service; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -66,7 +66,7 @@ public class BaseUpdateFrcInfoDocumentServiceSetup { private String letterDate; - @Before + @BeforeEach public void setUp() { caseData = Map.of(DIVORCE_CASE_NUMBER, "divCaseReference", SOLICITOR_REFERENCE, "solicitorReference"); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java index f022d8a81b..8447b09a5a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java @@ -1,9 +1,10 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.updatefrc.service; -import org.junit.Test; -import org.junit.runner.RunWith; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -16,8 +17,8 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class UpdateFrcInfoApplicantDocumentServiceTest extends BaseUpdateFrcInfoDocumentServiceSetup { +@ExtendWith(MockitoExtension.class) +class UpdateFrcInfoApplicantDocumentServiceTest extends BaseUpdateFrcInfoDocumentServiceSetup { private static final String APP_LITIGANT_URL = "appLitigantUrl"; private static final String APP_SOLICITOR_URL = "appSolicitorUrl"; @@ -26,7 +27,7 @@ public class UpdateFrcInfoApplicantDocumentServiceTest extends BaseUpdateFrcInfo UpdateFrcInfoApplicantDocumentService updateFrcInfoApplicantDocumentService; @Test - public void givenApplicantRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnApplicantLetter() { + void givenApplicantRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnApplicantLetter() { setUpLitigantMockContext(); Optional applicantLetter = updateFrcInfoApplicantDocumentService .getUpdateFrcInfoLetter(caseDetails, AUTH_TOKEN); @@ -39,7 +40,7 @@ public void givenApplicantRequiresLetterNotification_whenGetUpdateFrcInfoLetter_ } @Test - public void givenAppSolicitorRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnAppSolLetter() { + void givenAppSolicitorRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnAppSolLetter() { setUpSolicitorMockContext(); Optional appSolLetter = updateFrcInfoApplicantDocumentService .getUpdateFrcInfoLetter(caseDetails, AUTH_TOKEN); @@ -52,7 +53,7 @@ public void givenAppSolicitorRequiresLetterNotification_whenGetUpdateFrcInfoLett } @Test - public void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenReturnEmptyOptional() { + void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenReturnEmptyOptional() { setUpNoLetterMockContext(); Optional shouldBeEmpty = updateFrcInfoApplicantDocumentService .getUpdateFrcInfoLetter(caseDetails, AUTH_TOKEN); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java index d50d39a51a..2c370392f9 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoRespondentServiceTest.java @@ -1,22 +1,23 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.updatefrc.service; -import org.junit.Test; -import org.junit.runner.RunWith; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import java.util.Map; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class UpdateFrcInfoRespondentServiceTest extends BaseUpdateFrcInfoDocumentServiceSetup { +@ExtendWith(MockitoExtension.class) +class UpdateFrcInfoRespondentServiceTest extends BaseUpdateFrcInfoDocumentServiceSetup { private static final String RESP_LITIGANT_URL = "respLitigantUrl"; private static final String RESP_SOLICITOR_URL = "respSolicitorUrl"; @@ -25,7 +26,7 @@ public class UpdateFrcInfoRespondentServiceTest extends BaseUpdateFrcInfoDocumen UpdateFrcInfoRespondentDocumentService updateFrcInfoRespondentDocumentService; @Test - public void givenRespondentRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnRespondentLetter() { + void givenRespondentRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnRespondentLetter() { setUpLitigantMockContext(); Optional applicantLetter = updateFrcInfoRespondentDocumentService .getUpdateFrcInfoLetter(caseDetails, AUTH_TOKEN); @@ -38,7 +39,7 @@ public void givenRespondentRequiresLetterNotification_whenGetUpdateFrcInfoLetter } @Test - public void givenRespSolicitorRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnRespSolLetter() { + void givenRespSolicitorRequiresLetterNotification_whenGetUpdateFrcInfoLetter_thenReturnRespSolLetter() { setUpSolicitorMockContext(); Optional appSolLetter = updateFrcInfoRespondentDocumentService .getUpdateFrcInfoLetter(caseDetails, AUTH_TOKEN); @@ -51,7 +52,7 @@ public void givenRespSolicitorRequiresLetterNotification_whenGetUpdateFrcInfoLet } @Test - public void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenReturnEmptyOptional() { + void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenReturnEmptyOptional() { setUpNoLetterMockContext(); Optional shouldBeEmpty = updateFrcInfoRespondentDocumentService .getUpdateFrcInfoLetter(caseDetails, AUTH_TOKEN); @@ -62,7 +63,7 @@ public void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenRe private void setUpLitigantMockContext() { when(documentConfiguration.getUpdateFRCInformationLitigantTemplate()).thenReturn(LIT_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationLitigantFilename()).thenReturn(LIT_DOC_FILENAME); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), eq(LIT_DOC_TEMPLATE), @@ -74,7 +75,7 @@ private void setUpLitigantMockContext() { private void setUpSolicitorMockContext() { when(documentConfiguration.getUpdateFRCInformationSolicitorTemplate()).thenReturn(SOL_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationSolicitorFilename()).thenReturn(SOL_DOC_FILENAME); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isRespondentSolicitorAgreeToReceiveEmails(any())).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), @@ -85,7 +86,7 @@ private void setUpSolicitorMockContext() { } private void setUpNoLetterMockContext() { - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isRespondentSolicitorAgreeToReceiveEmails(any())).thenReturn(true); } } From faab2a6ad5f75103d26b70a2ce9f08141818a016 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:38:18 +0000 Subject: [PATCH 223/336] Use anyMap() --- .../barristers/BarristerLetterServiceTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java index 58cdb394bd..b3799bcc2b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/barristers/BarristerLetterServiceTest.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -90,7 +91,7 @@ void setUp() { @Test void givenApplicantIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); barristerLetterTuple = BarristerLetterTuple.of(APPLICANT, AUTH_TOKEN, ADDED); barrister = applicantBarrister(); @@ -101,7 +102,7 @@ void givenApplicantIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetter @Test void givenRespondentIsRepresentedBySolicitor_whenSendBarristerLetter_thenNoLetterSent() { - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); barristerLetterTuple = BarristerLetterTuple.of(RESPONDENT, AUTH_TOKEN, ADDED); barrister = respondentBarrister(); @@ -116,7 +117,7 @@ void givenApplicantUnrepresentedAndAddedBarrister_whenSendBarristerLetter_thenSe CaseDocument addedCaseDocument = addedCaseDocument(); when(bulkPrintService.getRecipient(DocumentHelper.PaperNotificationRecipient.APPLICANT.toString())) .thenReturn(CCDConfigConstant.APPLICANT); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(APPLICANT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerAddedTemplate()).thenReturn(BARRISTER_ADDED_TEMPLATE); when(documentConfiguration.getBarristerAddedFilename()).thenReturn(BARRISTER_ADDED_FILENAME); @@ -143,7 +144,7 @@ void givenApplicantUnrepresentedAndRemovedBarrister_whenSendBarristerLetter_then CaseDocument removed = removedCaseDocument(); when(bulkPrintService.getRecipient(DocumentHelper.PaperNotificationRecipient.APPLICANT.toString())) .thenReturn(CCDConfigConstant.APPLICANT); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(APPLICANT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerRemovedTemplate()).thenReturn(BARRISTER_REMOVED_TEMPLATE); when(documentConfiguration.getBarristerRemovedFilename()).thenReturn(BARRISTER_REMOVED_FILENAME); @@ -170,7 +171,7 @@ void givenRespondentUnrepresentedAndAddedBarrister_whenSendBarristerLetter_thenS CaseDocument addedCaseDocument = addedCaseDocument(); when(bulkPrintService.getRecipient(RESPONDENT.toString())) .thenReturn(CCDConfigConstant.RESPONDENT); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(RESPONDENT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerAddedTemplate()).thenReturn(BARRISTER_ADDED_TEMPLATE); when(documentConfiguration.getBarristerAddedFilename()).thenReturn(BARRISTER_ADDED_FILENAME); @@ -197,7 +198,7 @@ void givenRespondentUnrepresentedAndRemovedBarrister_whenSendBarristerLetter_the CaseDocument removed = removedCaseDocument(); when(bulkPrintService.getRecipient(RESPONDENT.toString())) .thenReturn(CCDConfigConstant.RESPONDENT); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(false); when(barristerLetterDetailsGenerator.generate(eq(caseDetails), eq(RESPONDENT), any())).thenReturn(letterDetails); when(documentConfiguration.getBarristerRemovedTemplate()).thenReturn(BARRISTER_REMOVED_TEMPLATE); when(documentConfiguration.getBarristerRemovedFilename()).thenReturn(BARRISTER_REMOVED_FILENAME); From 15a0828f125203d75314fd161a1ed0f1c3a46ff9 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:39:07 +0000 Subject: [PATCH 224/336] Use anyMap() --- .../service/NotificationServiceTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java index 89b84e3d77..8bd926f74b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java @@ -699,7 +699,7 @@ public void shouldEmailRespondentSolicitor() { caseData.put(RESP_SOLICITOR_NOTIFICATIONS_EMAIL_CONSENT, YES_VALUE); when(caseDataService.isPaperApplication(anyMap())).thenReturn(false); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isNotEmpty(RESP_SOLICITOR_EMAIL, caseData)).thenReturn(true); assertTrue(notificationService.isRespondentSolicitorEmailCommunicationEnabled(caseData)); @@ -708,7 +708,7 @@ public void shouldEmailRespondentSolicitor() { @Test public void shouldNotEmailRespondentSolicitor() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(false); assertFalse(notificationService.isRespondentSolicitorEmailCommunicationEnabled(any())); } @@ -716,7 +716,7 @@ public void shouldNotEmailRespondentSolicitor() { @Test public void shouldEmailRespondentSolicitorWhenNullEmailConsent() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(false); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isNotEmpty(any(), any())).thenReturn(true); Map caseData = new HashMap<>(); @@ -734,7 +734,7 @@ public void shouldEmailContestedAppSolicitor() { caseData.put(APP_SOLICITOR_AGREE_TO_RECEIVE_EMAILS_CONTESTED, YES_VALUE); when(caseDataService.isPaperApplication(anyMap())).thenReturn(false); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isNotEmpty(CONTESTED_SOLICITOR_EMAIL, caseData)).thenReturn(true); assertTrue(notificationService.isContestedApplicantSolicitorEmailCommunicationEnabled(caseData)); @@ -743,7 +743,7 @@ public void shouldEmailContestedAppSolicitor() { @Test public void shouldNotEmailContestedAppSolicitor() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); assertFalse(notificationService.isContestedApplicantSolicitorEmailCommunicationEnabled(any())); } @@ -1328,7 +1328,7 @@ public void givenAppIsNotContestedAndApplicantSolicitorIsRegisteredAndAcceptingE when(checkSolicitorIsDigitalService.isRespondentSolicitorDigital(any())).thenReturn(true); when(caseDataService.isNotEmpty(RESP_SOLICITOR_EMAIL, caseData)).thenReturn(true); when(caseDataService.isPaperApplication(any(FinremCaseData.class))).thenReturn(false); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); CaseDetails caseDetails = CaseDetails.builder().data(caseData).build(); @@ -1339,7 +1339,7 @@ public void givenAppIsNotContestedAndApplicantSolicitorIsRegisteredAndAcceptingE public void isContestedAndRespondentSolicitorIsNotRegisteredOrAcceptingEmails() { when(caseDataService.isContestedPaperApplication(any())).thenReturn(true); when(checkSolicitorIsDigitalService.isRespondentSolicitorDigital(any())).thenReturn(true); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(false); Map caseData = new HashMap<>(); when(caseDataService.isNotEmpty(RESP_SOLICITOR_EMAIL, caseData)).thenReturn(false); From 987592a1a8634eb55ff1582172a9601533781c8b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:57:27 +0000 Subject: [PATCH 225/336] tidy up --- .../service/PaperNotificationServiceTest.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java index 017a156b13..6b3a4205f1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java @@ -1,6 +1,5 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service; - import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,8 +15,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.IntervenerOne; import uk.gov.hmcts.reform.finrem.caseorchestration.service.generalapplication.service.RejectGeneralApplicationDocumentService; -import java.util.HashMap; -import java.util.List; import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; @@ -60,7 +57,8 @@ void sendAssignToJudgeNotificationLetterIfIsPaperApplication() { when(caseDataService.isPaperApplication(anyMap())).thenReturn(true); when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); - paperNotificationService.printAssignToJudgeNotification(buildCaseDetails(), AUTH_TOKEN); + paperNotificationService.printAssignToJudgeNotification( + CaseDetails.builder().id(123L).caseTypeId(CaseType.CONSENTED.getCcdType()).data(Map.of()).build(), AUTH_TOKEN); verify(assignedToJudgeDocumentService).generateAssignedToJudgeNotificationLetter(any(CaseDetails.class), eq(AUTH_TOKEN), eq(APPLICANT)); verify(assignedToJudgeDocumentService).generateAssignedToJudgeNotificationLetter(any(CaseDetails.class), eq(AUTH_TOKEN), eq(RESPONDENT)); @@ -143,18 +141,4 @@ void givenValidCaseData_whenPrintIntervenerRejection_thenCallBulkPrintService() verify(bulkPrintService).sendDocumentForPrint(caseDocument, caseDetails, intervenerWrapper.getIntervenerType().getTypeValue(), AUTH_TOKEN); } - - protected CaseDetails buildCaseDetails() { - Map caseData = new HashMap<>(); - List natureOfApplication = List.of("Lump Sum Order", - "Periodical Payment Order", - "Pension Sharing Order", - "Pension Attachment Order", - "Pension Compensation Sharing Order", - "Pension Compensation Attachment Order", - "A settlement or a transfer of property", - "Property Adjustment Order"); - caseData.put("natureOfApplication2", natureOfApplication); - return CaseDetails.builder().id(123L).caseTypeId(CaseType.CONSENTED.getCcdType()).data(caseData).build(); - } } From bdc69862d6663d63c0713914057b00856a34339a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 10:58:21 +0000 Subject: [PATCH 226/336] tidy up --- .../service/PaperNotificationServiceTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java index 6b3a4205f1..02ce93569a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java @@ -17,8 +17,7 @@ import java.util.Map; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; @@ -74,7 +73,7 @@ void shouldPrintForApplicantIfNotRepresented() { caseDetails.getData().remove("applicantSolicitorConsentForEmails"); caseDetails.getData().put("paperApplication", "No"); - assertThat(paperNotificationService.shouldPrintForApplicant(caseDetails), is(true)); + assertTrue(paperNotificationService.shouldPrintForApplicant(caseDetails)); } @Test @@ -86,7 +85,7 @@ void shouldPrintForApplicantIfRepresentedButNotAgreedToEmail() { caseDetails.getData().put("applicantSolicitorConsentForEmails", "No"); caseDetails.getData().put("paperApplication", "No"); - assertThat(paperNotificationService.shouldPrintForApplicant(caseDetails), is(true)); + assertTrue(paperNotificationService.shouldPrintForApplicant(caseDetails)); } @Test @@ -96,7 +95,7 @@ void shouldPrintForApplicantIfPaperCase() { CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); caseDetails.getData().put("paperApplication", "YES"); - assertThat(paperNotificationService.shouldPrintForApplicant(caseDetails), is(true)); + assertTrue(paperNotificationService.shouldPrintForApplicant(caseDetails)); } @Test From 4dea649402d0c70894ebf8ecd3b2bf47b9815cea Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:15:42 +0000 Subject: [PATCH 227/336] Add test case. --- .../service/PaperNotificationServiceTest.java | 56 ++++++++++++++++++- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java index 02ce93569a..cc7d3ea96f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java @@ -1,26 +1,41 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.TestSetUpUtils; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.IntervenerOne; import uk.gov.hmcts.reform.finrem.caseorchestration.service.generalapplication.service.RejectGeneralApplicationDocumentService; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -46,9 +61,20 @@ class PaperNotificationServiceTest { private ObjectMapper mapper; + @Mock + FinremCaseDetailsMapper finremCaseDetailsMapper; + @BeforeEach void setup() { - mapper = new ObjectMapper(); + mapper = JsonMapper + .builder() + .addModule(new JavaTimeModule()) + .addModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .build(); + + finremCaseDetailsMapper = new FinremCaseDetailsMapper(mapper); } @Test @@ -74,6 +100,7 @@ void shouldPrintForApplicantIfNotRepresented() { caseDetails.getData().put("paperApplication", "No"); assertTrue(paperNotificationService.shouldPrintForApplicant(caseDetails)); + assertTrue(paperNotificationService.shouldPrintForApplicant(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))); } @Test @@ -86,6 +113,7 @@ void shouldPrintForApplicantIfRepresentedButNotAgreedToEmail() { caseDetails.getData().put("paperApplication", "No"); assertTrue(paperNotificationService.shouldPrintForApplicant(caseDetails)); + assertTrue(paperNotificationService.shouldPrintForApplicant(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))); } @Test @@ -93,9 +121,10 @@ void shouldPrintForApplicantIfPaperCase() { final String json = "/fixtures/refusal-order-contested.json"; CaseDetails caseDetails = TestSetUpUtils.caseDetailsFromResource(json, mapper); - caseDetails.getData().put("paperApplication", "YES"); + caseDetails.getData().put("paperApplication", "Yes"); assertTrue(paperNotificationService.shouldPrintForApplicant(caseDetails)); + assertTrue(paperNotificationService.shouldPrintForApplicant(finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails))); } @Test @@ -140,4 +169,27 @@ void givenValidCaseData_whenPrintIntervenerRejection_thenCallBulkPrintService() verify(bulkPrintService).sendDocumentForPrint(caseDocument, caseDetails, intervenerWrapper.getIntervenerType().getTypeValue(), AUTH_TOKEN); } + + @ParameterizedTest + @CsvSource({ + "true, Yes, false", // Respondent represented, consent given, should not print + "true, No, true", // Respondent represented, no consent, should print + "false, Yes, true", // Respondent not represented, should print regardless of consent + "false, No, true" // Respondent not represented, should print regardless of consent + }) + void testShouldPrintForRespondent(boolean isRespRepresented, String respSolConsent, boolean expected) { + // Arrange + FinremCaseDetails caseDetails = mock(FinremCaseDetails.class); + FinremCaseData caseData = mock(FinremCaseData.class); + + lenient().when(caseDetails.getData()).thenReturn(caseData); + lenient().when(caseDataService.isRespondentRepresentedByASolicitor(caseData)).thenReturn(isRespRepresented); + lenient().when(caseData.getRespSolNotificationsEmailConsent()).thenReturn(YesOrNo.forValue(respSolConsent)); + + // Act + boolean result = paperNotificationService.shouldPrintForRespondent(caseDetails); + + // Assert + assertEquals(expected, result); + } } From 72bb4c431422b36766fcdd2ecd7c61b91b13de19 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:33:20 +0000 Subject: [PATCH 228/336] increase code coverage. --- .../service/PaperNotificationServiceTest.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java index cc7d3ea96f..3014098ad2 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/PaperNotificationServiceTest.java @@ -183,7 +183,7 @@ void testShouldPrintForRespondent(boolean isRespRepresented, String respSolConse FinremCaseData caseData = mock(FinremCaseData.class); lenient().when(caseDetails.getData()).thenReturn(caseData); - lenient().when(caseDataService.isRespondentRepresentedByASolicitor(caseData)).thenReturn(isRespRepresented); + when(caseDataService.isRespondentRepresentedByASolicitor(caseData)).thenReturn(isRespRepresented); lenient().when(caseData.getRespSolNotificationsEmailConsent()).thenReturn(YesOrNo.forValue(respSolConsent)); // Act @@ -192,4 +192,30 @@ void testShouldPrintForRespondent(boolean isRespRepresented, String respSolConse // Assert assertEquals(expected, result); } + + @ParameterizedTest + @CsvSource({ + "true, true, false, false", // Applicant represented, agrees to email, not paper application, should not print + "true, false, false, true", // Applicant represented, does not agree to email, not paper application, should print + "false, true, false, true", // Applicant not represented, agrees to email, not paper application, should print + "false, false, false, true", // Applicant not represented, does not agree to email, not paper application, should print + "true, true, true, true", // Applicant represented, agrees to email, paper application, should print + "false, true, true, true" // Applicant not represented, agrees to email, paper application, should print + }) + void testShouldPrintForApplicant(boolean isApplicantRepresented, boolean agreesToEmails, boolean isPaperApplication, boolean expected) { + // Arrange + FinremCaseDetails caseDetails = mock(FinremCaseDetails.class); + FinremCaseData caseData = mock(FinremCaseData.class); + + when(caseDetails.getData()).thenReturn(caseData); + when(caseDataService.isApplicantRepresentedByASolicitor(caseData)).thenReturn(isApplicantRepresented); + lenient().when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(caseDetails)).thenReturn(agreesToEmails); + lenient().when(caseDataService.isPaperApplication(caseData)).thenReturn(isPaperApplication); + + // Act + boolean result = paperNotificationService.shouldPrintForApplicant(caseDetails); + + // Assert + assertEquals(expected, result); + } } From 8c86c14ad6310b3e3fe1140777b031d8c431beb6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:46:12 +0000 Subject: [PATCH 229/336] Use anyMap() --- .../controllers/CaseDataControllerTest.java | 18 +++++++++--------- .../service/NoticeOfChangeServiceTest.java | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java index 5d2030c7b4..023bb293aa 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/controllers/CaseDataControllerTest.java @@ -12,12 +12,12 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.UpdateSolicitorDetailsService; import java.io.InputStream; -import java.util.Map; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.never; @@ -185,7 +185,7 @@ public void shouldNotSetOrgPolicyIfInvalidCaseType() throws Exception { @Test public void shouldSuccessfullyPopulateApplicantSolicitorAddressContested() { - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); CallbackRequest callbackRequest = buildCallbackRequest(); @@ -196,7 +196,7 @@ public void shouldSuccessfullyPopulateApplicantSolicitorAddressContested() { @Test public void shouldNotPopulateApplicantSolicitorAddressContested_notRepresented() { - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); caseDataController.setContestedDefaultValues(AUTH_TOKEN, buildCallbackRequest()); @@ -205,7 +205,7 @@ public void shouldNotPopulateApplicantSolicitorAddressContested_notRepresented() @Test public void shouldSuccessfullyPopulateApplicantSolicitorAddressConsented() { - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); CallbackRequest callbackRequest = buildCallbackRequest(); @@ -216,7 +216,7 @@ public void shouldSuccessfullyPopulateApplicantSolicitorAddressConsented() { @Test public void shouldNotPopulateApplicantSolicitorAddressConsented_notRepresented() { - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); caseDataController.setConsentedDefaultValues(AUTH_TOKEN, buildCallbackRequest()); @@ -234,8 +234,8 @@ public void createRequest(String payload) throws Exception { @Test public void shouldSuccessfullySetOrgPolicies() throws Exception { createRequest(PATH + "no-org-policies.json"); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(false); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); mvc.perform(post("/case-orchestration/org-policies") .content(objectMapper.writeValueAsString(request)) .header(AUTHORIZATION_HEADER, AUTH_TOKEN) @@ -252,8 +252,8 @@ public void shouldSuccessfullySetOrgPolicies() throws Exception { @Test public void shouldNotSetOrgPolicies() throws Exception { createRequest(PATH + "no-orgs-is-represented.json"); - when(caseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); mvc.perform(post("/case-orchestration/org-policies") .content(objectMapper.writeValueAsString(request)) .header(AUTHORIZATION_HEADER, AUTH_TOKEN) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java index cd019d49a3..f6fdbad3ec 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java @@ -296,8 +296,8 @@ public void shouldUpdateRepresentationUpdateHistory_whenNatureIsReplacing() thro public void shouldUpdateRepresentationUpdateHistoryRespondent() throws Exception { setUpCaseDetails("change-of-representatives-respondent.json"); when(mockIdamService.getIdamFullName(any())).thenReturn("Claire Mumford"); - when(mockCaseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); - when(mockCaseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(mockCaseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); + when(mockCaseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); when(mockCaseDataService.buildFullRespondentName((CaseDetails) any())).thenReturn("Jane Smith"); when(addedSolicitorService.getAddedSolicitorAsCaseworker(any())).thenReturn( ChangedRepresentative.builder() @@ -385,8 +385,8 @@ private void setUpHelper() { when(mockIdamService.getIdamFullName(any())).thenReturn("Claire Mumford"); when(mockCaseDataService.buildFullApplicantName((CaseDetails) any())).thenReturn("John Smith"); when(mockCaseDataService.buildFullRespondentName((CaseDetails) any())).thenReturn("Jane Smith"); - when(mockCaseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); - when(mockCaseDataService.isRespondentRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(mockCaseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); + when(mockCaseDataService.isRespondentRepresentedByASolicitor(anyMap())).thenReturn(true); when(mockCaseDataService.isConsentedApplication(any(CaseDetails.class))).thenReturn(false); } From 3033bad06332ac581f2acd511120ac79ebed6b1d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:47:19 +0000 Subject: [PATCH 230/336] anyMap() --- .../service/UpdateFrcInfoApplicantDocumentServiceTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java index 8447b09a5a..74de6e8835 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java @@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; @@ -64,7 +65,7 @@ void givenNoLetterNotificationsRequired_whenGetUpdateFrcInfoLetter_thenReturnEmp private void setUpLitigantMockContext() { when(documentConfiguration.getUpdateFRCInformationLitigantTemplate()).thenReturn(LIT_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationLitigantFilename()).thenReturn(LIT_DOC_FILENAME); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(false); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), eq(LIT_DOC_TEMPLATE), @@ -76,7 +77,7 @@ private void setUpLitigantMockContext() { private void setUpSolicitorMockContext() { when(documentConfiguration.getUpdateFRCInformationSolicitorTemplate()).thenReturn(SOL_DOC_TEMPLATE); when(documentConfiguration.getUpdateFRCInformationSolicitorFilename()).thenReturn(SOL_DOC_FILENAME); - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(false); when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), updateFrcInfoLetterDetailsCaptor.capture(), @@ -87,7 +88,7 @@ private void setUpSolicitorMockContext() { } private void setUpNoLetterMockContext() { - when(caseDataService.isApplicantRepresentedByASolicitor(any(Map.class))).thenReturn(true); + when(caseDataService.isApplicantRepresentedByASolicitor(anyMap())).thenReturn(true); when(caseDataService.isApplicantSolicitorAgreeToReceiveEmails(any(CaseDetails.class))).thenReturn(true); } } From 0f03e5bcde51ca2f065ac9a271b0d2f008e690f2 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:49:45 +0000 Subject: [PATCH 231/336] checkstyle --- .../service/UpdateFrcInfoApplicantDocumentServiceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java index 74de6e8835..ec57de0352 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/updatefrc/service/UpdateFrcInfoApplicantDocumentServiceTest.java @@ -8,7 +8,6 @@ import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import java.util.Map; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; From b4cf16322364cfca0b6ca7490ac1c5916f6ca945 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:53:19 +0000 Subject: [PATCH 232/336] Enable bulkprint --- .../ApproveDraftOrdersSubmittedHandler.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index ad5d2e8742..09fbba2316 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -81,18 +81,17 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); } else { // cloned the logic from ContestedDraftOrderNotApprovedController.sendRefusalReason - // TODO uncomment below -// CaseDocument refusalOrder = a.getValue().getRefusalOrder(); -// -// if (paperNotificationService.shouldPrintForApplicant(caseDetails)) { -// bulkPrintService.printApplicantDocuments(caseDetails, userAuthorisation, -// singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); -// } -// -// if (paperNotificationService.shouldPrintForRespondent(caseDetails)) { -// bulkPrintService.printRespondentDocuments(caseDetails, userAuthorisation, -// singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); -// } + CaseDocument refusalOrder = a.getValue().getRefusalOrder(); + + if (paperNotificationService.shouldPrintForApplicant(caseDetails)) { + bulkPrintService.printApplicantDocuments(caseDetails, userAuthorisation, + singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); + } + + if (paperNotificationService.shouldPrintForRespondent(caseDetails)) { + bulkPrintService.printRespondentDocuments(caseDetails, userAuthorisation, + singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); + } } }); From 17f5b506731e2f6dfeb8a5d87af08255f81b04d7 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 11:54:33 +0000 Subject: [PATCH 233/336] missing import --- .../caseorchestration/service/NoticeOfChangeServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java index f6fdbad3ec..74f3928d39 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NoticeOfChangeServiceTest.java @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.APPLICANT; From fb721d6ce56dbb0195a535e087414807d26a8756 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 14:48:54 +0000 Subject: [PATCH 234/336] DFR-3334 Add Hearing Judge to Approve Orders Page. --- ...ApproveDraftOrdersAboutToStartHandler.java | 4 ++- .../judgeapproval/JudgeApproval.java | 2 ++ .../service/HearingService.java | 7 ++-- ...oveDraftOrdersAboutToStartHandlerTest.java | 36 ++++++++++--------- .../service/HearingServiceTest.java | 20 +++++------ .../caseorchestration/test/Assertions.java | 11 ++++++ 6 files changed, 47 insertions(+), 33 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 99b5be9228..3cb5506e95 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -114,7 +114,7 @@ private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWr private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrdersReview) { return hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), - draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); + draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime()); } private List getReviewableItems(List outstanding) { @@ -132,6 +132,7 @@ private List getReviewableItems(List .title(DRAFT_ORDER.getTitle()) .inlineDocType(DRAFT_ORDER.getDescription()) .hearingInfo(hearingInfo) + .hearingJudge(draftOrdersReview.getHearingJudge()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") .label("This is a final order") @@ -153,6 +154,7 @@ private List getReviewableItems(List .title(PSA.getTitle()) .inlineDocType(PSA.getDescription()) .hearingInfo(hearingInfo) + .hearingJudge(draftOrdersReview.getHearingJudge()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") .label("This is a final order") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index a13cc79e8e..03f3fc3068 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -33,6 +33,8 @@ public class JudgeApproval { private String hearingInfo; + private String hearingJudge; + private YesOrNo hasAttachment; @JsonProperty("document") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java index e5573321a0..01c196c457 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java @@ -157,15 +157,14 @@ private T getHearingInfo(FinremCaseData caseData, DynamicListElement selecte .orElse(null); // Return null if no match is found } - public String formatHearingInfo(String hearingType, LocalDate hearingDate, String hearingTime, String hearingJudge) { + public String formatHearingInfo(String hearingType, LocalDate hearingDate, String hearingTime) { return format( - "%s on %s %s by %s", + "%s on %s %s", Optional.ofNullable(hearingType).orElse("N/A"), Optional.ofNullable(hearingDate) .map(date -> hearingDate.format(DateTimeFormatter.ofPattern("dd MMMM yyyy"))) .orElse("N/A"), - Optional.ofNullable(hearingTime).orElse("N/A"), - Optional.ofNullable(hearingJudge).orElse("N/A") + Optional.ofNullable(hearingTime).orElse("N/A") ); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 897af03fbb..50b1281e98 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -37,9 +37,9 @@ import java.time.LocalDateTime; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.stream.Stream; +import static java.util.Optional.ofNullable; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -53,6 +53,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertEqualsWithNullOrEmptyHandling; @ExtendWith(MockitoExtension.class) class ApproveDraftOrdersAboutToStartHandlerTest { @@ -144,9 +145,9 @@ void handle_withVariousDraftOrdersWrapperData( .build()) .build()) .build(); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00")) .thenReturn("hearingServiceFormattedString1"); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00")) .thenReturn("hearingServiceFormattedString2"); // Act @@ -158,22 +159,20 @@ void handle_withVariousDraftOrdersWrapperData( draftOrdersWrapper = responseData.getDraftOrdersWrapper(); var expectedJudgeApproval = List.of( - Optional.ofNullable(expectedJudgeApproval1), Optional.ofNullable(expectedJudgeApproval2), - Optional.ofNullable(expectedJudgeApproval3), Optional.ofNullable(expectedJudgeApproval4), - Optional.ofNullable(expectedJudgeApproval5) + ofNullable(expectedJudgeApproval1), ofNullable(expectedJudgeApproval2), + ofNullable(expectedJudgeApproval3), ofNullable(expectedJudgeApproval4), + ofNullable(expectedJudgeApproval5) ); for (int i = 0; i < NUMBER_OF_DOC_TO_BE_REVIEWED; i++) { var actual = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (i + 1)).invoke(draftOrdersWrapper); var expected = expectedJudgeApproval.get(i).orElse(null); if (expected != null && actual != null) { - assertEquals(expected.getTitle(), actual.getTitle()); - assertEquals(expected.getInlineDocType(), actual.getInlineDocType()); - assertEquals(expected.getDocument(), actual.getDocument()); - assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); - if (expected.getHasAttachment() == YES) { - assertEquals(expected.getAttachments(), actual.getAttachments()); - } + assertThat(actual) + .usingRecursiveComparison() + .ignoringFields("sortKey", "isFinalOrder", "attachments") + .isEqualTo(expected); + assertEqualsWithNullOrEmptyHandling(expected.getAttachments(), actual.getAttachments()); } else { assertEquals(expected, actual); } @@ -202,14 +201,14 @@ private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(Draf return builder.hearingDate(LocalDate.of(2024, 10, 31)) .hearingTime("09:00") .hearingType("hearingType") - .hearingJudge("Mr. Judge"); + .hearingJudge("Mr Judge"); } private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { return builder.hearingDate(LocalDate.of(2024, 11, 30)) .hearingTime("09:00") .hearingType("hearingType") - .hearingJudge("Mr. Judge"); + .hearingJudge("Mr Judge"); } private static CaseDocument randomCaseDocument() { @@ -276,11 +275,14 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus or private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, String hearingInfo, CaseDocument document, List attachments) { - return JudgeApproval.builder().hearingInfo(hearingInfo) + return JudgeApproval.builder() + .hearingInfo(hearingInfo) + .hearingJudge("Mr Judge") + .docType(docType) .title(docType.getTitle()) .inlineDocType(docType.getDescription()) .document(document) - .attachments(attachments) + .attachments(ofNullable(attachments).filter(a -> !a.isEmpty()).orElse(null)) .hasAttachment(YesOrNo.forValue(attachments != null && !attachments.isEmpty())) .build(); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java index c56c67a802..ee86659792 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java @@ -480,22 +480,20 @@ void testGetHearingTime(String selectedCode, String expectedTime) { @ParameterizedTest @CsvSource({ - "'Civil', '2024-11-10', '10:30 AM', 'Judge Smith', 'Civil on 10 November 2024 10:30 AM by Judge Smith'", - "NULL, '2024-11-10', '10:30 AM', 'Judge Smith', 'N/A on 10 November 2024 10:30 AM by Judge Smith'", - "'Civil', NULL, '10:30 AM', 'Judge Smith', 'Civil on N/A 10:30 AM by Judge Smith'", - "'Civil', '2024-11-10', NULL, 'Judge Smith', 'Civil on 10 November 2024 N/A by Judge Smith'", - "'Civil', '2024-11-10', '10:30 AM', NULL, 'Civil on 10 November 2024 10:30 AM by N/A'", - "NULL, NULL, NULL, NULL, 'N/A on N/A N/A by N/A'", - "'', '2024-11-10', '', '', ' on 10 November 2024 by '" + "'Civil', '2024-11-10', '10:30 AM', 'Civil on 10 November 2024 10:30 AM'", + "NULL, '2024-11-10', '10:30 AM', 'N/A on 10 November 2024 10:30 AM'", + "'Civil', NULL, '10:30 AM', 'Civil on N/A 10:30 AM'", + "'Civil', '2024-11-10', NULL, 'Civil on 10 November 2024 N/A'", + "'Civil', '2024-11-10', '10:30 AM', 'Civil on 10 November 2024 10:30 AM'", + "NULL, NULL, NULL, 'N/A on N/A N/A'", + "'', '2024-11-10', '', ' on 10 November 2024 '" }) - void formatHearingInfo_shouldReturnExpectedOutput(String hearingType, String hearingDate, String hearingTime, String hearingJudge, - String expectedOutput) { + void formatHearingInfo_shouldReturnExpectedOutput(String hearingType, String hearingDate, String hearingTime, String expectedOutput) { LocalDate parsedHearingDate = "NULL".equals(hearingDate) ? null : LocalDate.parse(hearingDate); String parsedHearingType = "NULL".equals(hearingType) ? null : hearingType; String parsedHearingTime = "NULL".equals(hearingTime) ? null : hearingTime; - String parsedHearingJudge = "NULL".equals(hearingJudge) ? null : hearingJudge; - String actualOutput = hearingService.formatHearingInfo(parsedHearingType, parsedHearingDate, parsedHearingTime, parsedHearingJudge); + String actualOutput = hearingService.formatHearingInfo(parsedHearingType, parsedHearingDate, parsedHearingTime); assertEquals(expectedOutput, actualOutput); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java index 11ac73b8f2..7e168e84cc 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java @@ -7,9 +7,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; import java.util.Arrays; +import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertEquals; public class Assertions { @@ -32,4 +34,13 @@ public static void assertCanHandle(CallbackHandler handler, Arguments... combina } } } + + public static void assertEqualsWithNullOrEmptyHandling(List expected, List actual) { + boolean areBothNullOrEmpty = + (expected == null || expected.isEmpty()) && (actual == null || actual.isEmpty()); + + if (!areBothNullOrEmpty) { + assertEquals(expected, actual, "Lists do not match"); + } + } } \ No newline at end of file From b6e3e7fcedaa6c2d8a11909b35cd3ac63e9f17f8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 12 Dec 2024 14:52:36 +0000 Subject: [PATCH 235/336] NL --- .../hmcts/reform/finrem/caseorchestration/test/Assertions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java index 7e168e84cc..7c670f7a5a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java @@ -43,4 +43,4 @@ public static void assertEqualsWithNullOrEmptyHandling(List expected, List assertEquals(expected, actual, "Lists do not match"); } } -} \ No newline at end of file +} From d0fd5cdf5241294ee92ed56c5c82190b700ee171 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 09:37:22 +0000 Subject: [PATCH 236/336] Remove notification by post logic --- .../ApproveDraftOrdersSubmittedHandler.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 09fbba2316..0bd32b53bf 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -10,7 +10,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.DraftOrdersNotificationRequestMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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; @@ -23,7 +22,6 @@ import java.util.List; import java.util.UUID; -import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.isEmpty; @@ -80,19 +78,8 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); } else { + // TODO send refusal order by post. // cloned the logic from ContestedDraftOrderNotApprovedController.sendRefusalReason - CaseDocument refusalOrder = a.getValue().getRefusalOrder(); - - if (paperNotificationService.shouldPrintForApplicant(caseDetails)) { - bulkPrintService.printApplicantDocuments(caseDetails, userAuthorisation, - singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); - } - - if (paperNotificationService.shouldPrintForRespondent(caseDetails)) { - bulkPrintService.printRespondentDocuments(caseDetails, userAuthorisation, - singletonList(documentHelper.getBulkPrintDocumentFromCaseDocument(refusalOrder))); - } - } }); From 9eed41bf0736f67810b41dcbd7b31a58e20e1bfa Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 09:53:20 +0000 Subject: [PATCH 237/336] Check PSA for validating attachments --- .../ApproveDraftOrdersAboutToStartHandlerTest.java | 12 ++++++------ .../finrem/caseorchestration/test/Assertions.java | 9 --------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 50b1281e98..52bd0a2a69 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -53,7 +53,6 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; -import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertEqualsWithNullOrEmptyHandling; @ExtendWith(MockitoExtension.class) class ApproveDraftOrdersAboutToStartHandlerTest { @@ -170,9 +169,10 @@ void handle_withVariousDraftOrdersWrapperData( if (expected != null && actual != null) { assertThat(actual) .usingRecursiveComparison() - .ignoringFields("sortKey", "isFinalOrder", "attachments") + .ignoringFields(actual.getDocType() == DRAFT_ORDER + ? new String[] {"sortKey", "isFinalOrder"} + : new String[] {"sortKey", "isFinalOrder", "attachments"}) .isEqualTo(expected); - assertEqualsWithNullOrEmptyHandling(expected.getAttachments(), actual.getAttachments()); } else { assertEquals(expected, actual); } @@ -282,7 +282,7 @@ private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, .title(docType.getTitle()) .inlineDocType(docType.getDescription()) .document(document) - .attachments(ofNullable(attachments).filter(a -> !a.isEmpty()).orElse(null)) + .attachments(ofNullable(attachments).filter(a -> !a.isEmpty()).orElse(List.of())) .hasAttachment(YesOrNo.forValue(attachments != null && !attachments.isEmpty())) .build(); } @@ -312,7 +312,7 @@ private static Arguments withOneDraftOrderAndOnePsa() { )) .build(), buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, List.of()), null, null, null, NO); } @@ -360,7 +360,7 @@ private static Arguments withDifferentHearingInfo() { )) .build(), buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, List.of()), buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), null, null, NO); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java index 7c670f7a5a..81c53ab311 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java @@ -34,13 +34,4 @@ public static void assertCanHandle(CallbackHandler handler, Arguments... combina } } } - - public static void assertEqualsWithNullOrEmptyHandling(List expected, List actual) { - boolean areBothNullOrEmpty = - (expected == null || expected.isEmpty()) && (actual == null || actual.isEmpty()); - - if (!areBothNullOrEmpty) { - assertEquals(expected, actual, "Lists do not match"); - } - } } From 376b3a665c69b1aaa3234f75b49a0fdd1f6b8fb8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 09:54:47 +0000 Subject: [PATCH 238/336] Remove unused imports --- .../hmcts/reform/finrem/caseorchestration/test/Assertions.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java index 81c53ab311..5658554b79 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java @@ -7,11 +7,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; import java.util.Arrays; -import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.jupiter.api.Assertions.assertEquals; public class Assertions { From 06c362269f6e587e6f880b0f47c1c3de1011cf39 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 10:51:55 +0000 Subject: [PATCH 239/336] Add test case --- .../service/EmailServiceTest.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java index ff270e6cf6..a0922f12b9 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java @@ -54,6 +54,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONSENT_ORDER_MADE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONSENT_ORDER_NOT_APPROVED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONSENT_ORDER_NOT_APPROVED_SENT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_GENERAL_APPLICATION_REFER_TO_JUDGE; @@ -715,6 +716,41 @@ public void testSendConfirmationEmailForContestedDraftOrderReviewOverdue() throw expectedTemplateFields.forEach((k, v) -> assertEquals(v, actualTemplateFields.get(k))); } + @Test + public void testSendRefusedDraftOrderOrPsa() throws NotificationClientException { + NotificationRequest nr = NotificationRequest.builder() + .notificationEmail("recipient@test.com") + .caseReferenceNumber("5457543354") + .caseType(EmailService.CONTESTED) + .applicantName(APPLICANT_NAME) + .respondentName(RESPONDENT_NAME) + .selectedCourt("liverpool") + .documentName("TEST.doc") + .judgeFeedback("Feedback") + .build(); + + emailService.sendConfirmationEmail(nr, FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED); + + Map expectedTemplateFields = Map.of( + "caseReferenceNumber", "5457543354", + "applicantName", APPLICANT_NAME, + "respondentName", RESPONDENT_NAME, + "courtName", "Liverpool FRC", + "courtEmail", "FRCLiverpool@Justice.gov.uk", + "documentName", "TEST.doc", + "judgeFeedback", "Feedback" + ); + + verify(mockClient).sendEmail( + eq(emailTemplates.get(FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED.name())), + eq("recipient@test.com"), + templateFieldsArgumentCaptor.capture(), + anyString()); + + Map actualTemplateFields = templateFieldsArgumentCaptor.getValue(); + expectedTemplateFields.forEach((k, v) -> assertEquals(v, actualTemplateFields.get(k))); + } + private void assertContestedTemplateVariablesAreAbsent(Map returnedTemplateVars) { assertNull(returnedTemplateVars.get("courtName")); assertNull(returnedTemplateVars.get("courtEmail")); From 1a58440df4aa514cae06a101402601414671a0fd Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 11:09:15 +0000 Subject: [PATCH 240/336] Test case for DraftOrdersNotificationRequestMapperTest --- ...ftOrdersNotificationRequestMapperTest.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java index 6ccb7da830..88ad64e541 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java @@ -7,6 +7,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.config.CourtDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.config.CourtDetailsConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicListElement; @@ -19,6 +20,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.AllocatedRegionWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper; @@ -173,4 +175,58 @@ private DraftOrdersReview createDraftOrdersReview() { )) .build(); } + + @Test + void testBuildRefusedDraftOrderOrPsaNotificationRequest() { + DraftOrdersReview draftOrdersReview = createDraftOrdersReview(); + + FinremCaseData caseData = FinremCaseData.builder() + .ccdCaseType(CaseType.CONTESTED) + .contactDetailsWrapper(ContactDetailsWrapper.builder() + .applicantFmName("Charlie") + .applicantLname("Hull") + .respondentFmName("Stella") + .respondentLname("Hull") + .build()) + .regionWrapper(RegionWrapper.builder() + .allocatedRegionWrapper(AllocatedRegionWrapper.builder() + .courtListWrapper(DefaultCourtListWrapper.builder() + .liverpoolCourtList(LIVERPOOL_CIVIL_FAMILY_COURT).build()) + .regionList(Region.NORTHWEST) + .northWestFrcList(RegionNorthWestFrc.LIVERPOOL) + .build()) + .build()) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(draftOrdersReview) + .build() + )) + .build()) + .build(); + FinremCaseDetails caseDetails = FinremCaseDetails.builder() + .id(45347643533535L) + .data(caseData) + .build(); + + NotificationRequest notificationRequest = mapper.buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, + RefusedOrder.builder() + .hearingDate(LocalDate.of(2024, 1, 5)) + .refusalJudge("Peter Chapman") + .judgeFeedback("Judge Feedback") + .submittedByEmail("hello@world.com") + .refusedDocument(CaseDocument.builder().documentFilename("abc.pdf").build()) + .build()); + + assertThat(notificationRequest.getNotificationEmail()).isEqualTo("hello@world.com"); + assertThat(notificationRequest.getCaseReferenceNumber()).isEqualTo("45347643533535"); + assertThat(notificationRequest.getCaseType()).isEqualTo(EmailService.CONTESTED); + assertThat(notificationRequest.getApplicantName()).isEqualTo("Charlie Hull"); + assertThat(notificationRequest.getRespondentName()).isEqualTo("Stella Hull"); + assertThat(notificationRequest.getHearingDate()).isEqualTo("5 January 2024"); + assertThat(notificationRequest.getSelectedCourt()).isEqualTo(RegionNorthWestFrc.LIVERPOOL.getValue()); + assertThat(notificationRequest.getDocumentName()).isEqualTo("abc.pdf"); + assertThat(notificationRequest.getJudgeFeedback()).isEqualTo("Judge Feedback"); + assertThat(notificationRequest.getJudgeName()).isEqualTo("Peter Chapman"); + } } From 16bc4a0d72a2b8581693f796de25ace34b2ae536 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 11:27:47 +0000 Subject: [PATCH 241/336] Remove unused injections. --- .../ApproveDraftOrdersSubmittedHandler.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 0bd32b53bf..30a3da8bab 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -6,7 +6,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackHandler; import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.DraftOrdersNotificationRequestMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; @@ -15,9 +14,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.BulkPrintService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.PaperNotificationService; import java.util.List; import java.util.UUID; @@ -33,23 +30,11 @@ public class ApproveDraftOrdersSubmittedHandler extends FinremCallbackHandler { private final DraftOrdersNotificationRequestMapper notificationRequestMapper; - private final BulkPrintService bulkPrintService; - - private final PaperNotificationService paperNotificationService; - - private final DocumentHelper documentHelper; - public ApproveDraftOrdersSubmittedHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, NotificationService notificationService, - DraftOrdersNotificationRequestMapper notificationRequestMapper, - BulkPrintService bulkPrintService, - PaperNotificationService paperNotificationService, - DocumentHelper documentHelper) { + DraftOrdersNotificationRequestMapper notificationRequestMapper) { super(finremCaseDetailsMapper); this.notificationService = notificationService; this.notificationRequestMapper = notificationRequestMapper; - this.bulkPrintService = bulkPrintService; - this.paperNotificationService = paperNotificationService; - this.documentHelper = documentHelper; } @Override From 430cfc9a94f9871cd7085a25391a682a4359fa3e Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 12:25:30 +0000 Subject: [PATCH 242/336] Update test case to increase code coverage. --- .../ApproveDraftOrdersSubmittedHandler.java | 2 +- ...pproveDraftOrdersSubmittedHandlerTest.java | 121 ++++++++++++++++++ 2 files changed, 122 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 30a3da8bab..4bb81b59fa 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -56,7 +56,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem List refusalOrderIdsToBeSent = ofNullable(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).orElse(List.of()).stream().map(UuidCollection::getValue).toList(); - draftOrdersWrapper.getRefusedOrdersCollection().stream() + ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElse(List.of()).stream() .filter(d -> refusalOrderIdsToBeSent.contains(d.getId())) .forEach(a -> { if (!isEmpty(a.getValue().getSubmittedByEmail())) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java index 20acc98308..a7a025eab2 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java @@ -2,15 +2,36 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.DraftOrdersNotificationRequestMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; 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.UuidCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.notification.NotificationRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.service.NotificationService; +import java.util.List; +import java.util.UUID; +import java.util.stream.Stream; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) @@ -30,4 +51,104 @@ void canHandle() { assertCanHandle(handler, CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.APPROVE_ORDERS); } + @ParameterizedTest + @MethodSource("invokeNotificationServiceForRefusalOrdersData") + void shouldInvokeNotificationServiceForRefusalOrders(DraftOrdersWrapper draftOrdersWrapper, int expectedInvocationCount) { + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequestFactory.from( + FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build() + ); + + NotificationRequest expectedNotificationRequest = new NotificationRequest(); + lenient().when(notificationRequestMapper.buildRefusedDraftOrderOrPsaNotificationRequest(any(), any())) + .thenReturn(expectedNotificationRequest); + + // Act + handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + verify(notificationService, times(expectedInvocationCount)).sendDraftOrderOrPsaRefused(expectedNotificationRequest); + verify(notificationRequestMapper, times(expectedInvocationCount)).buildRefusedDraftOrderOrPsaNotificationRequest(any(FinremCaseDetails.class), + any(RefusedOrder.class)); + } + + private static Stream invokeNotificationServiceForRefusalOrdersData() { + UUID randomUUID = UUID.randomUUID(); + UUID randomUUID2 = UUID.randomUUID(); + return Stream.of( + Arguments.of(DraftOrdersWrapper.builder().build(), 0), + Arguments.of(DraftOrdersWrapper.builder().refusedOrdersCollection(List.of()).build(), 0), + Arguments.of(DraftOrdersWrapper.builder() + .refusedOrdersCollection(List.of( + RefusedOrderCollection + .builder() + .id(randomUUID) + .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) + .build() + )).build(), 0), // without refusalOrderIdsToBeSent + Arguments.of(DraftOrdersWrapper.builder() + .refusalOrderIdsToBeSent(List.of( + UuidCollection.builder().value(randomUUID).build() + )) + .refusedOrdersCollection(List.of( + RefusedOrderCollection + .builder() + .id(randomUUID) + .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) + .build() + )).build(), 1), // happy path + Arguments.of(DraftOrdersWrapper.builder() + .refusalOrderIdsToBeSent(List.of( + UuidCollection.builder().value(randomUUID).build() + )) + .refusedOrdersCollection(List.of( + RefusedOrderCollection + .builder() + .id(randomUUID) + .value(RefusedOrder.builder().build()) + .build() + )).build(), 0), // missing submittedByEmail + Arguments.of(DraftOrdersWrapper.builder() + .refusalOrderIdsToBeSent(List.of( + UuidCollection.builder().value(randomUUID).build(), + UuidCollection.builder().value(randomUUID2).build() + )) + .refusedOrdersCollection(List.of( + RefusedOrderCollection + .builder() + .id(randomUUID) + .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) + .build(), + RefusedOrderCollection + .builder() + .id(randomUUID2) + .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) + .build() + )).build(), 2), // two ids with two refusal orders + Arguments.of(DraftOrdersWrapper.builder() + .refusalOrderIdsToBeSent(List.of( + UuidCollection.builder().value(randomUUID).build() + )) + .refusedOrdersCollection(List.of( + RefusedOrderCollection + .builder() + .id(randomUUID2) + .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) + .build() + )).build(), 0), // with ID and a refusal order, but it does not match + Arguments.of(DraftOrdersWrapper.builder() + .refusalOrderIdsToBeSent(List.of( + UuidCollection.builder().value(randomUUID).build() + )) + .refusedOrdersCollection(List.of( + RefusedOrderCollection + .builder() + .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) + .build() + )).build(), 0) // refusal order without id + ); + } + } From 3b6ad97c298f772338b47752c2735f697e3490da Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 13:04:06 +0000 Subject: [PATCH 243/336] Test case in NotificationServiceTest --- .../service/NotificationServiceTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java index 8bd926f74b..90ec9861bd 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java @@ -86,6 +86,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_CONSENT_ORDER_APPROVED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_CONSENT_ORDER_NOT_APPROVED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE; import static uk.gov.hmcts.reform.finrem.caseorchestration.notifications.domain.EmailTemplateNames.FR_CONTESTED_GENERAL_APPLICATION_OUTCOME; @@ -1630,4 +1631,18 @@ public void testSendDraftOrderReviewOverdueToCaseworkerSendToFrcDisabled() { NotificationRequest actual = argumentCaptor.getValue(); assertEquals("fr_applicant_solicitor1@mailinator.com", actual.getNotificationEmail()); } + + @Test + public void testSendDraftOrderOrPsaRefused() { + NotificationRequest nr = NotificationRequest.builder() + .notificationEmail("test@test.com") + .build(); + notificationService.sendDraftOrderOrPsaRefused(nr); + + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(NotificationRequest.class); + verify(emailService).sendConfirmationEmail(argumentCaptor.capture(), + eq(FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED)); + NotificationRequest actual = argumentCaptor.getValue(); + assertEquals("test@test.com", actual.getNotificationEmail()); + } } From eab13b5f5f0265a23704fa255bd40d776df603b7 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 13:05:56 +0000 Subject: [PATCH 244/336] checkstyle --- ...pproveDraftOrdersSubmittedHandlerTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java index a7a025eab2..d11633a606 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java @@ -75,8 +75,8 @@ void shouldInvokeNotificationServiceForRefusalOrders(DraftOrdersWrapper draftOrd } private static Stream invokeNotificationServiceForRefusalOrdersData() { - UUID randomUUID = UUID.randomUUID(); - UUID randomUUID2 = UUID.randomUUID(); + UUID uuidOne = UUID.randomUUID(); + UUID uuidTwo = UUID.randomUUID(); return Stream.of( Arguments.of(DraftOrdersWrapper.builder().build(), 0), Arguments.of(DraftOrdersWrapper.builder().refusedOrdersCollection(List.of()).build(), 0), @@ -84,63 +84,63 @@ private static Stream invokeNotificationServiceForRefusalOrdersData() .refusedOrdersCollection(List.of( RefusedOrderCollection .builder() - .id(randomUUID) + .id(uuidOne) .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) .build() )).build(), 0), // without refusalOrderIdsToBeSent Arguments.of(DraftOrdersWrapper.builder() .refusalOrderIdsToBeSent(List.of( - UuidCollection.builder().value(randomUUID).build() + UuidCollection.builder().value(uuidOne).build() )) .refusedOrdersCollection(List.of( RefusedOrderCollection .builder() - .id(randomUUID) + .id(uuidOne) .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) .build() )).build(), 1), // happy path Arguments.of(DraftOrdersWrapper.builder() .refusalOrderIdsToBeSent(List.of( - UuidCollection.builder().value(randomUUID).build() + UuidCollection.builder().value(uuidOne).build() )) .refusedOrdersCollection(List.of( RefusedOrderCollection .builder() - .id(randomUUID) + .id(uuidOne) .value(RefusedOrder.builder().build()) .build() )).build(), 0), // missing submittedByEmail Arguments.of(DraftOrdersWrapper.builder() .refusalOrderIdsToBeSent(List.of( - UuidCollection.builder().value(randomUUID).build(), - UuidCollection.builder().value(randomUUID2).build() + UuidCollection.builder().value(uuidOne).build(), + UuidCollection.builder().value(uuidTwo).build() )) .refusedOrdersCollection(List.of( RefusedOrderCollection .builder() - .id(randomUUID) + .id(uuidOne) .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) .build(), RefusedOrderCollection .builder() - .id(randomUUID2) + .id(uuidTwo) .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) .build() )).build(), 2), // two ids with two refusal orders Arguments.of(DraftOrdersWrapper.builder() .refusalOrderIdsToBeSent(List.of( - UuidCollection.builder().value(randomUUID).build() + UuidCollection.builder().value(uuidOne).build() )) .refusedOrdersCollection(List.of( RefusedOrderCollection .builder() - .id(randomUUID2) + .id(uuidTwo) .value(RefusedOrder.builder().submittedByEmail("abc@abc.com").build()) .build() )).build(), 0), // with ID and a refusal order, but it does not match Arguments.of(DraftOrdersWrapper.builder() .refusalOrderIdsToBeSent(List.of( - UuidCollection.builder().value(randomUUID).build() + UuidCollection.builder().value(uuidOne).build() )) .refusedOrdersCollection(List.of( RefusedOrderCollection From 92c866b882f25377c2179305346827fcebb21e7f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 13 Dec 2024 15:38:11 +0000 Subject: [PATCH 245/336] Test case for refusal order generation --- .../judgeapproval/JudgeApprovalResolver.java | 12 +- .../JudgeApprovalResolverTest.java | 235 ++++++++++++++++++ 2 files changed, 241 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 7dfb416c1b..fb57702511 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -51,6 +51,12 @@ class JudgeApprovalResolver { private final HearingProcessor hearingProcessor; + private final GenericDocumentService genericDocumentService; + + private final DocumentConfiguration documentConfiguration; + + private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + /** * Populates the judge's decision for the given draft orders and updates the status of approvable documents. * This method processes the draft order review collection, PSA review collection, and agreed draft orders, @@ -147,12 +153,6 @@ private boolean isJudgeRefused(JudgeApproval judgeApproval) { return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); } - private final GenericDocumentService genericDocumentService; - - private final DocumentConfiguration documentConfiguration; - - private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; - private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, String judgeName, JudgeType judgeType, String authorisationToken) { DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 7d0ab5638a..77f9e2ac84 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -9,8 +9,11 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -25,22 +28,35 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.Optional; import java.util.stream.Stream; +import static java.util.Optional.ofNullable; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.CASE_ID; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @ExtendWith(MockitoExtension.class) @@ -55,6 +71,15 @@ class JudgeApprovalResolverTest { @Mock private HearingProcessor hearingProcessor; + @Mock + private GenericDocumentService genericDocumentService; + + @Mock + private DocumentConfiguration documentConfiguration; + + @Mock + private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + @ParameterizedTest @MethodSource("provideShouldInvokeProcessHearingInstructionData") void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { @@ -219,4 +244,214 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false, null, null, null) ); } + + @ParameterizedTest + @MethodSource("provideProcessRefusedDocumentsAndUpdateTheirState") + void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApproval, + List agreedDraftOrderCollections, + List draftOrdersReviewCollection, + List existingRefusedOrders, + RefusedOrderCollection refusedOrderCollection, + AgreedDraftOrderCollection targetAgreedDraftOrderCollection, + DraftOrderDocReviewCollection targetDraftOrderDocReviewCollection, + PsaDocReviewCollection targetPsaDocReviewCollection) { + DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder() + .agreedDraftOrderCollection(agreedDraftOrderCollections) + .draftOrdersReviewCollection(draftOrdersReviewCollection) + .refusedOrdersCollection(existingRefusedOrders) + .build(); + + // Mocking IDAM service for getting judge's full name + CaseDocument generatedDocument = CaseDocument.builder().build(); + lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn("Approved Judge"); + lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn("RefusalOrder.doc"); + lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), anyMap(), anyString(), anyString(), anyString())) + .thenReturn(generatedDocument); + + LocalDateTime fixedDateTime = LocalDateTime.of(2024, 11, 4, 9, 0, 0); + try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { + mockedStatic.when(LocalDateTime::now).thenReturn(fixedDateTime); + judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder() + .id(Long.valueOf(CASE_ID)) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build(), + draftOrdersWrapper, judgeApproval.getDocument(), judgeApproval, AUTH_TOKEN); + + // + assertNull(draftOrdersWrapper.getGeneratedOrderReason()); + assertNull(draftOrdersWrapper.getGeneratedOrderRefusedDate()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeName()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeType()); + + // expected refusal order count + int result = Stream.of( + Optional.ofNullable(targetAgreedDraftOrderCollection), + Optional.ofNullable(targetDraftOrderDocReviewCollection), + Optional.ofNullable(targetPsaDocReviewCollection) + ).allMatch(Optional::isEmpty) ? 0 : 1; + + assertThat(draftOrdersWrapper.getRefusedOrdersCollection()).hasSize(existingRefusedOrders.size() + result); + + if (refusedOrderCollection != null) { + assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); + assertEquals(OrderStatus.REFUSED, targetAgreedDraftOrderCollection.getValue().getOrderStatus()); + // verify agreedDraftOrderToBeExamined is removed + assertTrue(isAgreedDraftOrderAbsent(draftOrdersWrapper.getAgreedDraftOrderCollection(), targetAgreedDraftOrderCollection)); + + List newDraftOrdersReviewCollections = draftOrdersWrapper.getDraftOrdersReviewCollection(); + if (targetDraftOrderDocReviewCollection != null) { + assertTrue(isDraftOrderDocumentReviewAbsent(newDraftOrdersReviewCollections, targetDraftOrderDocReviewCollection)); + } + if (targetPsaDocReviewCollection != null) { + assertTrue(isPsaDocumentReviewAbsent(newDraftOrdersReviewCollections, targetPsaDocReviewCollection)); + } + // TODO verify refusedDate + draftOrdersWrapper.getRefusedOrdersCollection().stream().findFirst().ifPresentOrElse(r -> { + assertEquals(fixedDateTime, r.getValue().getRefusedDate()); + assertEquals(ofNullable(targetAgreedDraftOrderCollection.getValue().getDraftOrder()) + .orElse(targetAgreedDraftOrderCollection.getValue().getPensionSharingAnnex()), + r.getValue().getRefusedDocument()); + }, () -> fail("Unexpected missing refused order")); + } + + } + } + + static Stream provideProcessRefusedDocumentsAndUpdateTheirState() { + CaseDocument targetDoc = CaseDocument.builder().documentUrl("targetUrl").build(); + JudgeApproval judgeApproval = JudgeApproval.builder() + .hearingDate(LocalDate.of(2024, 1, 1)) + .judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE) + .changesRequestedByJudge("Refusal reason") + .document(targetDoc) + .build(); + return Stream.of( + targetDocNotFound(judgeApproval), + refuseTargetedDraftOrder(judgeApproval, targetDoc), + refuseTargetedPsa(judgeApproval, targetDoc) + ); + } + + static Arguments targetDocNotFound(JudgeApproval judgeApproval) { + return Arguments.of(judgeApproval, + List.of(), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("Hearing 1") + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder().build()).build()) + ) + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder().build()).build() + )) + .build() + ) + .build() + ), + List.of(), + null, + null, + null, + null + ); + } + + static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, CaseDocument targetDoc) { + AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(targetDoc).build()).build(); + DraftOrderDocReviewCollection draftOrderDocReviewCollectionToBeExamined = + DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder() + .draftOrderDocument(targetDoc) + .build()).build(); + + return Arguments.of(judgeApproval, + List.of(agreedDraftOrderCollectionToBeExamined), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("First Directions Appointment (FDA)") + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() + .psaDocument(CaseDocument.builder().build()).build()) + .build() + )) + .draftOrderDocReviewCollection(List.of( + draftOrderDocReviewCollectionToBeExamined + )) + .build() + ) + .build() + ), + List.of(), + RefusedOrderCollection.builder().value(RefusedOrder.builder() + .refusalJudge("Approved Judge") + .refusalOrder(targetDoc) + .build()).build(), + agreedDraftOrderCollectionToBeExamined, + draftOrderDocReviewCollectionToBeExamined, + null + ); + } + + static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, CaseDocument targetDoc) { + AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(targetDoc).build()).build(); + PsaDocReviewCollection psaDocReviewCollection = + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() + .psaDocument(targetDoc).build()) + .build(); + + return Arguments.of(judgeApproval, + List.of(agreedDraftOrderCollectionToBeExamined), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("First Directions Appointment (FDA)") + .psaDocReviewCollection(List.of( + psaDocReviewCollection + )) + .build() + ) + .build() + ), + List.of(), + RefusedOrderCollection.builder().value(RefusedOrder.builder() + .refusalJudge("Approved Judge") + .refusalOrder(targetDoc) + .build()).build(), + agreedDraftOrderCollectionToBeExamined, + null, + psaDocReviewCollection + ); + } + + public boolean isAgreedDraftOrderAbsent(List agreedDraftOrderCollections, AgreedDraftOrderCollection targetObject) { + return agreedDraftOrderCollections.stream().noneMatch(order -> order.equals(targetObject)); + } + + public boolean isPsaDocumentReviewAbsent(List draftOrdersReviewCollections, PsaDocReviewCollection targetObject) { + return draftOrdersReviewCollections.stream() + .map(DraftOrdersReviewCollection::getValue) // Extract DraftOrdersReview + .filter(draftOrdersReview -> draftOrdersReview.getPsaDocReviewCollection() != null) // Filter non-null collections + .flatMap(draftOrdersReview -> draftOrdersReview.getPsaDocReviewCollection().stream()) // Flatten to PsaDocReviewCollection + .noneMatch(order -> order.equals(targetObject)); + } + + public boolean isDraftOrderDocumentReviewAbsent(List draftOrdersReviewCollections, + DraftOrderDocReviewCollection targetObject) { + return draftOrdersReviewCollections.stream() + .map(DraftOrdersReviewCollection::getValue) // Extract DraftOrdersReview + .filter(draftOrdersReview -> draftOrdersReview.getDraftOrderDocReviewCollection() != null) // Filter non-null collections + .flatMap(draftOrdersReview -> draftOrdersReview.getDraftOrderDocReviewCollection().stream()) // Flatten to DraftOrderDocReviewCollection + .noneMatch(order -> order.equals(targetObject)); + } } From bbde3d2bf6f28bd0dc1b9f608f9da4577b78fed2 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:32:09 +0000 Subject: [PATCH 246/336] update test cases. --- .../ccd/draftorders/review/RefusedOrder.java | 4 +- .../judgeapproval/JudgeApprovalResolver.java | 2 + .../JudgeApprovalResolverTest.java | 178 +++++++++++++----- 3 files changed, 136 insertions(+), 48 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java index 845b585ae1..0d3cac14da 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @@ -19,7 +19,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) @Builder -@Getter +@Data @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index fb57702511..5c3132f4b7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -16,6 +16,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; @@ -215,6 +216,7 @@ private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrde .submittedBy(refusalOrderConvertible.getSubmittedBy()) .submittedByEmail(refusalOrderConvertible.getSubmittedByEmail()) .refusalJudge(refusalOrderConvertible.getApprovalJudge()) + .attachments(item.getValue() instanceof DraftOrderDocumentReview d ? d.getAttachments() : null) .judgeFeedback(judgeFeedback) .hearingDate(hearingDate); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 77f9e2ac84..8cfe97715d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -15,6 +15,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; @@ -36,11 +37,11 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import static java.util.Optional.ofNullable; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -62,6 +63,19 @@ @ExtendWith(MockitoExtension.class) class JudgeApprovalResolverTest { + private static final CaseDocument TARGET_DOCUMENT = CaseDocument.builder().documentUrl("targetUrl").build(); + private static final CaseDocument GENERATED_REFUSED_ORDER = CaseDocument.builder().documentUrl("generatedRefusedOrder.pdf").build(); + private static final String JUDGE_FEEDBACK = "Refusal reason"; + private static final String APPROVED_JUDGE_NAME = "Mary Chapman"; + private static final LocalDateTime FIXED_DATE_TIME = LocalDateTime.of(2024, 11, 4, 9, 0, 0); + private static final LocalDate HEARING_DATE = LocalDate.of(2024, 1, 1); + private static final String SUBMITTEDED_BY = "Claire"; + private static final String SUBMITTED_BY_EMAIL = "claire@solicitor.com"; + private static final LocalDateTime SUBMITTEDED_DATE = LocalDateTime.of(1989, 6, 4, 0, 0); + private static final List ATTACHMENTS = List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentUrl("randomDoc.pdf").build()).build() + ); + @InjectMocks private JudgeApprovalResolver judgeApprovalResolver; @@ -142,11 +156,10 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW CaseDocument expectedAmendedDocument) { // Mocking IDAM service for getting judge's full name - lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn("Judge Full Name"); + lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn(APPROVED_JUDGE_NAME); - LocalDateTime fixedDateTime = LocalDateTime.of(2024, 11, 4, 9, 0, 0); try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { - mockedStatic.when(LocalDateTime::now).thenReturn(fixedDateTime); + mockedStatic.when(LocalDateTime::now).thenReturn(FIXED_DATE_TIME); judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder().build(), draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); @@ -155,8 +168,8 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW if (approvable.match(targetDoc)) { if (shouldBeApproved) { assertEquals(expectedOrderStatus, approvable.getOrderStatus()); - assertEquals(fixedDateTime, approvable.getApprovalDate()); - assertEquals("Judge Full Name", approvable.getApprovalJudge()); + assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); + assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); if (expectedAmendedDocument != null) { assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); } @@ -251,10 +264,10 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova List agreedDraftOrderCollections, List draftOrdersReviewCollection, List existingRefusedOrders, - RefusedOrderCollection refusedOrderCollection, AgreedDraftOrderCollection targetAgreedDraftOrderCollection, DraftOrderDocReviewCollection targetDraftOrderDocReviewCollection, - PsaDocReviewCollection targetPsaDocReviewCollection) { + PsaDocReviewCollection targetPsaDocReviewCollection, + RefusedOrder expectedRefusedOrder) { DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder() .agreedDraftOrderCollection(agreedDraftOrderCollections) .draftOrdersReviewCollection(draftOrdersReviewCollection) @@ -262,15 +275,14 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova .build(); // Mocking IDAM service for getting judge's full name - CaseDocument generatedDocument = CaseDocument.builder().build(); - lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn("Approved Judge"); + lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn(APPROVED_JUDGE_NAME); lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn("RefusalOrder.doc"); - lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(eq(AUTH_TOKEN), anyMap(), anyString(), anyString(), anyString())) - .thenReturn(generatedDocument); + lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(any(FinremCaseDetails.class))).thenReturn("TemplateName"); + lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(anyString(), anyMap(), anyString(), anyString(), anyString())) + .thenReturn(GENERATED_REFUSED_ORDER); - LocalDateTime fixedDateTime = LocalDateTime.of(2024, 11, 4, 9, 0, 0); try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { - mockedStatic.when(LocalDateTime::now).thenReturn(fixedDateTime); + mockedStatic.when(LocalDateTime::now).thenReturn(FIXED_DATE_TIME); judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder() .id(Long.valueOf(CASE_ID)) .data(FinremCaseData.builder() @@ -279,7 +291,6 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova .build(), draftOrdersWrapper, judgeApproval.getDocument(), judgeApproval, AUTH_TOKEN); - // assertNull(draftOrdersWrapper.getGeneratedOrderReason()); assertNull(draftOrdersWrapper.getGeneratedOrderRefusedDate()); assertNull(draftOrdersWrapper.getGeneratedOrderJudgeName()); @@ -294,9 +305,8 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova assertThat(draftOrdersWrapper.getRefusedOrdersCollection()).hasSize(existingRefusedOrders.size() + result); - if (refusedOrderCollection != null) { + if (result != 0) { assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); - assertEquals(OrderStatus.REFUSED, targetAgreedDraftOrderCollection.getValue().getOrderStatus()); // verify agreedDraftOrderToBeExamined is removed assertTrue(isAgreedDraftOrderAbsent(draftOrdersWrapper.getAgreedDraftOrderCollection(), targetAgreedDraftOrderCollection)); @@ -307,30 +317,32 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova if (targetPsaDocReviewCollection != null) { assertTrue(isPsaDocumentReviewAbsent(newDraftOrdersReviewCollections, targetPsaDocReviewCollection)); } - // TODO verify refusedDate - draftOrdersWrapper.getRefusedOrdersCollection().stream().findFirst().ifPresentOrElse(r -> { - assertEquals(fixedDateTime, r.getValue().getRefusedDate()); - assertEquals(ofNullable(targetAgreedDraftOrderCollection.getValue().getDraftOrder()) - .orElse(targetAgreedDraftOrderCollection.getValue().getPensionSharingAnnex()), - r.getValue().getRefusedDocument()); + draftOrdersWrapper.getRefusedOrdersCollection().stream() + .max(Comparator.comparing(r -> r.getValue().getRefusedDate(), Comparator.nullsFirst(Comparator.naturalOrder()))) + .ifPresentOrElse(r -> { + assertEquals(expectedRefusedOrder, r.getValue()); + assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); + draftOrdersWrapper.getRefusalOrderIdsToBeSent().stream().findFirst() + .ifPresentOrElse(u -> assertEquals(r.getId(), u.getValue()), () -> fail("Unexpected missing refused order id")); }, () -> fail("Unexpected missing refused order")); } - } } static Stream provideProcessRefusedDocumentsAndUpdateTheirState() { - CaseDocument targetDoc = CaseDocument.builder().documentUrl("targetUrl").build(); JudgeApproval judgeApproval = JudgeApproval.builder() - .hearingDate(LocalDate.of(2024, 1, 1)) + .hearingDate(HEARING_DATE) .judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE) - .changesRequestedByJudge("Refusal reason") - .document(targetDoc) + .changesRequestedByJudge(JUDGE_FEEDBACK) + .document(TARGET_DOCUMENT) .build(); return Stream.of( targetDocNotFound(judgeApproval), - refuseTargetedDraftOrder(judgeApproval, targetDoc), - refuseTargetedPsa(judgeApproval, targetDoc) + refuseTargetedDraftOrder(judgeApproval, true), + refuseTargetedDraftOrder(judgeApproval, false), + refuseTargetedPsa(judgeApproval, true), + refuseTargetedPsa(judgeApproval, false), + refuseTargetedPsaWithExistingRefusedOrders(judgeApproval) ); } @@ -361,12 +373,17 @@ static Arguments targetDocNotFound(JudgeApproval judgeApproval) { ); } - static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, CaseDocument targetDoc) { + static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean withAttachment) { AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = - AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(targetDoc).build()).build(); + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT).build()).build(); + DraftOrderDocReviewCollection draftOrderDocReviewCollectionToBeExamined = DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder() - .draftOrderDocument(targetDoc) + .draftOrderDocument(TARGET_DOCUMENT) + .submittedBy(SUBMITTEDED_BY) + .submittedByEmail(SUBMITTED_BY_EMAIL) + .submittedDate(SUBMITTEDED_DATE) + .attachments(withAttachment ? ATTACHMENTS : null) .build()).build(); return Arguments.of(judgeApproval, @@ -390,22 +407,34 @@ static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, CaseDocum .build() ), List.of(), - RefusedOrderCollection.builder().value(RefusedOrder.builder() - .refusalJudge("Approved Judge") - .refusalOrder(targetDoc) - .build()).build(), agreedDraftOrderCollectionToBeExamined, draftOrderDocReviewCollectionToBeExamined, - null + null, + RefusedOrder.builder() + .refusedDate(FIXED_DATE_TIME) + .refusedDocument(TARGET_DOCUMENT) + .refusalOrder(GENERATED_REFUSED_ORDER) + .judgeFeedback(JUDGE_FEEDBACK) + .refusalJudge(APPROVED_JUDGE_NAME) + .submittedByEmail(SUBMITTED_BY_EMAIL) + .submittedDate(SUBMITTEDED_DATE) + .submittedBy(SUBMITTEDED_BY) + .attachments(withAttachment ? ATTACHMENTS : null) + .hearingDate(HEARING_DATE) + .build() ); } - static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, CaseDocument targetDoc) { + static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubmittedByEmail) { AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = - AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(targetDoc).build()).build(); + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build()).build(); PsaDocReviewCollection psaDocReviewCollection = PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() - .psaDocument(targetDoc).build()) + .submittedDate(SUBMITTEDED_DATE) + .submittedBy(SUBMITTEDED_BY) + .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null) + .psaDocument(TARGET_DOCUMENT) + .build()) .build(); return Arguments.of(judgeApproval, @@ -424,13 +453,69 @@ static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, CaseDocument tar .build() ), List.of(), - RefusedOrderCollection.builder().value(RefusedOrder.builder() - .refusalJudge("Approved Judge") - .refusalOrder(targetDoc) - .build()).build(), agreedDraftOrderCollectionToBeExamined, null, - psaDocReviewCollection + psaDocReviewCollection, + RefusedOrder.builder() + .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) + .judgeFeedback(JUDGE_FEEDBACK) + .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null).submittedDate(SUBMITTEDED_DATE).submittedBy(SUBMITTEDED_BY) + .hearingDate(HEARING_DATE) + .build() + ); + } + + static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeApproval) { + AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build()).build(); + PsaDocReviewCollection psaDocReviewCollection = + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() + .psaDocument(TARGET_DOCUMENT) + .submittedDate(SUBMITTEDED_DATE) + .submittedBy(SUBMITTEDED_BY) + .submittedByEmail(SUBMITTED_BY_EMAIL) + .build()) + .build(); + + return Arguments.of(judgeApproval, + List.of(agreedDraftOrderCollectionToBeExamined), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("First Directions Appointment (FDA)") + .psaDocReviewCollection(List.of( + psaDocReviewCollection + )) + .build() + ) + .build() + ), + List.of( + RefusedOrderCollection.builder().value(RefusedOrder.builder() + .refusalJudge("Another Judge") + .judgeFeedback("Here is the feedback") + .refusalOrder(CaseDocument.builder().documentUrl("existingRefusedOrder.pdf").build()) + .refusedDocument(CaseDocument.builder().documentUrl("anotherDraftOrderRefused.pdf").build()) + .build()).build(), + RefusedOrderCollection.builder().value(RefusedOrder.builder() + .refusalJudge("Another Judge") + .judgeFeedback("Here is the another feedback") + .refusedDate(FIXED_DATE_TIME.minusDays(10)) + .refusalOrder(CaseDocument.builder().documentUrl("existingRefusedOrder2.pdf").build()) + .refusedDocument(CaseDocument.builder().documentUrl("anotherDraftOrderRefused2.pdf").build()) + .build()).build() + ), + agreedDraftOrderCollectionToBeExamined, + null, + psaDocReviewCollection, + RefusedOrder.builder() + .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) + .judgeFeedback(JUDGE_FEEDBACK) + .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTEDED_DATE).submittedBy(SUBMITTEDED_BY) + .hearingDate(HEARING_DATE) + .build() ); } @@ -455,3 +540,4 @@ public boolean isDraftOrderDocumentReviewAbsent(List order.equals(targetObject)); } } + From c1da2796dc4011cdb96c96f9d4247b2ac461bddf Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:34:55 +0000 Subject: [PATCH 247/336] checkstyle --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 8cfe97715d..402a0cc30c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -324,7 +324,7 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); draftOrdersWrapper.getRefusalOrderIdsToBeSent().stream().findFirst() .ifPresentOrElse(u -> assertEquals(r.getId(), u.getValue()), () -> fail("Unexpected missing refused order id")); - }, () -> fail("Unexpected missing refused order")); + }, () -> fail("Unexpected missing refused order")); } } } From 1ba2a7b545b85755600ebf16b8cf9371df9d5893 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:39:12 +0000 Subject: [PATCH 248/336] typo --- .../JudgeApprovalResolverTest.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 402a0cc30c..e26116321c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -69,9 +69,9 @@ class JudgeApprovalResolverTest { private static final String APPROVED_JUDGE_NAME = "Mary Chapman"; private static final LocalDateTime FIXED_DATE_TIME = LocalDateTime.of(2024, 11, 4, 9, 0, 0); private static final LocalDate HEARING_DATE = LocalDate.of(2024, 1, 1); - private static final String SUBMITTEDED_BY = "Claire"; + private static final String SUBMITTED_BY = "Claire"; private static final String SUBMITTED_BY_EMAIL = "claire@solicitor.com"; - private static final LocalDateTime SUBMITTEDED_DATE = LocalDateTime.of(1989, 6, 4, 0, 0); + private static final LocalDateTime SUBMITTED_DATE = LocalDateTime.of(1989, 6, 4, 0, 0); private static final List ATTACHMENTS = List.of( CaseDocumentCollection.builder().value(CaseDocument.builder().documentUrl("randomDoc.pdf").build()).build() ); @@ -380,9 +380,9 @@ static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean w DraftOrderDocReviewCollection draftOrderDocReviewCollectionToBeExamined = DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder() .draftOrderDocument(TARGET_DOCUMENT) - .submittedBy(SUBMITTEDED_BY) + .submittedBy(SUBMITTED_BY) .submittedByEmail(SUBMITTED_BY_EMAIL) - .submittedDate(SUBMITTEDED_DATE) + .submittedDate(SUBMITTED_DATE) .attachments(withAttachment ? ATTACHMENTS : null) .build()).build(); @@ -417,8 +417,8 @@ static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean w .judgeFeedback(JUDGE_FEEDBACK) .refusalJudge(APPROVED_JUDGE_NAME) .submittedByEmail(SUBMITTED_BY_EMAIL) - .submittedDate(SUBMITTEDED_DATE) - .submittedBy(SUBMITTEDED_BY) + .submittedDate(SUBMITTED_DATE) + .submittedBy(SUBMITTED_BY) .attachments(withAttachment ? ATTACHMENTS : null) .hearingDate(HEARING_DATE) .build() @@ -430,8 +430,8 @@ static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubm AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build()).build(); PsaDocReviewCollection psaDocReviewCollection = PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() - .submittedDate(SUBMITTEDED_DATE) - .submittedBy(SUBMITTEDED_BY) + .submittedDate(SUBMITTED_DATE) + .submittedBy(SUBMITTED_BY) .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null) .psaDocument(TARGET_DOCUMENT) .build()) @@ -459,7 +459,7 @@ static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubm RefusedOrder.builder() .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) .judgeFeedback(JUDGE_FEEDBACK) - .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null).submittedDate(SUBMITTEDED_DATE).submittedBy(SUBMITTEDED_BY) + .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) .hearingDate(HEARING_DATE) .build() ); @@ -471,8 +471,8 @@ static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeA PsaDocReviewCollection psaDocReviewCollection = PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() .psaDocument(TARGET_DOCUMENT) - .submittedDate(SUBMITTEDED_DATE) - .submittedBy(SUBMITTEDED_BY) + .submittedDate(SUBMITTED_DATE) + .submittedBy(SUBMITTED_BY) .submittedByEmail(SUBMITTED_BY_EMAIL) .build()) .build(); @@ -513,7 +513,7 @@ static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeA RefusedOrder.builder() .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) .judgeFeedback(JUDGE_FEEDBACK) - .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTEDED_DATE).submittedBy(SUBMITTEDED_BY) + .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) .hearingDate(HEARING_DATE) .build() ); From 3496ceb00a7a96f483e3bcb2dbb9d13d2511a515 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:42:13 +0000 Subject: [PATCH 249/336] Comment updated. --- .../judgeapproval/ApproveDraftOrdersSubmittedHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index 4bb81b59fa..b2887fa331 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -63,8 +63,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); } else { - // TODO send refusal order by post. - // cloned the logic from ContestedDraftOrderNotApprovedController.sendRefusalReason + // TODO DFR-3497 send refusal order by post. Take a look on ContestedDraftOrderNotApprovedController.sendRefusalReason } }); From 877b2c8ca28369a09bd858850d59d10a0bb0ee72 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:44:30 +0000 Subject: [PATCH 250/336] Method renamed --- .../judgeapproval/ApproveDraftOrdersSubmittedHandler.java | 2 +- .../finrem/caseorchestration/service/NotificationService.java | 4 ++-- .../judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java | 2 +- .../caseorchestration/service/NotificationServiceTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index b2887fa331..d8b325cf68 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -60,7 +60,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .filter(d -> refusalOrderIdsToBeSent.contains(d.getId())) .forEach(a -> { if (!isEmpty(a.getValue().getSubmittedByEmail())) { - notificationService.sendDraftOrderOrPsaRefused(notificationRequestMapper + notificationService.sendRefusedDraftOrderOrPsa(notificationRequestMapper .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); } else { // TODO DFR-3497 send refusal order by post. Take a look on ContestedDraftOrderNotApprovedController.sendRefusalReason diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java index cbee8e45f5..fd8db71219 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationService.java @@ -1973,8 +1973,8 @@ public void sendDraftOrderReviewOverdueToCaseworker(NotificationRequest notifica emailService.sendConfirmationEmail(notificationRequest, FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE); } - public void sendDraftOrderOrPsaRefused(NotificationRequest notificationRequest) { - log.info("{} - Sending draft order or PSA refused", notificationRequest.getCaseReferenceNumber()); + public void sendRefusedDraftOrderOrPsa(NotificationRequest notificationRequest) { + log.info("{} - Sending refused draft order or PSA", notificationRequest.getCaseReferenceNumber()); emailService.sendConfirmationEmail(notificationRequest, FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java index d11633a606..9a37874cc9 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandlerTest.java @@ -69,7 +69,7 @@ void shouldInvokeNotificationServiceForRefusalOrders(DraftOrdersWrapper draftOrd handler.handle(callbackRequest, AUTH_TOKEN); // Assert - verify(notificationService, times(expectedInvocationCount)).sendDraftOrderOrPsaRefused(expectedNotificationRequest); + verify(notificationService, times(expectedInvocationCount)).sendRefusedDraftOrderOrPsa(expectedNotificationRequest); verify(notificationRequestMapper, times(expectedInvocationCount)).buildRefusedDraftOrderOrPsaNotificationRequest(any(FinremCaseDetails.class), any(RefusedOrder.class)); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java index 90ec9861bd..6571d9a90c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java @@ -1637,7 +1637,7 @@ public void testSendDraftOrderOrPsaRefused() { NotificationRequest nr = NotificationRequest.builder() .notificationEmail("test@test.com") .build(); - notificationService.sendDraftOrderOrPsaRefused(nr); + notificationService.sendRefusedDraftOrderOrPsa(nr); ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(NotificationRequest.class); verify(emailService).sendConfirmationEmail(argumentCaptor.capture(), From 518fa6baaac16422d007b8696fdf20a4b7e0a693 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:49:02 +0000 Subject: [PATCH 251/336] java doc --- .../mapper/FinremCaseDetailsMapper.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java index 552629b8ea..54d3e06ad3 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java @@ -36,10 +36,24 @@ public FinremCaseDetails mapToFinremCaseDetails(CaseDetails caseDetails) { .build(); } + /** + * Maps the provided case data to a {@link FinremCaseData} object. + * + * @param caseData a {@link Map} containing the case data to be mapped + * @return a {@link FinremCaseData} object populated with the provided case data + */ public FinremCaseData mapToFinremCaseData(Map caseData) { return mapToFinremCaseData(caseData, null); } + /** + * Maps the provided case data to a {@link FinremCaseData} object, with an optional case type ID. + * + * @param caseData a {@link Map} containing the case data to be mapped + * @param caseTypeId an optional case type ID to set the {@code ccdCaseType} field of the {@link FinremCaseData} object; + * if {@code null}, the {@code ccdCaseType} field will not be set + * @return a {@link FinremCaseData} object populated with the provided case data and the optional case type ID + */ public FinremCaseData mapToFinremCaseData(Map caseData, String caseTypeId) { FinremCaseData data = objectMapper.convertValue(caseData, FinremCaseData.class); if (caseTypeId != null) { From 1f5ceadb6eaed97f550a800c3f96393ee33e7dee Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 11:53:17 +0000 Subject: [PATCH 252/336] Revert "java doc" This reverts commit 518fa6baaac16422d007b8696fdf20a4b7e0a693. --- .../mapper/FinremCaseDetailsMapper.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java index 54d3e06ad3..552629b8ea 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/FinremCaseDetailsMapper.java @@ -36,24 +36,10 @@ public FinremCaseDetails mapToFinremCaseDetails(CaseDetails caseDetails) { .build(); } - /** - * Maps the provided case data to a {@link FinremCaseData} object. - * - * @param caseData a {@link Map} containing the case data to be mapped - * @return a {@link FinremCaseData} object populated with the provided case data - */ public FinremCaseData mapToFinremCaseData(Map caseData) { return mapToFinremCaseData(caseData, null); } - /** - * Maps the provided case data to a {@link FinremCaseData} object, with an optional case type ID. - * - * @param caseData a {@link Map} containing the case data to be mapped - * @param caseTypeId an optional case type ID to set the {@code ccdCaseType} field of the {@link FinremCaseData} object; - * if {@code null}, the {@code ccdCaseType} field will not be set - * @return a {@link FinremCaseData} object populated with the provided case data and the optional case type ID - */ public FinremCaseData mapToFinremCaseData(Map caseData, String caseTypeId) { FinremCaseData data = objectMapper.convertValue(caseData, FinremCaseData.class); if (caseTypeId != null) { From 04ea29c5f959bf2f8762b1f5b97d6d7d6e6bb85b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 12:20:54 +0000 Subject: [PATCH 253/336] renamed --- .../caseorchestration/service/NotificationServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java index 6571d9a90c..b897209ee5 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/NotificationServiceTest.java @@ -1633,7 +1633,7 @@ public void testSendDraftOrderReviewOverdueToCaseworkerSendToFrcDisabled() { } @Test - public void testSendDraftOrderOrPsaRefused() { + public void testSendRefusedDraftOrderOrPsa() { NotificationRequest nr = NotificationRequest.builder() .notificationEmail("test@test.com") .build(); From 5de4183ad9697316bdc2f373a3ed71cae008f65c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 15:28:35 +0000 Subject: [PATCH 254/336] missing personalisation --- .../mapper/DraftOrdersNotificationRequestMapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java index 6c4aa6718f..476024721f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapper.java @@ -17,6 +17,7 @@ import java.time.format.DateTimeFormatter; import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseDataService.nullToEmpty; @Service @Slf4j @@ -82,6 +83,8 @@ public NotificationRequest buildRefusedDraftOrderOrPsaNotificationRequest(Finrem .judgeName(refusedOrder.getRefusalJudge()) .judgeFeedback(refusedOrder.getJudgeFeedback()) .documentName(documentName) + .solicitorReferenceNumber(nullToEmpty(caseData.getContactDetailsWrapper().getSolicitorReference())) + .name(refusedOrder.getSubmittedBy()) .build(); } } From 3c586a2ee2e0793f7a5392e493fc02a700a48a74 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 15:37:09 +0000 Subject: [PATCH 255/336] update test case. --- .../mapper/DraftOrdersNotificationRequestMapperTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java index 88ad64e541..b2a33a656f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/mapper/DraftOrdersNotificationRequestMapperTest.java @@ -183,6 +183,7 @@ void testBuildRefusedDraftOrderOrPsaNotificationRequest() { FinremCaseData caseData = FinremCaseData.builder() .ccdCaseType(CaseType.CONTESTED) .contactDetailsWrapper(ContactDetailsWrapper.builder() + .solicitorReference("A_RANDOM_STRING") .applicantFmName("Charlie") .applicantLname("Hull") .respondentFmName("Stella") @@ -214,6 +215,7 @@ void testBuildRefusedDraftOrderOrPsaNotificationRequest() { .hearingDate(LocalDate.of(2024, 1, 5)) .refusalJudge("Peter Chapman") .judgeFeedback("Judge Feedback") + .submittedBy("Mr. Uploader") .submittedByEmail("hello@world.com") .refusedDocument(CaseDocument.builder().documentFilename("abc.pdf").build()) .build()); @@ -228,5 +230,7 @@ void testBuildRefusedDraftOrderOrPsaNotificationRequest() { assertThat(notificationRequest.getDocumentName()).isEqualTo("abc.pdf"); assertThat(notificationRequest.getJudgeFeedback()).isEqualTo("Judge Feedback"); assertThat(notificationRequest.getJudgeName()).isEqualTo("Peter Chapman"); + assertThat(notificationRequest.getName()).isEqualTo("Mr. Uploader"); + assertThat(notificationRequest.getSolicitorReferenceNumber()).isEqualTo("A_RANDOM_STRING"); } } From 633719c4ea51127376cc25253bdb1f2662aca706 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 16:57:20 +0000 Subject: [PATCH 256/336] missing hearingDate --- .../notifications/service/EmailService.java | 1 + .../notifications/service/EmailServiceTest.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java index e4ae372ac0..f3f978c9a8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java @@ -161,6 +161,7 @@ private void addDraftOrderReviewOverdueTemplateVars(NotificationRequest notifica private void addRefusedDraftOrderOrPsaTemplateVars(NotificationRequest notificationRequest, Map templateVars) { + templateVars.put("hearingDate", notificationRequest.getHearingDate()); templateVars.put("judgeFeedback", notificationRequest.getJudgeFeedback()); templateVars.put("documentName", notificationRequest.getDocumentName()); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java index a0922f12b9..9ff1e0bf79 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java @@ -727,6 +727,8 @@ public void testSendRefusedDraftOrderOrPsa() throws NotificationClientException .selectedCourt("liverpool") .documentName("TEST.doc") .judgeFeedback("Feedback") + .hearingDate("30 December 2024") + .name("Mary") .build(); emailService.sendConfirmationEmail(nr, FR_CONTESTED_DRAFT_ORDER_OR_PSA_REFUSED); @@ -738,7 +740,9 @@ public void testSendRefusedDraftOrderOrPsa() throws NotificationClientException "courtName", "Liverpool FRC", "courtEmail", "FRCLiverpool@Justice.gov.uk", "documentName", "TEST.doc", - "judgeFeedback", "Feedback" + "judgeFeedback", "Feedback", + "hearingDate", "30 December 2024", + "name", "Mary" ); verify(mockClient).sendEmail( From e4cfda7901dc11768b489b2c43789db7f783082a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 17:43:20 +0000 Subject: [PATCH 257/336] refactoring --- .../judgeapproval/JudgeApprovalResolver.java | 187 +-------- .../judgeapproval/RefusedOrderProcessor.java | 220 ++++++++++ .../JudgeApprovalResolverTest.java | 352 ++-------------- .../RefusedOrderProcessorTest.java | 382 ++++++++++++++++++ 4 files changed, 654 insertions(+), 487 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 5c3132f4b7..81b3e1ff4d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -2,47 +2,26 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; @Component @RequiredArgsConstructor @@ -52,11 +31,7 @@ class JudgeApprovalResolver { private final HearingProcessor hearingProcessor; - private final GenericDocumentService genericDocumentService; - - private final DocumentConfiguration documentConfiguration; - - private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + private final RefusedOrderProcessor refusedOrderProcessor; /** * Populates the judge's decision for the given draft orders and updates the status of approvable documents. @@ -91,7 +66,7 @@ void populateJudgeDecision(FinremCaseDetails finremCaseDetails, DraftOrdersWrapp .map(HearingInstruction::getAnotherHearingRequestCollection) .ifPresent(collection -> collection.forEach(a -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, a.getValue()))); } - processRefusedOrders(finremCaseDetails, draftOrdersWrapper, judgeApproval, userAuthorisation); + refusedOrderProcessor.processRefusedOrders(finremCaseDetails, draftOrdersWrapper, judgeApproval, userAuthorisation); } /** @@ -150,160 +125,14 @@ private boolean isJudgeApproved(JudgeApproval judgeApproval) { return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isApproved).orElse(false); } + /** + * Checks whether the judge has refused the draft order. + * + * @param judgeApproval the judge's approval information + * @return true if the judge's decision is to refuse, false otherwise + */ private boolean isJudgeRefused(JudgeApproval judgeApproval) { return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); } - private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, - String judgeName, JudgeType judgeType, String authorisationToken) { - DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); - draftOrdersWrapper.setGeneratedOrderReason(refusalReason); - draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); - draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); - draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); - - try { - return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, - contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, - finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() - ), - documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), - insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), - finremCaseDetails.getId().toString()); - } finally { - // Clear the temp values as they are for report generation purpose. - draftOrdersWrapper.setGeneratedOrderReason(null); - draftOrdersWrapper.setGeneratedOrderRefusedDate(null); - draftOrdersWrapper.setGeneratedOrderJudgeType(null); - draftOrdersWrapper.setGeneratedOrderJudgeName(null); - } - } - - private void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, - JudgeApproval judgeApproval, String userAuthorisation) { - List removedItems = new ArrayList<>(); - List removedPsaItems = new ArrayList<>(); - - // remove refused draft orders/PSAs from agreedDraftOrderCollection - filterRefusedDraftOrderCollections(draftOrdersWrapper); - - // remove refused draft orders/PSAs from PsaDocReviewCollection and DraftOrderDocReviewCollection and collect them - draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection(removedItems, - draftOrdersWrapper.getDraftOrdersReviewCollection())); - draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromPsaDocReviewCollection(removedPsaItems, - draftOrdersWrapper.getDraftOrdersReviewCollection())); - - // create RefusedOrder from collected items. - String judgeFeedback = judgeApproval.getChangesRequestedByJudge(); - LocalDate hearingDate = judgeApproval.getHearingDate(); - - List existingRefusedOrders = - ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new); - - List refusalOrderIds = new ArrayList<>(); - - Function toRefusedOrderCollection = item -> { - if (item.getValue() instanceof RefusalOrderConvertible refusalOrderConvertible) { - UUID uuid = UUID.randomUUID(); - refusalOrderIds.add(uuid); - - RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() - .refusedDocument(refusalOrderConvertible.getRefusedDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), - refusalOrderConvertible.getApprovalJudge(), null, userAuthorisation)) - .refusedDate(refusalOrderConvertible.getRefusedDate()) - .submittedDate(refusalOrderConvertible.getSubmittedDate()) - .submittedBy(refusalOrderConvertible.getSubmittedBy()) - .submittedByEmail(refusalOrderConvertible.getSubmittedByEmail()) - .refusalJudge(refusalOrderConvertible.getApprovalJudge()) - .attachments(item.getValue() instanceof DraftOrderDocumentReview d ? d.getAttachments() : null) - .judgeFeedback(judgeFeedback) - .hearingDate(hearingDate); - - return RefusedOrderCollection.builder().id(uuid).value(orderBuilder.build()).build(); - } else { - return null; - } - }; - - List newRefusedOrders = Stream.concat( - removedItems.stream().filter(a -> a.getValue() != null).map(toRefusedOrderCollection).filter(Objects::nonNull), - removedPsaItems.stream().filter(a -> a.getValue() != null).map(toRefusedOrderCollection).filter(Objects::nonNull) - ).toList(); - - draftOrdersWrapper.setRefusedOrdersCollection( - Stream.concat(existingRefusedOrders.stream(), newRefusedOrders.stream()).toList() - ); - draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UuidCollection::new).toList()); - } - - private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( - List removedItems, - List draftOrdersReviewCollection) { - return filterAndCollectRefusedItemsFromReviewCollection( - removedItems, - draftOrdersReviewCollection, - DraftOrdersReview::getDraftOrderDocReviewCollection, - DraftOrdersReview.DraftOrdersReviewBuilder::draftOrderDocReviewCollection - ); - } - - private List filterAndCollectRefusedItemsFromPsaDocReviewCollection( - List removedItems, - List draftOrdersReviewCollection) { - return filterAndCollectRefusedItemsFromReviewCollection( - removedItems, - draftOrdersReviewCollection, - DraftOrdersReview::getPsaDocReviewCollection, - DraftOrdersReview.DraftOrdersReviewBuilder::psaDocReviewCollection - ); - } - - private List filterAndCollectRefusedItemsFromReviewCollection( - List removedItemsCollector, - List draftOrdersReviewCollection, - Function> getReviewCollection, - BiConsumer> setReviewCollection) { - - return ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream() - .map(draftOrdersReview -> { - DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); - - // Partition items into kept and removed - Map> partitioned = - partitionRefusedDraftOrderDocReviewCollection(getReviewCollection.apply(draftOrdersReview.getValue())); - - // Keep the items not matching the status - setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); - - // Collect the removed items - if (removedItemsCollector != null) { - removedItemsCollector.addAll(partitioned.get(true)); - } - - // Create a new DraftOrdersReviewCollection - DraftOrdersReviewCollection updatedCollection = new DraftOrdersReviewCollection(); - updatedCollection.setValue(updatedReviewBuilder.build()); - return updatedCollection; - }) - .toList(); - } - - private void filterRefusedDraftOrderCollections(DraftOrdersWrapper draftOrdersWrapper) { - Map> partitioned = - partitionRefusedDraftOrderDocReviewCollection(draftOrdersWrapper.getAgreedDraftOrderCollection()); - draftOrdersWrapper.setAgreedDraftOrderCollection(partitioned.get(false)); - } - - private Map> partitionRefusedDraftOrderDocReviewCollection(List draftOrderDocReviewCollection) { - return ofNullable(draftOrderDocReviewCollection).orElse(List.of()).stream() - .collect(Collectors.partitioningBy( - docReview -> ofNullable(docReview) - .map(HasApprovable::getValue) - .map(Approvable::getOrderStatus) - .filter(REFUSED::equals) - .isPresent() - )); - } - } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java new file mode 100644 index 0000000000..e7136fe954 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -0,0 +1,220 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; + +@Component +@RequiredArgsConstructor +public class RefusedOrderProcessor { + + private final GenericDocumentService genericDocumentService; + + private final DocumentConfiguration documentConfiguration; + + private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + + /** + * Processes refused draft orders and pension sharing annexes (PSAs) by removing them from collections, + * creating refused orders, and updating the {@link DraftOrdersWrapper}. + * + *

    This method performs the following actions:

    + *
      + *
    • Removes refused draft orders and PSAs from their respective collections in the {@link DraftOrdersWrapper}.
      • + *
    • Collects the removed items and converts them into {@link RefusedOrderCollection} objects.
      • + *
    • Creates a refusal order document for each refused item, including judge feedback and hearing details.
      • + *
    • Updates the {@link DraftOrdersWrapper} with the new list of refused orders and the associated UUIDs.
      • + *
    + * + * @param finremCaseDetails the case details containing data required to generate refusal orders + * @param draftOrdersWrapper the wrapper object containing collections of draft orders and PSAs + * @param judgeApproval the judge's decision details, including feedback and hearing date + * @param userAuthorisation the authorisation token for the current user + */ + public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, + JudgeApproval judgeApproval, String userAuthorisation) { + List removedItems = new ArrayList<>(); + List removedPsaItems = new ArrayList<>(); + + // remove refused draft orders/PSAs from agreedDraftOrderCollection + filterRefusedDraftOrderCollections(draftOrdersWrapper); + + // remove refused draft orders/PSAs from PsaDocReviewCollection and DraftOrderDocReviewCollection and collect them + draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection(removedItems, + draftOrdersWrapper.getDraftOrdersReviewCollection())); + draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromPsaDocReviewCollection(removedPsaItems, + draftOrdersWrapper.getDraftOrdersReviewCollection())); + + // create RefusedOrder from collected items. + String judgeFeedback = judgeApproval.getChangesRequestedByJudge(); + LocalDate hearingDate = judgeApproval.getHearingDate(); + + List existingRefusedOrders = + ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElseGet(ArrayList::new); + + List refusalOrderIds = new ArrayList<>(); + + Function toRefusedOrderCollection = item -> { + if (item.getValue() instanceof RefusalOrderConvertible refusalOrderConvertible) { + UUID uuid = UUID.randomUUID(); + refusalOrderIds.add(uuid); + + RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() + .refusedDocument(refusalOrderConvertible.getRefusedDocument()) + .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), + refusalOrderConvertible.getApprovalJudge(), null, userAuthorisation)) + .refusedDate(refusalOrderConvertible.getRefusedDate()) + .submittedDate(refusalOrderConvertible.getSubmittedDate()) + .submittedBy(refusalOrderConvertible.getSubmittedBy()) + .submittedByEmail(refusalOrderConvertible.getSubmittedByEmail()) + .refusalJudge(refusalOrderConvertible.getApprovalJudge()) + .attachments(item.getValue() instanceof DraftOrderDocumentReview d ? d.getAttachments() : null) + .judgeFeedback(judgeFeedback) + .hearingDate(hearingDate); + + return RefusedOrderCollection.builder().id(uuid).value(orderBuilder.build()).build(); + } else { + return null; + } + }; + + List newRefusedOrders = Stream.concat( + removedItems.stream().filter(a -> a.getValue() != null).map(toRefusedOrderCollection).filter(Objects::nonNull), + removedPsaItems.stream().filter(a -> a.getValue() != null).map(toRefusedOrderCollection).filter(Objects::nonNull) + ).toList(); + + draftOrdersWrapper.setRefusedOrdersCollection( + Stream.concat(existingRefusedOrders.stream(), newRefusedOrders.stream()).toList() + ); + draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UuidCollection::new).toList()); + } + + private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, + String judgeName, JudgeType judgeType, String authorisationToken) { + DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); + draftOrdersWrapper.setGeneratedOrderReason(refusalReason); + draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); + draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); + draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); + + try { + return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, + contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() + ), + documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), + insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), + finremCaseDetails.getId().toString()); + } finally { + // Clear the temp values as they are for report generation purpose. + draftOrdersWrapper.setGeneratedOrderReason(null); + draftOrdersWrapper.setGeneratedOrderRefusedDate(null); + draftOrdersWrapper.setGeneratedOrderJudgeType(null); + draftOrdersWrapper.setGeneratedOrderJudgeName(null); + } + } + + private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( + List removedItems, + List draftOrdersReviewCollection) { + return filterAndCollectRefusedItemsFromReviewCollection( + removedItems, + draftOrdersReviewCollection, + DraftOrdersReview::getDraftOrderDocReviewCollection, + DraftOrdersReview.DraftOrdersReviewBuilder::draftOrderDocReviewCollection + ); + } + + private List filterAndCollectRefusedItemsFromPsaDocReviewCollection( + List removedItems, + List draftOrdersReviewCollection) { + return filterAndCollectRefusedItemsFromReviewCollection( + removedItems, + draftOrdersReviewCollection, + DraftOrdersReview::getPsaDocReviewCollection, + DraftOrdersReview.DraftOrdersReviewBuilder::psaDocReviewCollection + ); + } + + private List filterAndCollectRefusedItemsFromReviewCollection( + List removedItemsCollector, + List draftOrdersReviewCollection, + Function> getReviewCollection, + BiConsumer> setReviewCollection) { + + return ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream() + .map(draftOrdersReview -> { + DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); + + // Partition items into kept and removed + Map> partitioned = + partitionRefusedDraftOrderDocReviewCollection(getReviewCollection.apply(draftOrdersReview.getValue())); + + // Keep the items not matching the status + setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); + + // Collect the removed items + if (removedItemsCollector != null) { + removedItemsCollector.addAll(partitioned.get(true)); + } + + // Create a new DraftOrdersReviewCollection + DraftOrdersReviewCollection updatedCollection = new DraftOrdersReviewCollection(); + updatedCollection.setValue(updatedReviewBuilder.build()); + return updatedCollection; + }) + .toList(); + } + + private void filterRefusedDraftOrderCollections(DraftOrdersWrapper draftOrdersWrapper) { + Map> partitioned = + partitionRefusedDraftOrderDocReviewCollection(draftOrdersWrapper.getAgreedDraftOrderCollection()); + draftOrdersWrapper.setAgreedDraftOrderCollection(partitioned.get(false)); + } + + private Map> partitionRefusedDraftOrderDocReviewCollection(List draftOrderDocReviewCollection) { + return ofNullable(draftOrderDocReviewCollection).orElse(List.of()).stream() + .collect(Collectors.partitioningBy( + docReview -> ofNullable(docReview) + .map(HasApprovable::getValue) + .map(Approvable::getOrderStatus) + .filter(REFUSED::equals) + .isPresent() + )); + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index e26116321c..0a6fe5db9e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -9,19 +10,16 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -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.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -29,52 +27,31 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Comparator; import java.util.List; -import java.util.Optional; import java.util.stream.Stream; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.CASE_ID; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @ExtendWith(MockitoExtension.class) class JudgeApprovalResolverTest { - private static final CaseDocument TARGET_DOCUMENT = CaseDocument.builder().documentUrl("targetUrl").build(); - private static final CaseDocument GENERATED_REFUSED_ORDER = CaseDocument.builder().documentUrl("generatedRefusedOrder.pdf").build(); - private static final String JUDGE_FEEDBACK = "Refusal reason"; private static final String APPROVED_JUDGE_NAME = "Mary Chapman"; private static final LocalDateTime FIXED_DATE_TIME = LocalDateTime.of(2024, 11, 4, 9, 0, 0); - private static final LocalDate HEARING_DATE = LocalDate.of(2024, 1, 1); - private static final String SUBMITTED_BY = "Claire"; - private static final String SUBMITTED_BY_EMAIL = "claire@solicitor.com"; - private static final LocalDateTime SUBMITTED_DATE = LocalDateTime.of(1989, 6, 4, 0, 0); - private static final List ATTACHMENTS = List.of( - CaseDocumentCollection.builder().value(CaseDocument.builder().documentUrl("randomDoc.pdf").build()).build() - ); + private static final CaseDocument TARGET_DOCUMENT = CaseDocument.builder().documentUrl("targetUrl").build(); @InjectMocks private JudgeApprovalResolver judgeApprovalResolver; @@ -86,13 +63,7 @@ class JudgeApprovalResolverTest { private HearingProcessor hearingProcessor; @Mock - private GenericDocumentService genericDocumentService; - - @Mock - private DocumentConfiguration documentConfiguration; - - @Mock - private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + private RefusedOrderProcessor refusedOrderProcessor; @ParameterizedTest @MethodSource("provideShouldInvokeProcessHearingInstructionData") @@ -258,286 +229,51 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova ); } - @ParameterizedTest - @MethodSource("provideProcessRefusedDocumentsAndUpdateTheirState") - void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApproval, - List agreedDraftOrderCollections, - List draftOrdersReviewCollection, - List existingRefusedOrders, - AgreedDraftOrderCollection targetAgreedDraftOrderCollection, - DraftOrderDocReviewCollection targetDraftOrderDocReviewCollection, - PsaDocReviewCollection targetPsaDocReviewCollection, - RefusedOrder expectedRefusedOrder) { - DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder() - .agreedDraftOrderCollection(agreedDraftOrderCollections) - .draftOrdersReviewCollection(draftOrdersReviewCollection) - .refusedOrdersCollection(existingRefusedOrders) - .build(); + @Test + void shouldProcessRefusedApprovablesAndUpdateTheirState() { + AgreedDraftOrder sample1 = null; + DraftOrderDocumentReview sample2 = null; + DraftOrdersWrapper.DraftOrdersWrapperBuilder dowBuilder = DraftOrdersWrapper.builder(); + dowBuilder.agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(sample1 = AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT).build()).build() + )); + dowBuilder.draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder() + .value(sample2 = DraftOrderDocumentReview.builder().draftOrderDocument(TARGET_DOCUMENT).build()) + .build() + )) + .build()) + .build() + )); + + FinremCaseDetails finremCaseDetails = FinremCaseDetails.builder().build(); + DraftOrdersWrapper draftOrdersWrapper = null; + JudgeApproval ja = null; // Mocking IDAM service for getting judge's full name lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn(APPROVED_JUDGE_NAME); - lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn("RefusalOrder.doc"); - lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(any(FinremCaseDetails.class))).thenReturn("TemplateName"); - lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(anyString(), anyMap(), anyString(), anyString(), anyString())) - .thenReturn(GENERATED_REFUSED_ORDER); try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { mockedStatic.when(LocalDateTime::now).thenReturn(FIXED_DATE_TIME); - judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder() - .id(Long.valueOf(CASE_ID)) - .data(FinremCaseData.builder() - .draftOrdersWrapper(draftOrdersWrapper) - .build()) - .build(), - draftOrdersWrapper, judgeApproval.getDocument(), judgeApproval, AUTH_TOKEN); - - assertNull(draftOrdersWrapper.getGeneratedOrderReason()); - assertNull(draftOrdersWrapper.getGeneratedOrderRefusedDate()); - assertNull(draftOrdersWrapper.getGeneratedOrderJudgeName()); - assertNull(draftOrdersWrapper.getGeneratedOrderJudgeType()); - - // expected refusal order count - int result = Stream.of( - Optional.ofNullable(targetAgreedDraftOrderCollection), - Optional.ofNullable(targetDraftOrderDocReviewCollection), - Optional.ofNullable(targetPsaDocReviewCollection) - ).allMatch(Optional::isEmpty) ? 0 : 1; - - assertThat(draftOrdersWrapper.getRefusedOrdersCollection()).hasSize(existingRefusedOrders.size() + result); - - if (result != 0) { - assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); - // verify agreedDraftOrderToBeExamined is removed - assertTrue(isAgreedDraftOrderAbsent(draftOrdersWrapper.getAgreedDraftOrderCollection(), targetAgreedDraftOrderCollection)); - - List newDraftOrdersReviewCollections = draftOrdersWrapper.getDraftOrdersReviewCollection(); - if (targetDraftOrderDocReviewCollection != null) { - assertTrue(isDraftOrderDocumentReviewAbsent(newDraftOrdersReviewCollections, targetDraftOrderDocReviewCollection)); - } - if (targetPsaDocReviewCollection != null) { - assertTrue(isPsaDocumentReviewAbsent(newDraftOrdersReviewCollections, targetPsaDocReviewCollection)); - } - draftOrdersWrapper.getRefusedOrdersCollection().stream() - .max(Comparator.comparing(r -> r.getValue().getRefusedDate(), Comparator.nullsFirst(Comparator.naturalOrder()))) - .ifPresentOrElse(r -> { - assertEquals(expectedRefusedOrder, r.getValue()); - assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); - draftOrdersWrapper.getRefusalOrderIdsToBeSent().stream().findFirst() - .ifPresentOrElse(u -> assertEquals(r.getId(), u.getValue()), () -> fail("Unexpected missing refused order id")); - }, () -> fail("Unexpected missing refused order")); - } + judgeApprovalResolver.populateJudgeDecision(finremCaseDetails, + draftOrdersWrapper = dowBuilder.build(), TARGET_DOCUMENT, ja = JudgeApproval.builder() + .judgeDecision(JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE) + .document(TARGET_DOCUMENT) + .changesRequestedByJudge("FEEDBACK") + .build(), AUTH_TOKEN); + + assertEquals(OrderStatus.REFUSED, sample1.getOrderStatus()); + assertEquals(OrderStatus.REFUSED, sample2.getOrderStatus()); + assertEquals(FIXED_DATE_TIME, sample2.getRefusedDate()); + assertNull(sample1.getApprovalDate()); + assertNull(sample2.getApprovalDate()); + assertNull(sample1.getApprovalJudge()); // AgreedDraftOrder doesn't store approvalJudge + assertEquals(APPROVED_JUDGE_NAME, sample2.getApprovalJudge()); + verify(refusedOrderProcessor).processRefusedOrders(finremCaseDetails, draftOrdersWrapper, ja, AUTH_TOKEN); + verify(hearingProcessor, never()).processHearingInstruction(eq(draftOrdersWrapper), any(AnotherHearingRequest.class)); } } - - static Stream provideProcessRefusedDocumentsAndUpdateTheirState() { - JudgeApproval judgeApproval = JudgeApproval.builder() - .hearingDate(HEARING_DATE) - .judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE) - .changesRequestedByJudge(JUDGE_FEEDBACK) - .document(TARGET_DOCUMENT) - .build(); - return Stream.of( - targetDocNotFound(judgeApproval), - refuseTargetedDraftOrder(judgeApproval, true), - refuseTargetedDraftOrder(judgeApproval, false), - refuseTargetedPsa(judgeApproval, true), - refuseTargetedPsa(judgeApproval, false), - refuseTargetedPsaWithExistingRefusedOrders(judgeApproval) - ); - } - - static Arguments targetDocNotFound(JudgeApproval judgeApproval) { - return Arguments.of(judgeApproval, - List.of(), - List.of( - DraftOrdersReviewCollection.builder() - .value( - DraftOrdersReview.builder() - .hearingJudge("Peter Chapman") - .hearingType("Hearing 1") - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(PsaDocumentReview.builder().build()).build()) - ) - .draftOrderDocReviewCollection(List.of( - DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder().build()).build() - )) - .build() - ) - .build() - ), - List.of(), - null, - null, - null, - null - ); - } - - static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean withAttachment) { - AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = - AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT).build()).build(); - - DraftOrderDocReviewCollection draftOrderDocReviewCollectionToBeExamined = - DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder() - .draftOrderDocument(TARGET_DOCUMENT) - .submittedBy(SUBMITTED_BY) - .submittedByEmail(SUBMITTED_BY_EMAIL) - .submittedDate(SUBMITTED_DATE) - .attachments(withAttachment ? ATTACHMENTS : null) - .build()).build(); - - return Arguments.of(judgeApproval, - List.of(agreedDraftOrderCollectionToBeExamined), - List.of( - DraftOrdersReviewCollection.builder() - .value( - DraftOrdersReview.builder() - .hearingJudge("Peter Chapman") - .hearingType("First Directions Appointment (FDA)") - .psaDocReviewCollection(List.of( - PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() - .psaDocument(CaseDocument.builder().build()).build()) - .build() - )) - .draftOrderDocReviewCollection(List.of( - draftOrderDocReviewCollectionToBeExamined - )) - .build() - ) - .build() - ), - List.of(), - agreedDraftOrderCollectionToBeExamined, - draftOrderDocReviewCollectionToBeExamined, - null, - RefusedOrder.builder() - .refusedDate(FIXED_DATE_TIME) - .refusedDocument(TARGET_DOCUMENT) - .refusalOrder(GENERATED_REFUSED_ORDER) - .judgeFeedback(JUDGE_FEEDBACK) - .refusalJudge(APPROVED_JUDGE_NAME) - .submittedByEmail(SUBMITTED_BY_EMAIL) - .submittedDate(SUBMITTED_DATE) - .submittedBy(SUBMITTED_BY) - .attachments(withAttachment ? ATTACHMENTS : null) - .hearingDate(HEARING_DATE) - .build() - ); - } - - static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubmittedByEmail) { - AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = - AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build()).build(); - PsaDocReviewCollection psaDocReviewCollection = - PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() - .submittedDate(SUBMITTED_DATE) - .submittedBy(SUBMITTED_BY) - .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null) - .psaDocument(TARGET_DOCUMENT) - .build()) - .build(); - - return Arguments.of(judgeApproval, - List.of(agreedDraftOrderCollectionToBeExamined), - List.of( - DraftOrdersReviewCollection.builder() - .value( - DraftOrdersReview.builder() - .hearingJudge("Peter Chapman") - .hearingType("First Directions Appointment (FDA)") - .psaDocReviewCollection(List.of( - psaDocReviewCollection - )) - .build() - ) - .build() - ), - List.of(), - agreedDraftOrderCollectionToBeExamined, - null, - psaDocReviewCollection, - RefusedOrder.builder() - .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) - .judgeFeedback(JUDGE_FEEDBACK) - .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) - .hearingDate(HEARING_DATE) - .build() - ); - } - - static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeApproval) { - AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = - AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build()).build(); - PsaDocReviewCollection psaDocReviewCollection = - PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() - .psaDocument(TARGET_DOCUMENT) - .submittedDate(SUBMITTED_DATE) - .submittedBy(SUBMITTED_BY) - .submittedByEmail(SUBMITTED_BY_EMAIL) - .build()) - .build(); - - return Arguments.of(judgeApproval, - List.of(agreedDraftOrderCollectionToBeExamined), - List.of( - DraftOrdersReviewCollection.builder() - .value( - DraftOrdersReview.builder() - .hearingJudge("Peter Chapman") - .hearingType("First Directions Appointment (FDA)") - .psaDocReviewCollection(List.of( - psaDocReviewCollection - )) - .build() - ) - .build() - ), - List.of( - RefusedOrderCollection.builder().value(RefusedOrder.builder() - .refusalJudge("Another Judge") - .judgeFeedback("Here is the feedback") - .refusalOrder(CaseDocument.builder().documentUrl("existingRefusedOrder.pdf").build()) - .refusedDocument(CaseDocument.builder().documentUrl("anotherDraftOrderRefused.pdf").build()) - .build()).build(), - RefusedOrderCollection.builder().value(RefusedOrder.builder() - .refusalJudge("Another Judge") - .judgeFeedback("Here is the another feedback") - .refusedDate(FIXED_DATE_TIME.minusDays(10)) - .refusalOrder(CaseDocument.builder().documentUrl("existingRefusedOrder2.pdf").build()) - .refusedDocument(CaseDocument.builder().documentUrl("anotherDraftOrderRefused2.pdf").build()) - .build()).build() - ), - agreedDraftOrderCollectionToBeExamined, - null, - psaDocReviewCollection, - RefusedOrder.builder() - .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) - .judgeFeedback(JUDGE_FEEDBACK) - .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) - .hearingDate(HEARING_DATE) - .build() - ); - } - - public boolean isAgreedDraftOrderAbsent(List agreedDraftOrderCollections, AgreedDraftOrderCollection targetObject) { - return agreedDraftOrderCollections.stream().noneMatch(order -> order.equals(targetObject)); - } - - public boolean isPsaDocumentReviewAbsent(List draftOrdersReviewCollections, PsaDocReviewCollection targetObject) { - return draftOrdersReviewCollections.stream() - .map(DraftOrdersReviewCollection::getValue) // Extract DraftOrdersReview - .filter(draftOrdersReview -> draftOrdersReview.getPsaDocReviewCollection() != null) // Filter non-null collections - .flatMap(draftOrdersReview -> draftOrdersReview.getPsaDocReviewCollection().stream()) // Flatten to PsaDocReviewCollection - .noneMatch(order -> order.equals(targetObject)); - } - - public boolean isDraftOrderDocumentReviewAbsent(List draftOrdersReviewCollections, - DraftOrderDocReviewCollection targetObject) { - return draftOrdersReviewCollections.stream() - .map(DraftOrdersReviewCollection::getValue) // Extract DraftOrdersReview - .filter(draftOrdersReview -> draftOrdersReview.getDraftOrderDocReviewCollection() != null) // Filter non-null collections - .flatMap(draftOrdersReview -> draftOrdersReview.getDraftOrderDocReviewCollection().stream()) // Flatten to DraftOrderDocReviewCollection - .noneMatch(order -> order.equals(targetObject)); - } } - diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java new file mode 100644 index 0000000000..c9b8ef9b81 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java @@ -0,0 +1,382 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.lenient; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.CASE_ID; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; + +@ExtendWith(MockitoExtension.class) +class RefusedOrderProcessorTest { + + private static final CaseDocument TARGET_DOCUMENT = CaseDocument.builder().documentUrl("targetUrl").build(); + private static final CaseDocument GENERATED_REFUSED_ORDER = CaseDocument.builder().documentUrl("generatedRefusedOrder.pdf").build(); + private static final String JUDGE_FEEDBACK = "Refusal reason"; + private static final String APPROVED_JUDGE_NAME = "Mary Chapman"; + private static final LocalDateTime FIXED_DATE_TIME = LocalDateTime.of(2024, 11, 4, 9, 0, 0); + private static final LocalDate HEARING_DATE = LocalDate.of(2024, 1, 1); + private static final String SUBMITTED_BY = "Claire"; + private static final String SUBMITTED_BY_EMAIL = "claire@solicitor.com"; + private static final LocalDateTime SUBMITTED_DATE = LocalDateTime.of(1989, 6, 4, 0, 0); + private static final List ATTACHMENTS = List.of( + CaseDocumentCollection.builder().value(CaseDocument.builder().documentUrl("randomDoc.pdf").build()).build() + ); + + @InjectMocks + private RefusedOrderProcessor underTest; + + @Mock + private GenericDocumentService genericDocumentService; + + @Mock + private DocumentConfiguration documentConfiguration; + + @Mock + private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + + @ParameterizedTest + @MethodSource("provideProcessRefusedDocumentsAndUpdateTheirState") + void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApproval, + List agreedDraftOrderCollections, + List draftOrdersReviewCollection, + List existingRefusedOrders, + AgreedDraftOrderCollection targetAgreedDraftOrderCollection, + DraftOrderDocReviewCollection targetDraftOrderDocReviewCollection, + PsaDocReviewCollection targetPsaDocReviewCollection, + RefusedOrder expectedRefusedOrder) { + DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder() + .agreedDraftOrderCollection(agreedDraftOrderCollections) + .draftOrdersReviewCollection(draftOrdersReviewCollection) + .refusedOrdersCollection(existingRefusedOrders) + .build(); + + lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn("RefusalOrder.doc"); + lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(any(FinremCaseDetails.class))).thenReturn("TemplateName"); + lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(anyString(), anyMap(), anyString(), anyString(), anyString())) + .thenReturn(GENERATED_REFUSED_ORDER); + + try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { + mockedStatic.when(LocalDateTime::now).thenReturn(FIXED_DATE_TIME); + + underTest.processRefusedOrders(FinremCaseDetails.builder() + .id(Long.valueOf(CASE_ID)) + .data(FinremCaseData.builder() + .draftOrdersWrapper(draftOrdersWrapper) + .build()) + .build(), + draftOrdersWrapper, judgeApproval, AUTH_TOKEN); + + assertNull(draftOrdersWrapper.getGeneratedOrderReason()); + assertNull(draftOrdersWrapper.getGeneratedOrderRefusedDate()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeName()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeType()); + + // expected refusal order count + int result = Stream.of( + Optional.ofNullable(targetAgreedDraftOrderCollection), + Optional.ofNullable(targetDraftOrderDocReviewCollection), + Optional.ofNullable(targetPsaDocReviewCollection) + ).allMatch(Optional::isEmpty) ? 0 : 1; + + assertThat(draftOrdersWrapper.getRefusedOrdersCollection()).hasSize(existingRefusedOrders.size() + result); + + if (result != 0) { + assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); + // verify agreedDraftOrderToBeExamined is removed + assertTrue(isAgreedDraftOrderAbsent(draftOrdersWrapper.getAgreedDraftOrderCollection(), targetAgreedDraftOrderCollection)); + + List newDraftOrdersReviewCollections = draftOrdersWrapper.getDraftOrdersReviewCollection(); + if (targetDraftOrderDocReviewCollection != null) { + assertTrue(isDraftOrderDocumentReviewAbsent(newDraftOrdersReviewCollections, targetDraftOrderDocReviewCollection)); + } + if (targetPsaDocReviewCollection != null) { + assertTrue(isPsaDocumentReviewAbsent(newDraftOrdersReviewCollections, targetPsaDocReviewCollection)); + } + draftOrdersWrapper.getRefusedOrdersCollection().stream() + .max(Comparator.comparing(r -> r.getValue().getRefusedDate(), Comparator.nullsFirst(Comparator.naturalOrder()))) + .ifPresentOrElse(r -> { + assertEquals(expectedRefusedOrder, r.getValue()); + assertThat(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).hasSize(1); + draftOrdersWrapper.getRefusalOrderIdsToBeSent().stream().findFirst() + .ifPresentOrElse(u -> assertEquals(r.getId(), u.getValue()), () -> fail("Unexpected missing refused order id")); + }, () -> fail("Unexpected missing refused order")); + } + } + } + + static Stream provideProcessRefusedDocumentsAndUpdateTheirState() { + JudgeApproval judgeApproval = JudgeApproval.builder() + .hearingDate(HEARING_DATE) + .judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE) + .changesRequestedByJudge(JUDGE_FEEDBACK) + .document(TARGET_DOCUMENT) + .build(); + return Stream.of( + targetDocNotFound(judgeApproval), + refuseTargetedDraftOrder(judgeApproval, true), + refuseTargetedDraftOrder(judgeApproval, false), + refuseTargetedPsa(judgeApproval, true), + refuseTargetedPsa(judgeApproval, false), + refuseTargetedPsaWithExistingRefusedOrders(judgeApproval) + ); + } + + static Arguments targetDocNotFound(JudgeApproval judgeApproval) { + return Arguments.of(judgeApproval, + List.of(), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("Hearing 1") + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder().build()).build()) + ) + .draftOrderDocReviewCollection(List.of( + DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder().build()).build() + )) + .build() + ) + .build() + ), + List.of(), + null, + null, + null, + null + ); + } + + static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean withAttachment) { + AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder() + .draftOrder(TARGET_DOCUMENT) + .orderStatus(OrderStatus.REFUSED) + .build()) + .build(); + + DraftOrderDocReviewCollection draftOrderDocReviewCollectionToBeExamined = + DraftOrderDocReviewCollection.builder().value(DraftOrderDocumentReview.builder() + .draftOrderDocument(TARGET_DOCUMENT) + .submittedBy(SUBMITTED_BY) + .submittedByEmail(SUBMITTED_BY_EMAIL) + .submittedDate(SUBMITTED_DATE) + .attachments(withAttachment ? ATTACHMENTS : null) + .orderStatus(OrderStatus.REFUSED) + .refusedDate(FIXED_DATE_TIME) + .approvalJudge("Mary Chapman") + .build()).build(); + + return Arguments.of(judgeApproval, + List.of(agreedDraftOrderCollectionToBeExamined), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("First Directions Appointment (FDA)") + .psaDocReviewCollection(List.of( + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() + .psaDocument(CaseDocument.builder().build()).build()) + .build() + )) + .draftOrderDocReviewCollection(List.of( + draftOrderDocReviewCollectionToBeExamined + )) + .build() + ) + .build() + ), + List.of(), + agreedDraftOrderCollectionToBeExamined, + draftOrderDocReviewCollectionToBeExamined, + null, + RefusedOrder.builder() + .refusedDate(FIXED_DATE_TIME) + .refusedDocument(TARGET_DOCUMENT) + .refusalOrder(GENERATED_REFUSED_ORDER) + .judgeFeedback(JUDGE_FEEDBACK) + .refusalJudge(APPROVED_JUDGE_NAME) + .submittedByEmail(SUBMITTED_BY_EMAIL) + .submittedDate(SUBMITTED_DATE) + .submittedBy(SUBMITTED_BY) + .attachments(withAttachment ? ATTACHMENTS : null) + .hearingDate(HEARING_DATE) + .build() + ); + } + + static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubmittedByEmail) { + AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder() + .pensionSharingAnnex(TARGET_DOCUMENT) + .orderStatus(OrderStatus.REFUSED) + .build()) + .build(); + PsaDocReviewCollection psaDocReviewCollection = + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() + .submittedDate(SUBMITTED_DATE) + .submittedBy(SUBMITTED_BY) + .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null) + .psaDocument(TARGET_DOCUMENT) + .orderStatus(OrderStatus.REFUSED) + .refusedDate(FIXED_DATE_TIME) + .approvalJudge("Mary Chapman") + .build()) + .build(); + + return Arguments.of(judgeApproval, + List.of(agreedDraftOrderCollectionToBeExamined), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("First Directions Appointment (FDA)") + .psaDocReviewCollection(List.of( + psaDocReviewCollection + )) + .build() + ) + .build() + ), + List.of(), + agreedDraftOrderCollectionToBeExamined, + null, + psaDocReviewCollection, + RefusedOrder.builder() + .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) + .judgeFeedback(JUDGE_FEEDBACK) + .submittedByEmail(withSubmittedByEmail ? SUBMITTED_BY_EMAIL : null).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) + .hearingDate(HEARING_DATE) + .build() + ); + } + + static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeApproval) { + AgreedDraftOrderCollection agreedDraftOrderCollectionToBeExamined = + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder() + .pensionSharingAnnex(TARGET_DOCUMENT) + .orderStatus(OrderStatus.REFUSED) + .build()) + .build(); + PsaDocReviewCollection psaDocReviewCollection = + PsaDocReviewCollection.builder().value(PsaDocumentReview.builder() + .psaDocument(TARGET_DOCUMENT) + .submittedDate(SUBMITTED_DATE) + .submittedBy(SUBMITTED_BY) + .submittedByEmail(SUBMITTED_BY_EMAIL) + .orderStatus(OrderStatus.REFUSED) + .refusedDate(FIXED_DATE_TIME) + .approvalJudge("Mary Chapman") + .build()) + .build(); + + return Arguments.of(judgeApproval, + List.of(agreedDraftOrderCollectionToBeExamined), + List.of( + DraftOrdersReviewCollection.builder() + .value( + DraftOrdersReview.builder() + .hearingJudge("Peter Chapman") + .hearingType("First Directions Appointment (FDA)") + .psaDocReviewCollection(List.of( + psaDocReviewCollection + )) + .build() + ) + .build() + ), + List.of( + RefusedOrderCollection.builder().value(RefusedOrder.builder() + .refusalJudge("Another Judge") + .judgeFeedback("Here is the feedback") + .refusalOrder(CaseDocument.builder().documentUrl("existingRefusedOrder.pdf").build()) + .refusedDocument(CaseDocument.builder().documentUrl("anotherDraftOrderRefused.pdf").build()) + .build()).build(), + RefusedOrderCollection.builder().value(RefusedOrder.builder() + .refusalJudge("Another Judge") + .judgeFeedback("Here is the another feedback") + .refusedDate(FIXED_DATE_TIME.minusDays(10)) + .refusalOrder(CaseDocument.builder().documentUrl("existingRefusedOrder2.pdf").build()) + .refusedDocument(CaseDocument.builder().documentUrl("anotherDraftOrderRefused2.pdf").build()) + .build()).build() + ), + agreedDraftOrderCollectionToBeExamined, + null, + psaDocReviewCollection, + RefusedOrder.builder() + .refusedDate(FIXED_DATE_TIME).refusedDocument(TARGET_DOCUMENT).refusalOrder(GENERATED_REFUSED_ORDER).refusalJudge(APPROVED_JUDGE_NAME) + .judgeFeedback(JUDGE_FEEDBACK) + .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) + .hearingDate(HEARING_DATE) + .build() + ); + } + + public boolean isAgreedDraftOrderAbsent(List agreedDraftOrderCollections, AgreedDraftOrderCollection targetObject) { + return agreedDraftOrderCollections.stream().noneMatch(order -> order.equals(targetObject)); + } + + public boolean isPsaDocumentReviewAbsent(List draftOrdersReviewCollections, PsaDocReviewCollection targetObject) { + return draftOrdersReviewCollections.stream() + .map(DraftOrdersReviewCollection::getValue) // Extract DraftOrdersReview + .filter(draftOrdersReview -> draftOrdersReview.getPsaDocReviewCollection() != null) // Filter non-null collections + .flatMap(draftOrdersReview -> draftOrdersReview.getPsaDocReviewCollection().stream()) // Flatten to PsaDocReviewCollection + .noneMatch(order -> order.equals(targetObject)); + } + + public boolean isDraftOrderDocumentReviewAbsent(List draftOrdersReviewCollections, + DraftOrderDocReviewCollection targetObject) { + return draftOrdersReviewCollections.stream() + .map(DraftOrdersReviewCollection::getValue) // Extract DraftOrdersReview + .filter(draftOrdersReview -> draftOrdersReview.getDraftOrderDocReviewCollection() != null) // Filter non-null collections + .flatMap(draftOrdersReview -> draftOrdersReview.getDraftOrderDocReviewCollection().stream()) // Flatten to DraftOrderDocReviewCollection + .noneMatch(order -> order.equals(targetObject)); + } +} From 286282b83fa71931153cd2998e324a2a01762855 Mon Sep 17 00:00:00 2001 From: Ashley Wong <50691452+so99y@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:48:56 +0000 Subject: [PATCH 258/336] DFR-3494 Add Hearing Judge to Approve Orders Page (#2028) * DFR-3334 Add Hearing Judge to Approve Orders Page. * NL * Check PSA for validating attachments * Remove unused imports --------- Co-authored-by: Ashley Wong --- ...ApproveDraftOrdersAboutToStartHandler.java | 4 +- .../judgeapproval/JudgeApproval.java | 2 + .../service/HearingService.java | 7 ++-- ...oveDraftOrdersAboutToStartHandlerTest.java | 40 ++++++++++--------- .../service/HearingServiceTest.java | 20 +++++----- .../caseorchestration/test/Assertions.java | 2 +- 6 files changed, 39 insertions(+), 36 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 99b5be9228..3cb5506e95 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -114,7 +114,7 @@ private List validateDraftOrdersWrapper(DraftOrdersWrapper draftOrdersWr private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrdersReview) { return hearingService.formatHearingInfo(draftOrdersReview.getHearingType(), - draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingJudge()); + draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime()); } private List getReviewableItems(List outstanding) { @@ -132,6 +132,7 @@ private List getReviewableItems(List .title(DRAFT_ORDER.getTitle()) .inlineDocType(DRAFT_ORDER.getDescription()) .hearingInfo(hearingInfo) + .hearingJudge(draftOrdersReview.getHearingJudge()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") .label("This is a final order") @@ -153,6 +154,7 @@ private List getReviewableItems(List .title(PSA.getTitle()) .inlineDocType(PSA.getDescription()) .hearingInfo(hearingInfo) + .hearingJudge(draftOrdersReview.getHearingJudge()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() .code("Yes") .label("This is a final order") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java index a13cc79e8e..03f3fc3068 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeApproval.java @@ -33,6 +33,8 @@ public class JudgeApproval { private String hearingInfo; + private String hearingJudge; + private YesOrNo hasAttachment; @JsonProperty("document") diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java index e5573321a0..01c196c457 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingService.java @@ -157,15 +157,14 @@ private T getHearingInfo(FinremCaseData caseData, DynamicListElement selecte .orElse(null); // Return null if no match is found } - public String formatHearingInfo(String hearingType, LocalDate hearingDate, String hearingTime, String hearingJudge) { + public String formatHearingInfo(String hearingType, LocalDate hearingDate, String hearingTime) { return format( - "%s on %s %s by %s", + "%s on %s %s", Optional.ofNullable(hearingType).orElse("N/A"), Optional.ofNullable(hearingDate) .map(date -> hearingDate.format(DateTimeFormatter.ofPattern("dd MMMM yyyy"))) .orElse("N/A"), - Optional.ofNullable(hearingTime).orElse("N/A"), - Optional.ofNullable(hearingJudge).orElse("N/A") + Optional.ofNullable(hearingTime).orElse("N/A") ); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index 897af03fbb..52bd0a2a69 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -37,9 +37,9 @@ import java.time.LocalDateTime; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.stream.Stream; +import static java.util.Optional.ofNullable; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -144,9 +144,9 @@ void handle_withVariousDraftOrdersWrapperData( .build()) .build()) .build(); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00", "Mr. Judge")) + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 10, 31), "09:00")) .thenReturn("hearingServiceFormattedString1"); - lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00", "Mr. Judge")) + lenient().when(hearingService.formatHearingInfo("hearingType", LocalDate.of(2024, 11, 30), "09:00")) .thenReturn("hearingServiceFormattedString2"); // Act @@ -158,22 +158,21 @@ void handle_withVariousDraftOrdersWrapperData( draftOrdersWrapper = responseData.getDraftOrdersWrapper(); var expectedJudgeApproval = List.of( - Optional.ofNullable(expectedJudgeApproval1), Optional.ofNullable(expectedJudgeApproval2), - Optional.ofNullable(expectedJudgeApproval3), Optional.ofNullable(expectedJudgeApproval4), - Optional.ofNullable(expectedJudgeApproval5) + ofNullable(expectedJudgeApproval1), ofNullable(expectedJudgeApproval2), + ofNullable(expectedJudgeApproval3), ofNullable(expectedJudgeApproval4), + ofNullable(expectedJudgeApproval5) ); for (int i = 0; i < NUMBER_OF_DOC_TO_BE_REVIEWED; i++) { var actual = (JudgeApproval) draftOrdersWrapper.getClass().getMethod("getJudgeApproval" + (i + 1)).invoke(draftOrdersWrapper); var expected = expectedJudgeApproval.get(i).orElse(null); if (expected != null && actual != null) { - assertEquals(expected.getTitle(), actual.getTitle()); - assertEquals(expected.getInlineDocType(), actual.getInlineDocType()); - assertEquals(expected.getDocument(), actual.getDocument()); - assertEquals(expected.getHearingInfo(), actual.getHearingInfo()); - if (expected.getHasAttachment() == YES) { - assertEquals(expected.getAttachments(), actual.getAttachments()); - } + assertThat(actual) + .usingRecursiveComparison() + .ignoringFields(actual.getDocType() == DRAFT_ORDER + ? new String[] {"sortKey", "isFinalOrder"} + : new String[] {"sortKey", "isFinalOrder", "attachments"}) + .isEqualTo(expected); } else { assertEquals(expected, actual); } @@ -202,14 +201,14 @@ private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo1(Draf return builder.hearingDate(LocalDate.of(2024, 10, 31)) .hearingTime("09:00") .hearingType("hearingType") - .hearingJudge("Mr. Judge"); + .hearingJudge("Mr Judge"); } private static DraftOrdersReview.DraftOrdersReviewBuilder applyHearingInfo2(DraftOrdersReview.DraftOrdersReviewBuilder builder) { return builder.hearingDate(LocalDate.of(2024, 11, 30)) .hearingTime("09:00") .hearingType("hearingType") - .hearingJudge("Mr. Judge"); + .hearingJudge("Mr Judge"); } private static CaseDocument randomCaseDocument() { @@ -276,11 +275,14 @@ private static PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus or private static JudgeApproval buildJudgeApproval(JudgeApprovalDocType docType, String hearingInfo, CaseDocument document, List attachments) { - return JudgeApproval.builder().hearingInfo(hearingInfo) + return JudgeApproval.builder() + .hearingInfo(hearingInfo) + .hearingJudge("Mr Judge") + .docType(docType) .title(docType.getTitle()) .inlineDocType(docType.getDescription()) .document(document) - .attachments(attachments) + .attachments(ofNullable(attachments).filter(a -> !a.isEmpty()).orElse(List.of())) .hasAttachment(YesOrNo.forValue(attachments != null && !attachments.isEmpty())) .build(); } @@ -310,7 +312,7 @@ private static Arguments withOneDraftOrderAndOnePsa() { )) .build(), buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, List.of()), null, null, null, NO); } @@ -358,7 +360,7 @@ private static Arguments withDifferentHearingInfo() { )) .build(), buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString1", DO_DOC_1, List.of(DO_ATTACHMENT_1)), - buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, null), + buildJudgeApproval(PSA, "hearingServiceFormattedString1", PSA_DOC_1, List.of()), buildJudgeApproval(DRAFT_ORDER, "hearingServiceFormattedString2", DO_DOC_2, List.of(DO_ATTACHMENT_2)), null, null, NO); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java index c56c67a802..ee86659792 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/HearingServiceTest.java @@ -480,22 +480,20 @@ void testGetHearingTime(String selectedCode, String expectedTime) { @ParameterizedTest @CsvSource({ - "'Civil', '2024-11-10', '10:30 AM', 'Judge Smith', 'Civil on 10 November 2024 10:30 AM by Judge Smith'", - "NULL, '2024-11-10', '10:30 AM', 'Judge Smith', 'N/A on 10 November 2024 10:30 AM by Judge Smith'", - "'Civil', NULL, '10:30 AM', 'Judge Smith', 'Civil on N/A 10:30 AM by Judge Smith'", - "'Civil', '2024-11-10', NULL, 'Judge Smith', 'Civil on 10 November 2024 N/A by Judge Smith'", - "'Civil', '2024-11-10', '10:30 AM', NULL, 'Civil on 10 November 2024 10:30 AM by N/A'", - "NULL, NULL, NULL, NULL, 'N/A on N/A N/A by N/A'", - "'', '2024-11-10', '', '', ' on 10 November 2024 by '" + "'Civil', '2024-11-10', '10:30 AM', 'Civil on 10 November 2024 10:30 AM'", + "NULL, '2024-11-10', '10:30 AM', 'N/A on 10 November 2024 10:30 AM'", + "'Civil', NULL, '10:30 AM', 'Civil on N/A 10:30 AM'", + "'Civil', '2024-11-10', NULL, 'Civil on 10 November 2024 N/A'", + "'Civil', '2024-11-10', '10:30 AM', 'Civil on 10 November 2024 10:30 AM'", + "NULL, NULL, NULL, 'N/A on N/A N/A'", + "'', '2024-11-10', '', ' on 10 November 2024 '" }) - void formatHearingInfo_shouldReturnExpectedOutput(String hearingType, String hearingDate, String hearingTime, String hearingJudge, - String expectedOutput) { + void formatHearingInfo_shouldReturnExpectedOutput(String hearingType, String hearingDate, String hearingTime, String expectedOutput) { LocalDate parsedHearingDate = "NULL".equals(hearingDate) ? null : LocalDate.parse(hearingDate); String parsedHearingType = "NULL".equals(hearingType) ? null : hearingType; String parsedHearingTime = "NULL".equals(hearingTime) ? null : hearingTime; - String parsedHearingJudge = "NULL".equals(hearingJudge) ? null : hearingJudge; - String actualOutput = hearingService.formatHearingInfo(parsedHearingType, parsedHearingDate, parsedHearingTime, parsedHearingJudge); + String actualOutput = hearingService.formatHearingInfo(parsedHearingType, parsedHearingDate, parsedHearingTime); assertEquals(expectedOutput, actualOutput); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java index 11ac73b8f2..5658554b79 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/test/Assertions.java @@ -32,4 +32,4 @@ public static void assertCanHandle(CallbackHandler handler, Arguments... combina } } } -} \ No newline at end of file +} From aa1b82295cd2179c84ee3519b2e0ceb1bd45b57c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 16 Dec 2024 18:06:14 +0000 Subject: [PATCH 259/336] Remove an extra blank line. --- .../service/judgeapproval/JudgeApprovalResolver.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 81b3e1ff4d..f9deae6d3f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -134,5 +134,4 @@ private boolean isJudgeApproved(JudgeApproval judgeApproval) { private boolean isJudgeRefused(JudgeApproval judgeApproval) { return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); } - } From b4b364a1453a1e282f50c18919e6ae6815759fc3 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 17 Dec 2024 10:11:38 +0000 Subject: [PATCH 260/336] Move Approvable, HasSubmittedInfo, RefusalOrderConvertible and HasApprovable in draftorder package. --- .../upload/UploadDraftOrdersAboutToSubmitHandler.java | 2 +- .../caseorchestration/model/ccd/HasApprovable.java | 8 -------- .../model/ccd/{ => draftorders}/Approvable.java | 4 +++- .../model/ccd/draftorders/HasApprovable.java | 10 ++++++++++ .../model/ccd/{ => draftorders}/HasSubmittedInfo.java | 2 +- .../ccd/{ => draftorders}/RefusalOrderConvertible.java | 4 +++- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 4 ++-- .../draftorders/agreed/AgreedDraftOrderCollection.java | 2 +- .../review/DraftOrderDocReviewCollection.java | 2 +- .../draftorders/review/DraftOrderDocumentReview.java | 2 +- .../ccd/draftorders/review/PsaDocReviewCollection.java | 2 +- .../ccd/draftorders/review/PsaDocumentReview.java | 2 +- .../ccd/draftorders/suggested/SuggestedDraftOrder.java | 2 +- .../caseorchestration/service/DraftOrderService.java | 2 +- .../service/judgeapproval/JudgeApprovalResolver.java | 4 ++-- .../service/judgeapproval/RefusedOrderProcessor.java | 6 +++--- .../UploadDraftOrderAboutToSubmitHandlerTest.java | 2 +- .../judgeapproval/JudgeApprovalResolverTest.java | 2 +- 18 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/{ => draftorders}/Approvable.java (70%) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/{ => draftorders}/HasSubmittedInfo.java (77%) rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/{ => draftorders}/RefusalOrderConvertible.java (76%) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java index 0bc46d7be9..4bf556ea32 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java @@ -15,7 +15,7 @@ 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.HasSubmittedInfo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrder; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java deleted file mode 100644 index 657974f321..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasApprovable.java +++ /dev/null @@ -1,8 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; - -/** - * Interface representing a container for an {@link Approvable} object. - */ -public interface HasApprovable { - Approvable getValue(); -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java similarity index 70% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java index 1da8cdf81b..0e11e13726 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java @@ -1,5 +1,7 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DocumentMatcher; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import java.time.LocalDateTime; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java new file mode 100644 index 0000000000..f8b7f85e9e --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java @@ -0,0 +1,10 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders; + +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; + +/** + * Interface representing a container for an {@link Approvable} object. + */ +public interface HasApprovable { + Approvable getValue(); +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasSubmittedInfo.java similarity index 77% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasSubmittedInfo.java index 72f781020b..728ca0dd51 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/HasSubmittedInfo.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasSubmittedInfo.java @@ -1,4 +1,4 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders; import java.time.LocalDateTime; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/RefusalOrderConvertible.java similarity index 76% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/RefusalOrderConvertible.java index f2294732fb..b37120da32 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/RefusalOrderConvertible.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/RefusalOrderConvertible.java @@ -1,4 +1,6 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders; + +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import java.time.LocalDateTime; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 5ce6d11abb..b1087398af 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -8,10 +8,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasSubmittedInfo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java index f5780be79c..b8e54a23ff 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java index 92eb8115fd..a6afa8d516 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index 009c3edf75..b71c9657f8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -10,7 +10,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index ec2ff1d9eb..6d196397ea 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 7fc8756467..fd28a2af33 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -10,7 +10,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java index 08796593a1..6bae0d3c8e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasSubmittedInfo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import java.time.LocalDateTime; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java index 0e38aa2f51..ad617ac8f4 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java @@ -8,7 +8,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioListElement; 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.HasSubmittedInfo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index f9deae6d3f..6f5e38b235 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -2,10 +2,10 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index e7136fe954..0ab9a541bb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -4,12 +4,12 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.RefusalOrderConvertible; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java index 7b5f8a9c6f..ce8ad2b3d7 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrderAboutToSubmitHandlerTest.java @@ -22,7 +22,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioList; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioListElement; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasSubmittedInfo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrder; diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 0a6fe5db9e..15c043d530 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -10,7 +10,7 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; From f2c8e5fc032534a9793e3d5bd7cc1dd3e42b9ffb Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 17 Dec 2024 12:05:36 +0000 Subject: [PATCH 261/336] checkstyle --- .../upload/UploadDraftOrdersAboutToSubmitHandler.java | 2 +- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 4 ++-- .../ccd/draftorders/agreed/AgreedDraftOrderCollection.java | 2 +- .../draftorders/review/DraftOrderDocReviewCollection.java | 2 +- .../ccd/draftorders/review/DraftOrderDocumentReview.java | 2 +- .../ccd/draftorders/review/PsaDocReviewCollection.java | 2 +- .../model/ccd/draftorders/review/PsaDocumentReview.java | 2 +- .../ccd/draftorders/suggested/SuggestedDraftOrder.java | 2 +- .../finrem/caseorchestration/service/DraftOrderService.java | 2 +- .../service/judgeapproval/JudgeApprovalResolver.java | 2 +- .../service/judgeapproval/RefusedOrderProcessor.java | 6 +++--- .../service/judgeapproval/JudgeApprovalResolverTest.java | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java index 4bf556ea32..d20d1dfc38 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/draftorders/upload/UploadDraftOrdersAboutToSubmitHandler.java @@ -15,8 +15,8 @@ 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.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index b1087398af..97ea07054e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -8,12 +8,12 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import java.time.LocalDateTime; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java index b8e54a23ff..5b63801534 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrderCollection.java @@ -5,8 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; @JsonIgnoreProperties(ignoreUnknown = true) @Data diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java index a6afa8d516..5dd8063eaf 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocReviewCollection.java @@ -5,8 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; @JsonIgnoreProperties(ignoreUnknown = true) @Data diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index b71c9657f8..e26a6ce23a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -10,10 +10,10 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java index 6d196397ea..f4fc895eca 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocReviewCollection.java @@ -5,8 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; @JsonIgnoreProperties(ignoreUnknown = true) @Data diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index fd28a2af33..cfef2b935c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -10,9 +10,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HearingInstructionProcessable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import java.time.LocalDateTime; import java.util.Optional; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java index 6bae0d3c8e..a47b64bbaa 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/suggested/SuggestedDraftOrder.java @@ -9,8 +9,8 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java index ad617ac8f4..383835f68c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderService.java @@ -8,10 +8,10 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicRadioListElement; 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.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Reviewable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 6f5e38b235..c2c5de0eb6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -2,9 +2,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index 0ab9a541bb..10e1f00c70 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -4,13 +4,13 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 15c043d530..4e6ced67aa 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -10,9 +10,9 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequest; From 8af491398a2267a00dca6c254bf3382f618e258a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 17 Dec 2024 12:59:48 +0000 Subject: [PATCH 262/336] DFR-3495 Capturing Refusal Order Judge Title --- .../ApproveDraftOrdersMidEventHandler.java | 11 ++++++++ .../judgeapproval/JudgeDecision.java | 12 +++++---- .../RefusalOrderInstruction.java | 27 +++++++++++++++++++ .../model/ccd/wrapper/DraftOrdersWrapper.java | 4 +++ .../judgeapproval/RefusedOrderProcessor.java | 12 ++++++++- 5 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 741137520e..7ce710fa8f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -19,6 +19,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @@ -79,6 +80,16 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem )) .build()); + boolean isRefusalOrderInstructionRequired = IntStream.rangeClosed(1, 5) + .mapToObj(i -> approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i)) + .filter(Objects::nonNull) + .map(JudgeApproval::getJudgeDecision) + .anyMatch(decision -> decision != null && decision.isRefusalOrderInstructionRequired()); + + draftOrdersWrapper.setRefusalOrderInstruction(RefusalOrderInstruction.builder() + .showRequireRefusalOrderInstructionQuestion(YesOrNo.forValue(isRefusalOrderInstructionRequired)) + .build()); + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java index 694cee3595..9196bbe731 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java @@ -5,18 +5,20 @@ @Getter public enum JudgeDecision { - REVIEW_LATER(false, false, false), - LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false, false, true), - JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, false), - READY_TO_BE_SEALED(true, true, false); + REVIEW_LATER(false, false, false, false), + LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false, false, true, true), + JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, false, false), + READY_TO_BE_SEALED(true, true, false, false); private final boolean hearingInstructionRequired; private final boolean approved; private final boolean refused; + private final boolean refusalOrderInstructionRequired; - JudgeDecision(boolean hearingInstructionRequired, boolean approved, boolean refused) { + JudgeDecision(boolean hearingInstructionRequired, boolean approved, boolean refused, boolean refusalOrderInstructionRequired) { this.hearingInstructionRequired = hearingInstructionRequired; this.approved = approved; this.refused = refused; + this.refusalOrderInstructionRequired = refusalOrderInstructionRequired; } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java new file mode 100644 index 0000000000..ea9e53264b --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java @@ -0,0 +1,27 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder(toBuilder = true) +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class RefusalOrderInstruction { + + @JsonProperty("showRequireRefusalOrderInstructionQuestion") + private YesOrNo showRequireRefusalOrderInstructionQuestion; + + @JsonProperty("judgeType") + private JudgeType judgeType; + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index e6304978bc..859264c988 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -17,6 +17,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; @@ -76,6 +77,9 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("hearingInstruction") private HearingInstruction hearingInstruction; + @JsonProperty("refusalOrderInstruction") + private RefusalOrderInstruction refusalOrderInstruction; + private String generatedOrderReason; @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index 10e1f00c70..084d2e3f85 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -1,6 +1,7 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; @@ -13,6 +14,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -39,6 +41,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; +@Slf4j @Component @RequiredArgsConstructor public class RefusedOrderProcessor { @@ -94,10 +97,17 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder UUID uuid = UUID.randomUUID(); refusalOrderIds.add(uuid); + JudgeType judgeTitle = ofNullable(draftOrdersWrapper.getRefusalOrderInstruction()).map(RefusalOrderInstruction::getJudgeType) + .orElse(null); + if (judgeTitle == null) { + log.warn("{} - Judge title was not captured and an empty string will be shown in the refusal order.", + finremCaseDetails.getId()); + } + RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() .refusedDocument(refusalOrderConvertible.getRefusedDocument()) .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), - refusalOrderConvertible.getApprovalJudge(), null, userAuthorisation)) + refusalOrderConvertible.getApprovalJudge(), judgeTitle, userAuthorisation)) .refusedDate(refusalOrderConvertible.getRefusedDate()) .submittedDate(refusalOrderConvertible.getSubmittedDate()) .submittedBy(refusalOrderConvertible.getSubmittedBy()) From a9e8ac8b879001e978155c516dec914360f96a9b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 17 Dec 2024 16:41:07 +0000 Subject: [PATCH 263/336] Update test case. --- .../ApproveDraftOrdersMidEventHandler.java | 11 ++- ...ApproveDraftOrdersMidEventHandlerTest.java | 74 +++++++++++++++---- 2 files changed, 68 insertions(+), 17 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 7ce710fa8f..d2a9547beb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -63,6 +63,13 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + setupHearingInstruction(draftOrdersWrapper); + setupRefusalOrderInstruction(draftOrdersWrapper); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } + + private void setupHearingInstruction(DraftOrdersWrapper draftOrdersWrapper) { boolean isHearingInstructionRequired = IntStream.rangeClosed(1, 5) .mapToObj(i -> approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i)) .filter(Objects::nonNull) @@ -79,7 +86,9 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .build() )) .build()); + } + private void setupRefusalOrderInstruction(DraftOrdersWrapper draftOrdersWrapper) { boolean isRefusalOrderInstructionRequired = IntStream.rangeClosed(1, 5) .mapToObj(i -> approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i)) .filter(Objects::nonNull) @@ -89,8 +98,6 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem draftOrdersWrapper.setRefusalOrderInstruction(RefusalOrderInstruction.builder() .showRequireRefusalOrderInstructionQuestion(YesOrNo.forValue(isRefusalOrderInstructionRequired)) .build()); - - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } /** diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 693e14efad..85d2608d81 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -19,6 +20,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @@ -28,9 +30,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Mockito.when; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.lenient; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @@ -44,6 +51,11 @@ class ApproveDraftOrdersMidEventHandlerTest { @Mock private ApproveOrderService approveOrderService; + @BeforeEach + void setup() { + lenient().when(approveOrderService.resolveJudgeApproval(any(), anyInt())).thenCallRealMethod(); + } + @Test void canHandle() { assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); @@ -92,7 +104,21 @@ void shouldPopulateAnEmptyAnotherHearingRequestEntry() { @Test void shouldPopulateWhichOrder() { // Arrange - DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder().build(); + DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder() + .judgeApproval1( + JudgeApproval.builder() + .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) + .docType(JudgeApprovalDocType.DRAFT_ORDER) + .amendedDocument(CaseDocument.builder().documentFilename("AMENDED_DOC.doc").build()) + .build() + ) + .judgeApproval2( + JudgeApproval.builder() + .judgeDecision(READY_TO_BE_SEALED) + .docType(JudgeApprovalDocType.PSA) + .document(CaseDocument.builder().documentFilename("PSA.doc").build()) + .build()) + .build(); FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() .caseDetails(FinremCaseDetails.builder() @@ -103,19 +129,6 @@ void shouldPopulateWhichOrder() { .build()) .build(); - when(approveOrderService.resolveJudgeApproval(draftOrdersWrapper, 1)).thenReturn( - JudgeApproval.builder() - .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) - .docType(JudgeApprovalDocType.DRAFT_ORDER) - .amendedDocument(CaseDocument.builder().documentFilename("AMENDED_DOC.doc").build()) - .build()); - when(approveOrderService.resolveJudgeApproval(draftOrdersWrapper, 2)).thenReturn( - JudgeApproval.builder() - .judgeDecision(READY_TO_BE_SEALED) - .docType(JudgeApprovalDocType.PSA) - .document(CaseDocument.builder().documentFilename("PSA.doc").build()) - .build()); - // Act GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); @@ -126,6 +139,7 @@ void shouldPopulateWhichOrder() { List actualCollection = responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); + assertEquals(YES, responseDraftOrdersWrapper.getHearingInstruction().getShowRequireAnotherHearingQuestion()); assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); @@ -138,4 +152,34 @@ void shouldPopulateWhichOrder() { )).build(); assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); } + + @Test + void shouldPopulateRefusalOrderInstruction() { + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder() + .judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE) + .build()) + .build()) + .build()) + .build()) + .build(); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + RefusalOrderInstruction refusalOrderInstruction = responseDraftOrdersWrapper.getRefusalOrderInstruction(); + assertEquals(NO, responseDraftOrdersWrapper.getHearingInstruction().getShowRequireAnotherHearingQuestion()); + assertNotNull(refusalOrderInstruction, "refusalOrderInstruction should not be null"); + assertEquals(YES, refusalOrderInstruction.getShowRequireRefusalOrderInstructionQuestion()); + } } From 36e075e8e92493499485258b6c9e869c9a9ae7b1 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 17 Dec 2024 18:48:19 +0000 Subject: [PATCH 264/336] update unit test --- .../ccd/draftorders/review/RefusedOrder.java | 3 + .../judgeapproval/RefusedOrderGenerator.java | 65 +++++++++++ .../judgeapproval/RefusedOrderProcessor.java | 50 ++------- .../RefusedOrderGeneratorTest.java | 102 ++++++++++++++++++ .../RefusedOrderProcessorTest.java | 33 +++--- 5 files changed, 192 insertions(+), 61 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java index 0d3cac14da..1cec7ee919 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import java.time.LocalDate; @@ -48,4 +49,6 @@ public class RefusedOrder implements HasCaseDocument { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private LocalDate hearingDate; + private JudgeType judgeType; + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java new file mode 100644 index 0000000000..118a231561 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java @@ -0,0 +1,65 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; + +import java.time.LocalDateTime; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; + +@Component +@RequiredArgsConstructor +public class RefusedOrderGenerator { + + private final GenericDocumentService genericDocumentService; + + private final DocumentConfiguration documentConfiguration; + + private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + + /** + * Generates a refused order document for the given case details. + * This method sets temporary values in the DraftOrdersWrapper for use during document generation, + * then clears them after the document has been created. + * + * @param finremCaseDetails the details of the financial remedy case + * @param refusalReason the reason for refusing the order + * @param refusedDate the date and time the order was refused + * @param judgeName the name of the judge refusing the order + * @param judgeType the type of judge refusing the order + * @param authorisationToken the authorisation token for accessing document services + * @return the generated CaseDocument representing the refused order + */ + public CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, + String judgeName, JudgeType judgeType, String authorisationToken) { + DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); + draftOrdersWrapper.setGeneratedOrderReason(refusalReason); + draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); + draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); + draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); + + try { + return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, + contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() + ), + documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), + insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), + finremCaseDetails.getId().toString()); + } finally { + // Clear the temp values as they are for report generation purpose. + draftOrdersWrapper.setGeneratedOrderReason(null); + draftOrdersWrapper.setGeneratedOrderRefusedDate(null); + draftOrdersWrapper.setGeneratedOrderJudgeType(null); + draftOrdersWrapper.setGeneratedOrderJudgeName(null); + } + } + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index 084d2e3f85..82a563b1e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -3,9 +3,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; @@ -23,10 +20,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -39,18 +34,13 @@ import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; @Slf4j @Component @RequiredArgsConstructor public class RefusedOrderProcessor { - private final GenericDocumentService genericDocumentService; - - private final DocumentConfiguration documentConfiguration; - - private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + private final RefusedOrderGenerator refusedOrderGenerator; /** * Processes refused draft orders and pension sharing annexes (PSAs) by removing them from collections, @@ -97,17 +87,17 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder UUID uuid = UUID.randomUUID(); refusalOrderIds.add(uuid); - JudgeType judgeTitle = ofNullable(draftOrdersWrapper.getRefusalOrderInstruction()).map(RefusalOrderInstruction::getJudgeType) + JudgeType judgeType = ofNullable(draftOrdersWrapper.getRefusalOrderInstruction()).map(RefusalOrderInstruction::getJudgeType) .orElse(null); - if (judgeTitle == null) { - log.warn("{} - Judge title was not captured and an empty string will be shown in the refusal order.", + if (judgeType == null) { + log.warn("{} - Judge type was not captured and an empty string will be shown in the refusal order.", finremCaseDetails.getId()); } RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() .refusedDocument(refusalOrderConvertible.getRefusedDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), - refusalOrderConvertible.getApprovalJudge(), judgeTitle, userAuthorisation)) + .refusalOrder(refusedOrderGenerator.generateRefuseOrder(finremCaseDetails, judgeFeedback, + refusalOrderConvertible.getRefusedDate(), refusalOrderConvertible.getApprovalJudge(), judgeType, userAuthorisation)) .refusedDate(refusalOrderConvertible.getRefusedDate()) .submittedDate(refusalOrderConvertible.getSubmittedDate()) .submittedBy(refusalOrderConvertible.getSubmittedBy()) @@ -115,7 +105,8 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder .refusalJudge(refusalOrderConvertible.getApprovalJudge()) .attachments(item.getValue() instanceof DraftOrderDocumentReview d ? d.getAttachments() : null) .judgeFeedback(judgeFeedback) - .hearingDate(hearingDate); + .hearingDate(hearingDate) + .judgeType(judgeType); return RefusedOrderCollection.builder().id(uuid).value(orderBuilder.build()).build(); } else { @@ -134,31 +125,6 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UuidCollection::new).toList()); } - private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, - String judgeName, JudgeType judgeType, String authorisationToken) { - DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); - draftOrdersWrapper.setGeneratedOrderReason(refusalReason); - draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); - draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); - draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); - - try { - return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, - contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, - finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() - ), - documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), - insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), - finremCaseDetails.getId().toString()); - } finally { - // Clear the temp values as they are for report generation purpose. - draftOrdersWrapper.setGeneratedOrderReason(null); - draftOrdersWrapper.setGeneratedOrderRefusedDate(null); - draftOrdersWrapper.setGeneratedOrderJudgeType(null); - draftOrdersWrapper.setGeneratedOrderJudgeName(null); - } - } - private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( List removedItems, List draftOrdersReviewCollection) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java new file mode 100644 index 0000000000..8ab6fd9b3f --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java @@ -0,0 +1,102 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils; + +import java.time.LocalDateTime; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; + +@ExtendWith(MockitoExtension.class) +class RefusedOrderGeneratorTest { + + @Mock + private GenericDocumentService genericDocumentService; + + @Mock + private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + + @Mock + private DocumentConfiguration documentConfiguration; + + @InjectMocks + private RefusedOrderGenerator underTest; + + @Test + void shouldGenerateRefuseOrder() { + // Arrange + FinremCaseDetails finremCaseDetails = FinremCaseDetails.builder().id(12345L).build(); + FinremCaseData caseData = new FinremCaseData(); + DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); + caseData.setDraftOrdersWrapper(draftOrdersWrapper); + finremCaseDetails.setData(caseData); + + String refusalReason = "Insufficient information"; + LocalDateTime refusedDate = LocalDateTime.now(); + String judgeName = "Judge Doe"; + JudgeType judgeType = JudgeType.DISTRICT_JUDGE; + String templateName = "templateName"; + String fileName = "fileName.dcc"; + String modifiedFilename = "fileName_ABC.doc"; + String caseId = "12345"; + CaseDocument expectedDocument = new CaseDocument(); + + Map templateDetailsMap = Map.of("key", "value"); + + // Mock dependencies + when(contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap( + finremCaseDetails, finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList())).thenReturn(templateDetailsMap); + when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails)).thenReturn(templateName); + when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn(fileName); + try (MockedStatic mockedStatic = mockStatic(FileUtils.class)) { + mockedStatic.when(() -> FileUtils.insertTimestamp(fileName)).thenReturn(modifiedFilename); + + when(genericDocumentService.generateDocumentFromPlaceholdersMap( + AUTH_TOKEN, + templateDetailsMap, + templateName, + modifiedFilename, // Match the actual argument + caseId + )).thenReturn(expectedDocument); + + // Act + CaseDocument result = underTest.generateRefuseOrder( + finremCaseDetails, refusalReason, refusedDate, judgeName, judgeType, AUTH_TOKEN); + + // Assert + assertNotNull(result); + assertEquals(expectedDocument, result); + + // Verify that temporary values are cleared + assertNull(draftOrdersWrapper.getGeneratedOrderReason()); + assertNull(draftOrdersWrapper.getGeneratedOrderRefusedDate()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeName()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeType()); + + verify(genericDocumentService).generateDocumentFromPlaceholdersMap(AUTH_TOKEN, templateDetailsMap, templateName, modifiedFilename, + caseId); + verifyNoMoreInteractions(genericDocumentService); + } + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java index c9b8ef9b81..c80bed6f0b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java @@ -9,15 +9,15 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -28,7 +28,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import java.time.LocalDate; import java.time.LocalDateTime; @@ -43,8 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.lenient; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.CASE_ID; @@ -70,17 +69,12 @@ class RefusedOrderProcessorTest { private RefusedOrderProcessor underTest; @Mock - private GenericDocumentService genericDocumentService; - - @Mock - private DocumentConfiguration documentConfiguration; - - @Mock - private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + private RefusedOrderGenerator refusedOrderGenerator; @ParameterizedTest @MethodSource("provideProcessRefusedDocumentsAndUpdateTheirState") void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApproval, + RefusalOrderInstruction refusalOrderInstruction, List agreedDraftOrderCollections, List draftOrdersReviewCollection, List existingRefusedOrders, @@ -92,11 +86,11 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova .agreedDraftOrderCollection(agreedDraftOrderCollections) .draftOrdersReviewCollection(draftOrdersReviewCollection) .refusedOrdersCollection(existingRefusedOrders) + .refusalOrderInstruction(refusalOrderInstruction) .build(); - lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn("RefusalOrder.doc"); - lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(any(FinremCaseDetails.class))).thenReturn("TemplateName"); - lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(anyString(), anyMap(), anyString(), anyString(), anyString())) + lenient().when(refusedOrderGenerator.generateRefuseOrder(any(FinremCaseDetails.class), eq(JUDGE_FEEDBACK), eq(FIXED_DATE_TIME), + eq(APPROVED_JUDGE_NAME), refusalOrderInstruction == null ? isNull() : eq(refusalOrderInstruction.getJudgeType()), eq(AUTH_TOKEN))) .thenReturn(GENERATED_REFUSED_ORDER); try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { @@ -166,7 +160,7 @@ static Stream provideProcessRefusedDocumentsAndUpdateTheirState() { } static Arguments targetDocNotFound(JudgeApproval judgeApproval) { - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, null, List.of(), List.of( DraftOrdersReviewCollection.builder() @@ -212,7 +206,7 @@ static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean w .approvalJudge("Mary Chapman") .build()).build(); - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, null, List.of(agreedDraftOrderCollectionToBeExamined), List.of( DraftOrdersReviewCollection.builder() @@ -270,7 +264,7 @@ static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubm .build()) .build(); - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, null, List.of(agreedDraftOrderCollectionToBeExamined), List.of( DraftOrdersReviewCollection.builder() @@ -317,7 +311,7 @@ static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeA .build()) .build(); - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, RefusalOrderInstruction.builder().judgeType(JudgeType.DEPUTY_DISTRICT_JUDGE).build(), List.of(agreedDraftOrderCollectionToBeExamined), List.of( DraftOrdersReviewCollection.builder() @@ -355,6 +349,7 @@ static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeA .judgeFeedback(JUDGE_FEEDBACK) .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) .hearingDate(HEARING_DATE) + .judgeType(JudgeType.DEPUTY_DISTRICT_JUDGE) .build() ); } From 53c1c95f045947b312596224711f2bcf8e3ecc55 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 17 Dec 2024 23:24:20 +0000 Subject: [PATCH 265/336] enhanced readibility --- .../ApproveDraftOrdersSubmittedHandler.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java index d8b325cf68..11377693e2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersSubmittedHandler.java @@ -51,23 +51,33 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem String caseId = String.valueOf(caseDetails.getId()); log.info("Invoking contested {} submitted event callback for Case ID: {}", callbackRequest.getEventType(), caseId); - FinremCaseData finremCaseData = caseDetails.getData(); + sendRefusalOrderToParties(caseDetails); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseDetails.getData()).build(); + } + + private List readLatestRefusalOrderIds(DraftOrdersWrapper draftOrdersWrapper) { + return ofNullable(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).orElse(List.of()).stream().map(UuidCollection::getValue).toList(); + } + + private void sendRefusalOrderToParties(FinremCaseDetails finremCaseDetails) { + FinremCaseData finremCaseData = finremCaseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); - List refusalOrderIdsToBeSent = - ofNullable(draftOrdersWrapper.getRefusalOrderIdsToBeSent()).orElse(List.of()).stream().map(UuidCollection::getValue).toList(); + List refusalOrderIdsToBeSent = readLatestRefusalOrderIds(draftOrdersWrapper); + // Process the refused orders collection from the draftOrdersWrapper. + // Filter the orders whose IDs are present in the refusalOrderIdsToBeSent list. ofNullable(draftOrdersWrapper.getRefusedOrdersCollection()).orElse(List.of()).stream() .filter(d -> refusalOrderIdsToBeSent.contains(d.getId())) .forEach(a -> { if (!isEmpty(a.getValue().getSubmittedByEmail())) { + // - If the 'submittedByEmail' field is not empty, send a refusal notification via Gov Notify notificationService.sendRefusedDraftOrderOrPsa(notificationRequestMapper - .buildRefusedDraftOrderOrPsaNotificationRequest(caseDetails, a.getValue())); + .buildRefusedDraftOrderOrPsaNotificationRequest(finremCaseDetails, a.getValue())); } else { // TODO DFR-3497 send refusal order by post. Take a look on ContestedDraftOrderNotApprovedController.sendRefusalReason } }); - - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); } } From 1909123d0ddc9ccacf5eb86df9cdec7b099ce563 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:34:36 +0000 Subject: [PATCH 266/336] Fix test case --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 17e023c139..5eede902b4 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -11,6 +11,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.State; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import java.io.File; import java.io.IOException; @@ -78,7 +79,8 @@ public class CCDConfigValidator { Map.entry("FR_uploadAgreedDraftOrder", "UploadAgreedDraftOrder"), Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder"), Map.entry("FR_judgeApproval", "JudgeApproval"), - Map.entry("FR_hearingInstruction", "HearingInstruction") + Map.entry("FR_hearingInstruction", "HearingInstruction"), + Map.entry("FR_fl_RefusalOrderJudgeType", RefusalOrderInstruction.class.getSimpleName()) ); private Map specialFieldTypes = Map.ofEntries( From 8e8843e1a41b3ac91bd6e62ddf09de147cd3055c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:39:10 +0000 Subject: [PATCH 267/336] Linked with the class by calling Class.getSimpleName() --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 5eede902b4..f23df04830 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -11,7 +11,11 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.State; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; import java.io.File; import java.io.IOException; @@ -76,10 +80,10 @@ public class CCDConfigValidator { Map.entry(DYNAMIC_RADIO_LIST, "DynamicRadioList"), Map.entry("FR_ct_draftDirectionOrder", "DraftDirectionOrder"), Map.entry("Flags", "CaseFlag"), - Map.entry("FR_uploadAgreedDraftOrder", "UploadAgreedDraftOrder"), - Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder"), - Map.entry("FR_judgeApproval", "JudgeApproval"), - Map.entry("FR_hearingInstruction", "HearingInstruction"), + Map.entry("FR_uploadAgreedDraftOrder", UploadAgreedDraftOrder.class.getSimpleName()), + Map.entry("FR_uploadSuggestedDraftOrder", UploadSuggestedDraftOrder.class.getSimpleName()), + Map.entry("FR_judgeApproval", JudgeApproval.class.getSimpleName()), + Map.entry("FR_hearingInstruction", HearingInstruction.class.getSimpleName()), Map.entry("FR_fl_RefusalOrderJudgeType", RefusalOrderInstruction.class.getSimpleName()) ); From 1098114124af4f4672d7c6b944b3cf77b7fd38d5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:39:58 +0000 Subject: [PATCH 268/336] Remove an extra blank line. --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index f23df04830..3e3f73ba12 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -137,7 +137,6 @@ private List validateStatesAgainstClassStructure(List s return validationErrors; } - private List validateCaseFieldsAgainstClassStructure(Class baseClassToCompareWith, Sheet complexTypeSheet, Sheet fixedListSheet, List caseFields) { From 7ec4d57f3fedefd477de24bfe330820a4f9f4f34 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:40:43 +0000 Subject: [PATCH 269/336] typo --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 3e3f73ba12..c8703ca5d3 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -84,7 +84,7 @@ public class CCDConfigValidator { Map.entry("FR_uploadSuggestedDraftOrder", UploadSuggestedDraftOrder.class.getSimpleName()), Map.entry("FR_judgeApproval", JudgeApproval.class.getSimpleName()), Map.entry("FR_hearingInstruction", HearingInstruction.class.getSimpleName()), - Map.entry("FR_fl_RefusalOrderJudgeType", RefusalOrderInstruction.class.getSimpleName()) + Map.entry("FR_refusalOrderInstruction", RefusalOrderInstruction.class.getSimpleName()) ); private Map specialFieldTypes = Map.ofEntries( From 0c60cf05728e59d724cd4f5a3fd6f7bad4451e3b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:52:44 +0000 Subject: [PATCH 270/336] auto configuration --- .../ccd/spreadsheet/CCDConfigValidator.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index c8703ca5d3..bf9a421510 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -31,6 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; @@ -79,12 +80,7 @@ public class CCDConfigValidator { Map.entry(DYNAMIC_LIST, "DynamicList"), Map.entry(DYNAMIC_RADIO_LIST, "DynamicRadioList"), Map.entry("FR_ct_draftDirectionOrder", "DraftDirectionOrder"), - Map.entry("Flags", "CaseFlag"), - Map.entry("FR_uploadAgreedDraftOrder", UploadAgreedDraftOrder.class.getSimpleName()), - Map.entry("FR_uploadSuggestedDraftOrder", UploadSuggestedDraftOrder.class.getSimpleName()), - Map.entry("FR_judgeApproval", JudgeApproval.class.getSimpleName()), - Map.entry("FR_hearingInstruction", HearingInstruction.class.getSimpleName()), - Map.entry("FR_refusalOrderInstruction", RefusalOrderInstruction.class.getSimpleName()) + Map.entry("Flags", "CaseFlag") ); private Map specialFieldTypes = Map.ofEntries( @@ -268,9 +264,25 @@ && fieldDoesNotHaveAValidMapping(ccdFieldAttributes, field))) { return errors; } + private static final String FR_CCD_FIELD_TYPE_PREFIX = "FR_"; + + private String tryToGetSimpleNameAutomatically(String fieldType) { + if (fieldType != null && fieldType.startsWith(FR_CCD_FIELD_TYPE_PREFIX)) { + return fieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()) + } else { + return fieldType; + } + } + private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { - return fieldTypesMap.get(ccdFieldAttributes.getFieldType()) == null - || !fieldTypesMap.get(ccdFieldAttributes.getFieldType()).equals(field.getType().getSimpleName()); + String fieldType = ccdFieldAttributes.getFieldType(); + boolean result = fieldTypesMap.get(fieldType) == null + || !fieldTypesMap.get(fieldType).equals(field.getType().getSimpleName()); + if (result) { + // trying on automatically if the fieldType is prefixed with "FR_" + result = !tryToGetSimpleNameAutomatically(fieldType).equals(field.getType().getSimpleName()); + } + return result; } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { From 77cdb153b5920e994aa8666d935dcafaa064b0c5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:54:24 +0000 Subject: [PATCH 271/336] checkstyle --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index bf9a421510..4edd020f77 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -11,11 +11,6 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.State; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.agreed.UploadAgreedDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.upload.suggested.UploadSuggestedDraftOrder; import java.io.File; import java.io.IOException; @@ -31,7 +26,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; @@ -40,6 +34,7 @@ @SuppressWarnings("unchecked") public class CCDConfigValidator { + private static final String FR_CCD_FIELD_TYPE_PREFIX = "FR_"; protected static final String CASE_FIELD_SHEET = "CaseField"; protected static final String COMPLEX_TYPES_SHEET = "ComplexTypes"; protected static final String FIXED_LISTS_SHEET = "FixedLists"; @@ -264,11 +259,9 @@ && fieldDoesNotHaveAValidMapping(ccdFieldAttributes, field))) { return errors; } - private static final String FR_CCD_FIELD_TYPE_PREFIX = "FR_"; - private String tryToGetSimpleNameAutomatically(String fieldType) { if (fieldType != null && fieldType.startsWith(FR_CCD_FIELD_TYPE_PREFIX)) { - return fieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()) + return fieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()); } else { return fieldType; } From 946cc38ff54106efdf69e9fe9a7cdc4c7c350599 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 09:56:05 +0000 Subject: [PATCH 272/336] Auto Resolving Complex Type --- .../ccd/spreadsheet/CCDConfigValidator.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index a6109ebef7..4edd020f77 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -34,6 +34,7 @@ @SuppressWarnings("unchecked") public class CCDConfigValidator { + private static final String FR_CCD_FIELD_TYPE_PREFIX = "FR_"; protected static final String CASE_FIELD_SHEET = "CaseField"; protected static final String COMPLEX_TYPES_SHEET = "ComplexTypes"; protected static final String FIXED_LISTS_SHEET = "FixedLists"; @@ -74,9 +75,7 @@ public class CCDConfigValidator { Map.entry(DYNAMIC_LIST, "DynamicList"), Map.entry(DYNAMIC_RADIO_LIST, "DynamicRadioList"), Map.entry("FR_ct_draftDirectionOrder", "DraftDirectionOrder"), - Map.entry("Flags", "CaseFlag"), - Map.entry("FR_uploadAgreedDraftOrder", "UploadAgreedDraftOrder"), - Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder") + Map.entry("Flags", "CaseFlag") ); private Map specialFieldTypes = Map.ofEntries( @@ -129,7 +128,6 @@ private List validateStatesAgainstClassStructure(List s return validationErrors; } - private List validateCaseFieldsAgainstClassStructure(Class baseClassToCompareWith, Sheet complexTypeSheet, Sheet fixedListSheet, List caseFields) { @@ -261,9 +259,23 @@ && fieldDoesNotHaveAValidMapping(ccdFieldAttributes, field))) { return errors; } + private String tryToGetSimpleNameAutomatically(String fieldType) { + if (fieldType != null && fieldType.startsWith(FR_CCD_FIELD_TYPE_PREFIX)) { + return fieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()); + } else { + return fieldType; + } + } + private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { - return fieldTypesMap.get(ccdFieldAttributes.getFieldType()) == null - || !fieldTypesMap.get(ccdFieldAttributes.getFieldType()).equals(field.getType().getSimpleName()); + String fieldType = ccdFieldAttributes.getFieldType(); + boolean result = fieldTypesMap.get(fieldType) == null + || !fieldTypesMap.get(fieldType).equals(field.getType().getSimpleName()); + if (result) { + // trying on automatically if the fieldType is prefixed with "FR_" + result = !tryToGetSimpleNameAutomatically(fieldType).equals(field.getType().getSimpleName()); + } + return result; } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { From 02e817d06bd3991dda10b7a02171a9b9c1ef17ba Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 10:07:13 +0000 Subject: [PATCH 273/336] readability --- .../ccd/spreadsheet/CCDConfigValidator.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 4edd020f77..a0441f7a72 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -259,23 +259,30 @@ && fieldDoesNotHaveAValidMapping(ccdFieldAttributes, field))) { return errors; } - private String tryToGetSimpleNameAutomatically(String fieldType) { - if (fieldType != null && fieldType.startsWith(FR_CCD_FIELD_TYPE_PREFIX)) { - return fieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()); + private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { + if (fieldTypesMap.containsKey(ccdFieldType)) { + return fieldTypesMap.get(ccdFieldType); } else { - return fieldType; + return resolveSimpleNameFromPattern(ccdFieldType); } } - private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { - String fieldType = ccdFieldAttributes.getFieldType(); - boolean result = fieldTypesMap.get(fieldType) == null - || !fieldTypesMap.get(fieldType).equals(field.getType().getSimpleName()); - if (result) { - // trying on automatically if the fieldType is prefixed with "FR_" - result = !tryToGetSimpleNameAutomatically(fieldType).equals(field.getType().getSimpleName()); + private boolean doesNotMatchFieldSimpleName(String ccdFieldType, Class clazz) { + return !resolveSimpleNameFromCCDFieldType(ccdFieldType).equals(clazz.getSimpleName()); + } + + private String resolveSimpleNameFromPattern(String ccdFieldType) { + if (ccdFieldType != null && ccdFieldType.startsWith(FR_CCD_FIELD_TYPE_PREFIX)) { + return ccdFieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()); + } else { + return null; } - return result; + } + + private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { + String ccdFieldType = ccdFieldAttributes.getFieldType(); + String resolvedSimpleName = resolveSimpleNameFromCCDFieldType(ccdFieldType); + return resolvedSimpleName == null || doesNotMatchFieldSimpleName(resolvedSimpleName, field.getType()); } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { From 54e1cea2a3a6fa71e4ddffc308c498bc7a2cb74a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 10:09:04 +0000 Subject: [PATCH 274/336] compare it in lowercase --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index a0441f7a72..8697d327ed 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -268,7 +268,7 @@ private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { } private boolean doesNotMatchFieldSimpleName(String ccdFieldType, Class clazz) { - return !resolveSimpleNameFromCCDFieldType(ccdFieldType).equals(clazz.getSimpleName()); + return !resolveSimpleNameFromCCDFieldType(ccdFieldType.toLowerCase()).equals(clazz.getSimpleName().toLowerCase()); } private String resolveSimpleNameFromPattern(String ccdFieldType) { From 27860dc45598a481c47ebaecd850ce814dde3ae6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 10:11:13 +0000 Subject: [PATCH 275/336] reverting all --- .../ccd/spreadsheet/CCDConfigValidator.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 4edd020f77..a6109ebef7 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -34,7 +34,6 @@ @SuppressWarnings("unchecked") public class CCDConfigValidator { - private static final String FR_CCD_FIELD_TYPE_PREFIX = "FR_"; protected static final String CASE_FIELD_SHEET = "CaseField"; protected static final String COMPLEX_TYPES_SHEET = "ComplexTypes"; protected static final String FIXED_LISTS_SHEET = "FixedLists"; @@ -75,7 +74,9 @@ public class CCDConfigValidator { Map.entry(DYNAMIC_LIST, "DynamicList"), Map.entry(DYNAMIC_RADIO_LIST, "DynamicRadioList"), Map.entry("FR_ct_draftDirectionOrder", "DraftDirectionOrder"), - Map.entry("Flags", "CaseFlag") + Map.entry("Flags", "CaseFlag"), + Map.entry("FR_uploadAgreedDraftOrder", "UploadAgreedDraftOrder"), + Map.entry("FR_uploadSuggestedDraftOrder", "UploadSuggestedDraftOrder") ); private Map specialFieldTypes = Map.ofEntries( @@ -128,6 +129,7 @@ private List validateStatesAgainstClassStructure(List s return validationErrors; } + private List validateCaseFieldsAgainstClassStructure(Class baseClassToCompareWith, Sheet complexTypeSheet, Sheet fixedListSheet, List caseFields) { @@ -259,23 +261,9 @@ && fieldDoesNotHaveAValidMapping(ccdFieldAttributes, field))) { return errors; } - private String tryToGetSimpleNameAutomatically(String fieldType) { - if (fieldType != null && fieldType.startsWith(FR_CCD_FIELD_TYPE_PREFIX)) { - return fieldType.substring(FR_CCD_FIELD_TYPE_PREFIX.length()); - } else { - return fieldType; - } - } - private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { - String fieldType = ccdFieldAttributes.getFieldType(); - boolean result = fieldTypesMap.get(fieldType) == null - || !fieldTypesMap.get(fieldType).equals(field.getType().getSimpleName()); - if (result) { - // trying on automatically if the fieldType is prefixed with "FR_" - result = !tryToGetSimpleNameAutomatically(fieldType).equals(field.getType().getSimpleName()); - } - return result; + return fieldTypesMap.get(ccdFieldAttributes.getFieldType()) == null + || !fieldTypesMap.get(ccdFieldAttributes.getFieldType()).equals(field.getType().getSimpleName()); } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { From b5d59f5849c64ac834bfbd013533b5328abb4fa8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 10:22:10 +0000 Subject: [PATCH 276/336] Fix NPE --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 8697d327ed..af3e1bd9c4 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; @@ -268,7 +269,10 @@ private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { } private boolean doesNotMatchFieldSimpleName(String ccdFieldType, Class clazz) { - return !resolveSimpleNameFromCCDFieldType(ccdFieldType.toLowerCase()).equals(clazz.getSimpleName().toLowerCase()); + return !Objects.equals( + resolveSimpleNameFromCCDFieldType(ccdFieldType.toLowerCase()), + clazz.getSimpleName().toLowerCase() + ); } private String resolveSimpleNameFromPattern(String ccdFieldType) { From b07f94762d2a0fe2d447a795731b0551f26c7e15 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 10:42:56 +0000 Subject: [PATCH 277/336] Bug fix --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index af3e1bd9c4..2f81265b38 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -270,7 +270,7 @@ private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { private boolean doesNotMatchFieldSimpleName(String ccdFieldType, Class clazz) { return !Objects.equals( - resolveSimpleNameFromCCDFieldType(ccdFieldType.toLowerCase()), + resolveSimpleNameFromCCDFieldType(ccdFieldType).toLowerCase(), clazz.getSimpleName().toLowerCase() ); } From 08c91b8507eb6d939fd8f5cb999003a8757232e4 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 10:49:41 +0000 Subject: [PATCH 278/336] NPE --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 2f81265b38..12ac58b866 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -31,6 +31,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; +import static java.util.Optional.ofNullable; + @Slf4j @SuppressWarnings("unchecked") public class CCDConfigValidator { @@ -270,7 +272,7 @@ private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { private boolean doesNotMatchFieldSimpleName(String ccdFieldType, Class clazz) { return !Objects.equals( - resolveSimpleNameFromCCDFieldType(ccdFieldType).toLowerCase(), + ofNullable(resolveSimpleNameFromCCDFieldType(ccdFieldType)).orElse("").toLowerCase(), clazz.getSimpleName().toLowerCase() ); } From 797aa4ef1a38e2a611a2f4d196565563af6baf95 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 11:08:17 +0000 Subject: [PATCH 279/336] Bug fix --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 12ac58b866..95742e6f53 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -31,8 +31,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -import static java.util.Optional.ofNullable; - @Slf4j @SuppressWarnings("unchecked") public class CCDConfigValidator { @@ -270,9 +268,9 @@ private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { } } - private boolean doesNotMatchFieldSimpleName(String ccdFieldType, Class clazz) { + private boolean doesNotMatchFieldSimpleName(String expectedClassSimpleName, Class clazz) { return !Objects.equals( - ofNullable(resolveSimpleNameFromCCDFieldType(ccdFieldType)).orElse("").toLowerCase(), + expectedClassSimpleName.toLowerCase(), clazz.getSimpleName().toLowerCase() ); } @@ -287,8 +285,8 @@ private String resolveSimpleNameFromPattern(String ccdFieldType) { private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { String ccdFieldType = ccdFieldAttributes.getFieldType(); - String resolvedSimpleName = resolveSimpleNameFromCCDFieldType(ccdFieldType); - return resolvedSimpleName == null || doesNotMatchFieldSimpleName(resolvedSimpleName, field.getType()); + String expectedClassName = resolveSimpleNameFromCCDFieldType(ccdFieldType); + return expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { From ee9173be2eb69871a854c0b9611383b192d6d327 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 11:14:29 +0000 Subject: [PATCH 280/336] add test case for example.txt.txt --- .../reform/finrem/caseorchestration/utils/FileUtilsTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java index 455506f73c..9ccc406852 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/utils/FileUtilsTest.java @@ -73,7 +73,8 @@ void shouldReturnFalseForNullFilename() { @CsvSource({ "'ABC.pdf', 'ABC', '.pdf'", "'document.docx', 'document', '.docx'", - "'example.txt', 'example', '.txt'" + "'example.txt', 'example', '.txt'", + "'example.txt.txt', 'example.txt', '.txt'" }) void testInsertTimestamp(String originalFilename, String expectedBaseName, String expectedExtension) { // Call the method under test From 3bdd0c521969958139eabd139402a1418917d5d5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 11:17:58 +0000 Subject: [PATCH 281/336] simplifying --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 95742e6f53..f0ed839f7a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; @@ -269,10 +268,7 @@ private String resolveSimpleNameFromCCDFieldType(String ccdFieldType) { } private boolean doesNotMatchFieldSimpleName(String expectedClassSimpleName, Class clazz) { - return !Objects.equals( - expectedClassSimpleName.toLowerCase(), - clazz.getSimpleName().toLowerCase() - ); + return !expectedClassSimpleName.toLowerCase().equals(clazz.getSimpleName().toLowerCase()); } private String resolveSimpleNameFromPattern(String ccdFieldType) { From 8b2d073272de17c2b8598951d858eade9cd82562 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 16:54:41 +0000 Subject: [PATCH 282/336] Add a warning message. --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index f0ed839f7a..6f96b7e22e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -282,6 +282,10 @@ private String resolveSimpleNameFromPattern(String ccdFieldType) { private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { String ccdFieldType = ccdFieldAttributes.getFieldType(); String expectedClassName = resolveSimpleNameFromCCDFieldType(ccdFieldType); + if (expectedClassName == null) { + log.warn("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " + + "or forgot to prefix your complex type with \"FR\" for auto-mapping."); + } return expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); } From 5b61155186b714807e349f7b1860d9ab868290d3 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 17:19:56 +0000 Subject: [PATCH 283/336] Trigger build From e4267623e09aa081ec3db9b3e274f885686f4c7d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 18 Dec 2024 17:27:35 +0000 Subject: [PATCH 284/336] underscore missing --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 6f96b7e22e..4cdbd445b5 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -284,7 +284,7 @@ private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttribu String expectedClassName = resolveSimpleNameFromCCDFieldType(ccdFieldType); if (expectedClassName == null) { log.warn("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " - + "or forgot to prefix your complex type with \"FR\" for auto-mapping."); + + "or forgot to prefix your complex type with \"FR_\" for auto-mapping."); } return expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); } From fba912c3268972f7d1534ac8ace045fb82aa72b7 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 09:26:55 +0000 Subject: [PATCH 285/336] change to info --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 4cdbd445b5..f3afbb675f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -283,7 +283,7 @@ private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttribu String ccdFieldType = ccdFieldAttributes.getFieldType(); String expectedClassName = resolveSimpleNameFromCCDFieldType(ccdFieldType); if (expectedClassName == null) { - log.warn("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " + log.info("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " + "or forgot to prefix your complex type with \"FR_\" for auto-mapping."); } return expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); From 683f5bd033cd7e886564ac1c5f8e5baa70601b1b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 09:41:45 +0000 Subject: [PATCH 286/336] warning message bug --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index f3afbb675f..020004cf2d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -282,11 +282,12 @@ private String resolveSimpleNameFromPattern(String ccdFieldType) { private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { String ccdFieldType = ccdFieldAttributes.getFieldType(); String expectedClassName = resolveSimpleNameFromCCDFieldType(ccdFieldType); - if (expectedClassName == null) { - log.info("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " + boolean result = expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); + if (result) { + log.warn("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " + "or forgot to prefix your complex type with \"FR_\" for auto-mapping."); } - return expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); + return result; } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { @@ -332,7 +333,7 @@ private List validateComplexField(List fixedListSheets, List { + complexTypeFields.forEach(c -> { log.info("Matching on field in complex type: {} with type: {}", c.getListElementCode(), c.getFieldType()); Arrays.stream(getAllDeclaredFields(frClass)) .filter(vf -> c.getListElementCode().equals(vf.getName()) || hasMatchingAnnotationForField(vf, c.getListElementCode())).findFirst() From 743d94451ba2ccaf53d9d5196b807407a86ae57e Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 11:49:34 +0000 Subject: [PATCH 287/336] update warning message --- .../model/ccd/spreadsheet/CCDConfigValidator.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java index 020004cf2d..b6aa4b760a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/CCDConfigValidator.java @@ -242,7 +242,8 @@ private List validateCCDField(List complexTypeSheets, List if (isNotASpecialFieldType(ccdFieldAttributes, field) && (isaHighLevelCaseField(complexTypeSheets, ccdFieldAttributes) && fieldDoesNotHaveAValidMapping(ccdFieldAttributes, field))) { errors.add("CCD Field Id: " + ccdFieldAttributes.getFieldId() + " Field Type: " + ccdFieldAttributes.getFieldType() - + " does not match " + field.getType().getSimpleName()); + + " does not match " + field.getType().getSimpleName() + ". It seems you either missed defining an entry in " + + "`CCDConfigValidator.fieldTypesMap` or forgot to prefix your complex type with \"FR_\" for auto-mapping."); } else { if (isComplexType(complexTypeSheets, ccdFieldAttributes.getFieldType())) { log.info("Complex Type: {}", ccdFieldAttributes.getFieldType()); @@ -282,12 +283,7 @@ private String resolveSimpleNameFromPattern(String ccdFieldType) { private boolean fieldDoesNotHaveAValidMapping(CcdFieldAttributes ccdFieldAttributes, Field field) { String ccdFieldType = ccdFieldAttributes.getFieldType(); String expectedClassName = resolveSimpleNameFromCCDFieldType(ccdFieldType); - boolean result = expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); - if (result) { - log.warn("It seems you either missed defining an entry in `CCDConfigValidator.fieldTypesMap` " - + "or forgot to prefix your complex type with \"FR_\" for auto-mapping."); - } - return result; + return expectedClassName == null || doesNotMatchFieldSimpleName(expectedClassName, field.getType()); } private boolean isaHighLevelCaseField(List complexTypeSheets, CcdFieldAttributes ccdFieldAttributes) { From b3b621271ac6ebddbee3cfdbbb656460e1b40f9b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 12:14:16 +0000 Subject: [PATCH 288/336] Fix --- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 6f9f17366c..47e5f389b0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -12,7 +12,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; From 9fc52bac52de209e5a7d12b5f6206227814f1c8d Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 12:18:33 +0000 Subject: [PATCH 289/336] Fix merge conflicts --- .../model/ccd/Approvable.java | 24 ------------------- .../model/ccd/draftorders/HasApprovable.java | 2 -- .../draftorders/agreed/AgreedDraftOrder.java | 2 +- .../judgeapproval/JudgeApprovalResolver.java | 2 -- 4 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java deleted file mode 100644 index 1da8cdf81b..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/Approvable.java +++ /dev/null @@ -1,24 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd; - -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; - -import java.time.LocalDateTime; - -public interface Approvable extends DocumentMatcher { - - OrderStatus getOrderStatus(); - - LocalDateTime getApprovalDate(); - - String getApprovalJudge(); - - CaseDocument getReplacedDocument(); - - void setOrderStatus(OrderStatus orderStatus); - - void setApprovalDate(LocalDateTime approvalDate); - - void setApprovalJudge(String approvalJudge); - - void replaceDocument(CaseDocument amendedDocument); -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java index f8b7f85e9e..9ece081cff 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/HasApprovable.java @@ -1,7 +1,5 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; - /** * Interface representing a container for an {@link Approvable} object. */ diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 47e5f389b0..97ea07054e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -8,10 +8,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasSubmittedInfo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 836400ed85..c1bdc253e7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -17,13 +17,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @Component @RequiredArgsConstructor From 34e1447b7f6aa8e1e6e7d6222a5bf40a7da6147b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 12:29:13 +0000 Subject: [PATCH 290/336] checkstyle --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index f44c6affb4..3d837c55ed 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -10,7 +10,6 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; - import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; From b2e9a5b119ee6d443a5eadbb011384d25b5bf917 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 12:47:13 +0000 Subject: [PATCH 291/336] Remove extra line --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 3d837c55ed..4e6ced67aa 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -65,7 +65,6 @@ class JudgeApprovalResolverTest { @Mock private RefusedOrderProcessor refusedOrderProcessor; - @ParameterizedTest @MethodSource("provideShouldInvokeProcessHearingInstructionData") void shouldInvokeProcessHearingInstruction(DraftOrdersWrapper draftOrdersWrapper, int expectHearingInvocationCount) { From e17d3a5c2365f8cc6e32622b1b12afe443aa02f0 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 17:30:51 +0000 Subject: [PATCH 292/336] Enhance code readability --- .../judgeapproval/JudgeApprovalResolver.java | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index c1bdc253e7..b50f416a92 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -46,25 +46,16 @@ class JudgeApprovalResolver { */ void populateJudgeDecision(FinremCaseDetails finremCaseDetails, DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { - ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> processApprovableCollection(collection.stream() - .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) - .toList(), targetDoc, judgeApproval, userAuthorisation)); + // Process objects under Draft Order Tab + processDraftOrderDocReviewCollection(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); + processPsaDocReviewCollection(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); - ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) - .ifPresent(collection -> processApprovableCollection(collection.stream() - .flatMap(c -> c.getValue().getPsaDocReviewCollection().stream().map(PsaDocReviewCollection::getValue)) - .toList(), targetDoc, judgeApproval, userAuthorisation)); - - ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) - .ifPresent(agreedDraftOrderCollections -> - processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue).toList(), targetDoc, - judgeApproval, userAuthorisation)); + // Process objects under Case Documents Tab + processAgreedDraftOrderCollection(draftOrdersWrapper, targetDoc, judgeApproval, userAuthorisation); if (isJudgeApproved(judgeApproval)) { - ofNullable(draftOrdersWrapper.getHearingInstruction()) - .map(HearingInstruction::getAnotherHearingRequestCollection) - .ifPresent(collection -> collection.forEach(a -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, a.getValue()))); + processHearingInstruction(draftOrdersWrapper); + } refusedOrderProcessor.processRefusedOrders(finremCaseDetails, draftOrdersWrapper, judgeApproval, userAuthorisation); } @@ -135,4 +126,34 @@ private boolean isJudgeApproved(JudgeApproval judgeApproval) { private boolean isJudgeRefused(JudgeApproval judgeApproval) { return ofNullable(judgeApproval).map(JudgeApproval::getJudgeDecision).map(JudgeDecision::isRefused).orElse(false); } + + private void processDraftOrderDocReviewCollection(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> processApprovableCollection(collection.stream() + .flatMap(c -> c.getValue().getDraftOrderDocReviewCollection().stream().map(DraftOrderDocReviewCollection::getValue)) + .toList(), targetDoc, judgeApproval, userAuthorisation)); + } + + private void processPsaDocReviewCollection(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + ofNullable(draftOrdersWrapper.getDraftOrdersReviewCollection()) + .ifPresent(collection -> processApprovableCollection(collection.stream() + .flatMap(c -> c.getValue().getPsaDocReviewCollection().stream().map(PsaDocReviewCollection::getValue)) + .toList(), targetDoc, judgeApproval, userAuthorisation)); + } + + private void processAgreedDraftOrderCollection(DraftOrdersWrapper draftOrdersWrapper, CaseDocument targetDoc, JudgeApproval judgeApproval, + String userAuthorisation) { + ofNullable(draftOrdersWrapper.getAgreedDraftOrderCollection()) + .ifPresent(agreedDraftOrderCollections -> + processApprovableCollection(agreedDraftOrderCollections.stream().map(AgreedDraftOrderCollection::getValue).toList(), targetDoc, + judgeApproval, userAuthorisation)); + } + + private void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper) { + ofNullable(draftOrdersWrapper.getHearingInstruction()) + .map(HearingInstruction::getAnotherHearingRequestCollection) + .ifPresent(collection -> collection.forEach(a -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, a.getValue()))); + } } From 45b9afb8969e9ca41c21481a3968756b0d4582d8 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 17:31:25 +0000 Subject: [PATCH 293/336] Remove extra blank line. --- .../service/judgeapproval/JudgeApprovalResolver.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b50f416a92..d65b311962 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -71,7 +71,6 @@ void populateJudgeDecision(FinremCaseDetails finremCaseDetails, DraftOrdersWrapp */ void processApprovableCollection(List approvables, CaseDocument targetDoc, JudgeApproval judgeApproval, String userAuthorisation) { - ofNullable(approvables) .ifPresent(list -> list.forEach(el -> ofNullable(el) From e90ce4b6d5277867a80ce9116beb785f4b887aed Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 17:56:53 +0000 Subject: [PATCH 294/336] Fix --- .../ApproveDraftOrdersAboutToStartHandler.java | 4 ++-- .../model/ccd/draftorders/Approvable.java | 10 ++++++++-- .../ccd/draftorders/agreed/AgreedDraftOrder.java | 10 ---------- .../draftorders/review/DraftOrderDocumentReview.java | 12 ------------ .../ccd/draftorders/review/PsaDocumentReview.java | 12 ------------ .../service/judgeapproval/JudgeApprovalResolver.java | 6 ++++++ 6 files changed, 16 insertions(+), 38 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 8c996c735e..23d44493d1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -138,7 +138,7 @@ private List getReviewableItems(List .hearingJudge(draftOrdersReview.getHearingJudge()) .hearingDate(draftOrdersReview.getHearingDate()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() - .code("Yes") + .code(YesOrNo.YES.getYesOrNo()) .label("This is a final order") .build())).build()) .document(a.getDraftOrderDocument()) @@ -161,7 +161,7 @@ private List getReviewableItems(List .hearingJudge(draftOrdersReview.getHearingJudge()) .hearingDate(draftOrdersReview.getHearingDate()) .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() - .code("Yes") + .code(YesOrNo.YES.getYesOrNo()) .label("This is a final order") .build())).build()) .document(a.getPsaDocument()) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java index 0e11e13726..6ca59cdd95 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java @@ -2,6 +2,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DocumentMatcher; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import java.time.LocalDateTime; @@ -18,9 +19,14 @@ public interface Approvable extends DocumentMatcher { void setOrderStatus(OrderStatus orderStatus); - void setApprovalDate(LocalDateTime approvalDate); + default void setApprovalDate(LocalDateTime approvalDate) { + } - void setApprovalJudge(String approvalJudge); + default void setApprovalJudge(String approvalJudge) { + } void replaceDocument(CaseDocument amendedDocument); + + default void setFinalOrder(YesOrNo finalOrder) { + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 97ea07054e..ba356d740b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -72,16 +72,6 @@ public CaseDocument getReplacedDocument() { } } - @Override - public void setApprovalDate(LocalDateTime approvalDate) { - // no approval date; Ignore it. - } - - @Override - public void setApprovalJudge(String approvalJudge) { - // no approval judge; Ignore it. - } - @Override public void replaceDocument(CaseDocument amendedDocument) { if (this.draftOrder != null) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index e26a6ce23a..f64d64a813 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -47,18 +47,6 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Re @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; - @JsonIgnore - @Override - public LocalDateTime getApprovalDate() { - return approvalDate; - } - - @JsonIgnore - @Override - public String getApprovalJudge() { - return approvalJudge; - } - @JsonIgnore @Override public CaseDocument getReplacedDocument() { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index 564b810d32..e7b7f7bc41 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -44,18 +44,6 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, RefusalOr @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime notificationSentDate; - @JsonIgnore - @Override - public LocalDateTime getApprovalDate() { - return approvalDate; - } - - @JsonIgnore - @Override - public String getApprovalJudge() { - return approvalJudge; - } - @JsonIgnore @Override public CaseDocument getReplacedDocument() { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index d65b311962..df6b618980 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -4,6 +4,7 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -92,6 +93,7 @@ void processApprovableCollection(List approvables, CaseDoc void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); if (isJudgeApproved(judgeApproval)) { + approvable.setFinalOrder(YesOrNo.forValue(isFinalOrderSelected(judgeApproval))); if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { approvable.replaceDocument(judgeApproval.getAmendedDocument()); } @@ -155,4 +157,8 @@ private void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper) { .map(HearingInstruction::getAnotherHearingRequestCollection) .ifPresent(collection -> collection.forEach(a -> hearingProcessor.processHearingInstruction(draftOrdersWrapper, a.getValue()))); } + + private boolean isFinalOrderSelected(JudgeApproval judgeApproval) { + return judgeApproval.getIsFinalOrder().getValue().stream().anyMatch(d -> YesOrNo.isYes(d.getCode())); + } } From 31a3cc2e45d089fc3c9cd76a64d72ac9c1034b60 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 18:18:19 +0000 Subject: [PATCH 295/336] Bug fix --- .../service/judgeapproval/JudgeApprovalResolver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index df6b618980..9a8996ab5a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectList; 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.draftorders.Approvable; @@ -18,6 +19,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; import java.time.LocalDateTime; +import java.util.Collection; import java.util.List; import static java.util.Optional.ofNullable; @@ -159,6 +161,8 @@ private void processHearingInstruction(DraftOrdersWrapper draftOrdersWrapper) { } private boolean isFinalOrderSelected(JudgeApproval judgeApproval) { - return judgeApproval.getIsFinalOrder().getValue().stream().anyMatch(d -> YesOrNo.isYes(d.getCode())); + return ofNullable(judgeApproval.getIsFinalOrder()) + .map(DynamicMultiSelectList::getValue).stream().flatMap(Collection::stream) + .anyMatch(d -> YesOrNo.isYes(d.getCode())); } } From 40a77de0ae71bdbfc8d49347a0770a0844417688 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 18:52:54 +0000 Subject: [PATCH 296/336] update test cases --- .../caseorchestration/model/ccd/YesOrNo.java | 9 +- .../model/ccd/draftorders/Approvable.java | 6 +- .../draftorders/agreed/AgreedDraftOrder.java | 6 ++ .../JudgeApprovalResolverTest.java | 86 +++++++++++++------ 4 files changed, 76 insertions(+), 31 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/YesOrNo.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/YesOrNo.java index 1b6f833365..1885bd81f7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/YesOrNo.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/YesOrNo.java @@ -25,6 +25,10 @@ public static String getYesOrNo(YesOrNo answer) { : YesOrNo.NO.getYesOrNo(); } + public static String getYesOrNo(boolean answer) { + return forValue(answer).value; + } + public boolean isYes() { return YES.getYesOrNo().equalsIgnoreCase(value); } @@ -64,7 +68,10 @@ public static YesOrNo forValue(String yesOrNo) { .orElseThrow(IllegalArgumentException::new); } - public static YesOrNo forValue(boolean b) { + public static YesOrNo forValue(Boolean b) { + if (b == null) { + return null; + } return forValue(b ? YES.value : NO.value); } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java index 6ca59cdd95..2a9be7d026 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java @@ -15,6 +15,8 @@ public interface Approvable extends DocumentMatcher { String getApprovalJudge(); + YesOrNo getFinalOrder(); + CaseDocument getReplacedDocument(); void setOrderStatus(OrderStatus orderStatus); @@ -25,8 +27,8 @@ default void setApprovalDate(LocalDateTime approvalDate) { default void setApprovalJudge(String approvalJudge) { } - void replaceDocument(CaseDocument amendedDocument); - default void setFinalOrder(YesOrNo finalOrder) { } + + void replaceDocument(CaseDocument amendedDocument); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index ba356d740b..b1d255ce30 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -60,6 +60,12 @@ public String getApprovalJudge() { return null; } + @JsonIgnore + @Override + public YesOrNo getFinalOrder() { + return null; + } + @JsonIgnore @Override public CaseDocument getReplacedDocument() { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 4e6ced67aa..c39b3decd1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -11,7 +11,10 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectList; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectListElement; 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.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -34,6 +37,8 @@ import java.util.List; import java.util.stream.Stream; +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; @@ -124,7 +129,8 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW boolean shouldBeApproved, CaseDocument targetDoc, OrderStatus expectedOrderStatus, - CaseDocument expectedAmendedDocument) { + CaseDocument expectedAmendedDocument, + YesOrNo expectedFinalOrder) { // Mocking IDAM service for getting judge's full name lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn(APPROVED_JUDGE_NAME); @@ -155,12 +161,50 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW } } - static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { + static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftReview, + Boolean isFinalOrder) { + CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); + CaseDocument amendedDocument = CaseDocument.builder().documentUrl("AMENDED_DOC.doc").build(); + + JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() + .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) + .amendedDocument(amendedDocument); + + JudgeApproval judgeApproval = null; + if (isFinalOrder == null) { + judgeApproval = judgeApprovalBuilder.build(); + } else { + judgeApproval = judgeApprovalBuilder + .isFinalOrder(DynamicMultiSelectList.builder().value(List.of( + DynamicMultiSelectListElement.builder() + .code(YesOrNo.getYesOrNo(isFinalOrder)) + .build()) + ).build()) + .build(); + } + return Arguments.of( + DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder().value(draftReview).build())) + .build()) + .build())) + .build(), + List.of(draftReview), + judgeApproval, + true, // should be approved + draftOrderDocument, + OrderStatus.APPROVED_BY_JUDGE, + amendedDocument, + YesOrNo.forValue(isFinalOrder) + ); + } + static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { // Mock approvable objects CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); CaseDocument psaDocument = CaseDocument.builder().documentUrl("NEW_DOC2.doc").build(); - CaseDocument amendedDocument = CaseDocument.builder().documentUrl("AMENDED_DOC.doc").build(); DraftOrderDocumentReview draftReview = DraftOrderDocumentReview.builder() .draftOrderDocument(draftOrderDocument) @@ -171,33 +215,17 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); - JudgeApproval approvedJudgeApproval = JudgeApproval.builder() - .judgeDecision(READY_TO_BE_SEALED) - .build(); - - JudgeApproval approvedJudgeApprovalWithChanges = JudgeApproval.builder() - .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) - .amendedDocument(amendedDocument) - .build(); + JudgeApproval.JudgeApprovalBuilder approvedJudgeApprovalBuilder = JudgeApproval.builder() + .judgeDecision(READY_TO_BE_SEALED); JudgeApproval notApprovedJudgeApproval = JudgeApproval.builder().judgeDecision(null).build(); return Stream.of( - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder() - .value(draftReview).build())) - .build()).build())) - .build(), - List.of(draftReview), - approvedJudgeApprovalWithChanges, - true, // should be approved - draftOrderDocument, - OrderStatus.APPROVED_BY_JUDGE, - amendedDocument - ), + // + checkJudgeNeedsToMakeChanges(draftReview, TRUE), + checkJudgeNeedsToMakeChanges(draftReview, FALSE), + checkJudgeNeedsToMakeChanges(draftReview, null), + // Arguments.of( DraftOrdersWrapper.builder() .draftOrdersReviewCollection(List.of( @@ -207,10 +235,11 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova .build()).build())) .build(), List.of(psaReview), - approvedJudgeApproval, + approvedJudgeApprovalBuilder.build(), true, // should be approved psaDocument, OrderStatus.APPROVED_BY_JUDGE, + null, null ), Arguments.of( @@ -223,9 +252,10 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova false, // should not be approved CaseDocument.builder().build(), null, + null, null ), - Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApproval, false, null, null, null) + Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApprovalBuilder.build(), false, null, null, null, null) ); } From 9531975d3d926542c49d96b87d84d66537d0d3bc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 19:00:19 +0000 Subject: [PATCH 297/336] missing assert --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index c39b3decd1..b2214c3562 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -147,6 +147,7 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW assertEquals(expectedOrderStatus, approvable.getOrderStatus()); assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); + assertEquals(expectedFinalOrder, approvable.getFinalOrder()); if (expectedAmendedDocument != null) { assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); } From a1b7502a9c5e405d9392fd4e2cd4e135f399dcca Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 19 Dec 2024 20:53:53 +0000 Subject: [PATCH 298/336] Fix test case --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index b2214c3562..35c2e11f1d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -48,6 +48,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @@ -241,7 +242,7 @@ static Stream provideProcessApprovableCollectionDataWithHandleApprova psaDocument, OrderStatus.APPROVED_BY_JUDGE, null, - null + NO ), Arguments.of( DraftOrdersWrapper.builder() From 22abd780eba38ba0457f0a8b1206d86ef547f95b Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 11:59:02 +0000 Subject: [PATCH 299/336] Update test case. --- .../JudgeApprovalResolverTest.java | 187 ++++++++---------- 1 file changed, 87 insertions(+), 100 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 35c2e11f1d..3f49a599aa 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -35,12 +35,14 @@ import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; import java.util.stream.Stream; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; @@ -48,7 +50,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; @@ -123,15 +124,12 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { } @ParameterizedTest - @MethodSource("provideProcessApprovableCollectionDataWithHandleApprovable") - void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersWrapper, - List approvables, - JudgeApproval judgeApproval, - boolean shouldBeApproved, - CaseDocument targetDoc, - OrderStatus expectedOrderStatus, - CaseDocument expectedAmendedDocument, - YesOrNo expectedFinalOrder) { + @MethodSource("providePopulateJudgeDecisionForApprovedDocumentsArguments") + void shouldPopulateJudgeDecisionForApprovedDocuments(DraftOrdersWrapper draftOrdersWrapper, + List approvables, + JudgeApproval judgeApproval, + CaseDocument expectedAmendedDocument, + YesOrNo expectedFinalOrder) { // Mocking IDAM service for getting judge's full name lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn(APPROVED_JUDGE_NAME); @@ -139,125 +137,114 @@ void shouldProcessApprovablesAndUpdateTheirState(DraftOrdersWrapper draftOrdersW try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { mockedStatic.when(LocalDateTime::now).thenReturn(FIXED_DATE_TIME); judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder().build(), - draftOrdersWrapper, targetDoc, judgeApproval, AUTH_TOKEN); + draftOrdersWrapper, TARGET_DOCUMENT, judgeApproval, AUTH_TOKEN); + boolean approvedDocument = false; if (approvables != null) { for (Approvable approvable : approvables) { - if (approvable.match(targetDoc)) { - if (shouldBeApproved) { - assertEquals(expectedOrderStatus, approvable.getOrderStatus()); - assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); - assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); - assertEquals(expectedFinalOrder, approvable.getFinalOrder()); - if (expectedAmendedDocument != null) { - assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); - } - } else { - assertNull(approvable.getOrderStatus()); - assertNull(approvable.getApprovalDate()); - assertNull(approvable.getApprovalJudge()); + if (approvable.match(expectedAmendedDocument != null ? expectedAmendedDocument : TARGET_DOCUMENT)) { + assertEquals(OrderStatus.APPROVED_BY_JUDGE, approvable.getOrderStatus()); + assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); + assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); + assertEquals(expectedFinalOrder, approvable.getFinalOrder()); + if (expectedAmendedDocument != null) { + assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); } + approvedDocument = true; } } } + assertTrue(approvedDocument, "One of the approvables should be got approved"); } } - static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftReview, - Boolean isFinalOrder) { - CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); - CaseDocument amendedDocument = CaseDocument.builder().documentUrl("AMENDED_DOC.doc").build(); + static DraftOrderDocumentReview createDraftOrderReview() { + return DraftOrderDocumentReview.builder().draftOrderDocument(TARGET_DOCUMENT).build(); + } + static PsaDocumentReview createPsaReview() { + return PsaDocumentReview.builder().psaDocument(TARGET_DOCUMENT).build(); + } + + static AgreedDraftOrder createAgreedDraftOrder(boolean draftOrderOrPsa) { + if (draftOrderOrPsa) { + return AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT).build(); + } else { + return AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build(); + } + } + + static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, Boolean isFinalOrder) { + CaseDocument amendedDocument = CaseDocument.builder().documentUrl("AMENDED_DOC.doc").build(); JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) .amendedDocument(amendedDocument); + return buildArguments(judgeApprovalBuilder, draftReview, psaReview, amendedDocument, isFinalOrder); + } + + static Arguments checkReadyToBeSealed(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, Boolean isFinalOrder) { + JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() + .judgeDecision(READY_TO_BE_SEALED); + return buildArguments(judgeApprovalBuilder, draftReview, psaReview, null, isFinalOrder); + } + static Arguments buildArguments(JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder , DraftOrderDocumentReview draftReview, + PsaDocumentReview psaReview, CaseDocument amendedDocument, Boolean isFinalOrder) { JudgeApproval judgeApproval = null; if (isFinalOrder == null) { judgeApproval = judgeApprovalBuilder.build(); } else { judgeApproval = judgeApprovalBuilder - .isFinalOrder(DynamicMultiSelectList.builder().value(List.of( - DynamicMultiSelectListElement.builder() - .code(YesOrNo.getYesOrNo(isFinalOrder)) - .build()) - ).build()) + .isFinalOrder(DynamicMultiSelectList.builder() + .value(TRUE.equals(isFinalOrder) ? + List.of( + DynamicMultiSelectListElement.builder() + .code(YesOrNo.YES.getYesOrNo()) + .build() + ) : List.of() + ) + .build()) .build(); } + + DraftOrdersWrapper.DraftOrdersWrapperBuilder draftOrdersWrapperBuilder = DraftOrdersWrapper.builder(); + if (draftReview != null || psaReview != null) { + DraftOrdersReview.DraftOrdersReviewBuilder b = DraftOrdersReview.builder(); + if (draftReview != null) { + b.draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder().value(draftReview).build())); + } + if (psaReview != null) { + b.psaDocReviewCollection(List.of(PsaDocReviewCollection.builder().value(psaReview).build())); + } + + draftOrdersWrapperBuilder.draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(b.build()) + .build())); + } return Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder().value(draftReview).build())) - .build()) - .build())) - .build(), - List.of(draftReview), + draftOrdersWrapperBuilder.build(), + Stream.of(draftReview, psaReview).filter(Objects::nonNull).toList(), judgeApproval, - true, // should be approved - draftOrderDocument, - OrderStatus.APPROVED_BY_JUDGE, amendedDocument, - YesOrNo.forValue(isFinalOrder) + YesOrNo.forValue(isFinalOrder == null ? FALSE : isFinalOrder) ); } - static Stream provideProcessApprovableCollectionDataWithHandleApprovable() { - // Mock approvable objects - CaseDocument draftOrderDocument = CaseDocument.builder().documentUrl("NEW_DOC1.doc").build(); - CaseDocument psaDocument = CaseDocument.builder().documentUrl("NEW_DOC2.doc").build(); - - DraftOrderDocumentReview draftReview = DraftOrderDocumentReview.builder() - .draftOrderDocument(draftOrderDocument) - .build(); - PsaDocumentReview psaReview = PsaDocumentReview.builder() - .psaDocument(psaDocument) - .build(); - - List agreedDrafts = List.of(AgreedDraftOrder.builder().build()); - - JudgeApproval.JudgeApprovalBuilder approvedJudgeApprovalBuilder = JudgeApproval.builder() - .judgeDecision(READY_TO_BE_SEALED); - - JudgeApproval notApprovedJudgeApproval = JudgeApproval.builder().judgeDecision(null).build(); - + static Stream providePopulateJudgeDecisionForApprovedDocumentsArguments() { return Stream.of( - // - checkJudgeNeedsToMakeChanges(draftReview, TRUE), - checkJudgeNeedsToMakeChanges(draftReview, FALSE), - checkJudgeNeedsToMakeChanges(draftReview, null), - // - Arguments.of( - DraftOrdersWrapper.builder() - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() - .psaDocReviewCollection(List.of(PsaDocReviewCollection.builder() - .value(psaReview).build())) - .build()).build())) - .build(), - List.of(psaReview), - approvedJudgeApprovalBuilder.build(), - true, // should be approved - psaDocument, - OrderStatus.APPROVED_BY_JUDGE, - null, - NO - ), - Arguments.of( - DraftOrdersWrapper.builder() - .agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDrafts.get(0)).build())) - .build(), - agreedDrafts, - notApprovedJudgeApproval, - false, // should not be approved - CaseDocument.builder().build(), - null, - null, - null - ), - Arguments.of(DraftOrdersWrapper.builder().build(), null, approvedJudgeApprovalBuilder.build(), false, null, null, null, null) + checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, TRUE), + checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, FALSE), + checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null), + checkJudgeNeedsToMakeChanges(null, createPsaReview(), TRUE), + checkJudgeNeedsToMakeChanges(null, createPsaReview(), FALSE), + checkJudgeNeedsToMakeChanges(null, createPsaReview(), null), + checkReadyToBeSealed(createDraftOrderReview(), null, TRUE), + checkReadyToBeSealed(createDraftOrderReview(), null, FALSE), + checkReadyToBeSealed(createDraftOrderReview(), null, null), + checkReadyToBeSealed(null, createPsaReview(), TRUE), + checkReadyToBeSealed(null, createPsaReview(), FALSE), + checkReadyToBeSealed(null, createPsaReview(),null) ); } From 5a5fb20354d01efe69745a17bf0349cbe15c75e3 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 12:09:18 +0000 Subject: [PATCH 300/336] Checkstyle --- .../service/judgeapproval/JudgeApprovalResolverTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index 3f49a599aa..f292bc5f7c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -179,17 +179,17 @@ static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftRevi JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) .amendedDocument(amendedDocument); - return buildArguments(judgeApprovalBuilder, draftReview, psaReview, amendedDocument, isFinalOrder); + return buildArgumentsForApprovingDocument(judgeApprovalBuilder, draftReview, psaReview, amendedDocument, isFinalOrder); } static Arguments checkReadyToBeSealed(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, Boolean isFinalOrder) { JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() .judgeDecision(READY_TO_BE_SEALED); - return buildArguments(judgeApprovalBuilder, draftReview, psaReview, null, isFinalOrder); + return buildArgumentsForApprovingDocument(judgeApprovalBuilder, draftReview, psaReview, null, isFinalOrder); } - static Arguments buildArguments(JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder , DraftOrderDocumentReview draftReview, - PsaDocumentReview psaReview, CaseDocument amendedDocument, Boolean isFinalOrder) { + static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder, DraftOrderDocumentReview draftReview, + PsaDocumentReview psaReview, CaseDocument amendedDocument, Boolean isFinalOrder) { JudgeApproval judgeApproval = null; if (isFinalOrder == null) { judgeApproval = judgeApprovalBuilder.build(); From e48a91aedfc772b80fa3e5d2c61e0d6d7aff6fb7 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 12:28:54 +0000 Subject: [PATCH 301/336] update tests --- .../JudgeApprovalResolverTest.java | 73 +++++++++++++------ 1 file changed, 50 insertions(+), 23 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index f292bc5f7c..e0b7e28870 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -144,9 +144,15 @@ void shouldPopulateJudgeDecisionForApprovedDocuments(DraftOrdersWrapper draftOrd for (Approvable approvable : approvables) { if (approvable.match(expectedAmendedDocument != null ? expectedAmendedDocument : TARGET_DOCUMENT)) { assertEquals(OrderStatus.APPROVED_BY_JUDGE, approvable.getOrderStatus()); - assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); - assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); - assertEquals(expectedFinalOrder, approvable.getFinalOrder()); + if (!(approvable instanceof AgreedDraftOrder)) { + assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); + assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); + assertEquals(expectedFinalOrder, approvable.getFinalOrder()); + } else { + assertNull(approvable.getApprovalDate()); + assertNull(approvable.getApprovalJudge()); + assertNull(approvable.getFinalOrder()); + } if (expectedAmendedDocument != null) { assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); } @@ -174,22 +180,26 @@ static AgreedDraftOrder createAgreedDraftOrder(boolean draftOrderOrPsa) { } } - static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, Boolean isFinalOrder) { + static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, + AgreedDraftOrder agreedDraftOrder, Boolean isFinalOrder) { CaseDocument amendedDocument = CaseDocument.builder().documentUrl("AMENDED_DOC.doc").build(); JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) .amendedDocument(amendedDocument); - return buildArgumentsForApprovingDocument(judgeApprovalBuilder, draftReview, psaReview, amendedDocument, isFinalOrder); + return buildArgumentsForApprovingDocument(judgeApprovalBuilder, draftReview, psaReview, agreedDraftOrder, amendedDocument, isFinalOrder); } - static Arguments checkReadyToBeSealed(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, Boolean isFinalOrder) { + static Arguments checkReadyToBeSealed(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, AgreedDraftOrder agreedDraftOrder, + Boolean isFinalOrder) { JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder = JudgeApproval.builder() .judgeDecision(READY_TO_BE_SEALED); - return buildArgumentsForApprovingDocument(judgeApprovalBuilder, draftReview, psaReview, null, isFinalOrder); + return buildArgumentsForApprovingDocument(judgeApprovalBuilder, draftReview, psaReview, agreedDraftOrder, null, isFinalOrder); } - static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder, DraftOrderDocumentReview draftReview, - PsaDocumentReview psaReview, CaseDocument amendedDocument, Boolean isFinalOrder) { + static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalBuilder judgeApprovalBuilder, + DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, + AgreedDraftOrder agreedDraftOrder, + CaseDocument amendedDocument, Boolean isFinalOrder) { JudgeApproval judgeApproval = null; if (isFinalOrder == null) { judgeApproval = judgeApprovalBuilder.build(); @@ -216,15 +226,19 @@ static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalB if (psaReview != null) { b.psaDocReviewCollection(List.of(PsaDocReviewCollection.builder().value(psaReview).build())); } - draftOrdersWrapperBuilder.draftOrdersReviewCollection(List.of( DraftOrdersReviewCollection.builder() .value(b.build()) .build())); } + if (agreedDraftOrder != null) { + draftOrdersWrapperBuilder.agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDraftOrder).build() + )); + } return Arguments.of( draftOrdersWrapperBuilder.build(), - Stream.of(draftReview, psaReview).filter(Objects::nonNull).toList(), + Stream.of(draftReview, psaReview, agreedDraftOrder).filter(Objects::nonNull).toList(), judgeApproval, amendedDocument, YesOrNo.forValue(isFinalOrder == null ? FALSE : isFinalOrder) @@ -233,18 +247,31 @@ static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalB static Stream providePopulateJudgeDecisionForApprovedDocumentsArguments() { return Stream.of( - checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, TRUE), - checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, FALSE), - checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null), - checkJudgeNeedsToMakeChanges(null, createPsaReview(), TRUE), - checkJudgeNeedsToMakeChanges(null, createPsaReview(), FALSE), - checkJudgeNeedsToMakeChanges(null, createPsaReview(), null), - checkReadyToBeSealed(createDraftOrderReview(), null, TRUE), - checkReadyToBeSealed(createDraftOrderReview(), null, FALSE), - checkReadyToBeSealed(createDraftOrderReview(), null, null), - checkReadyToBeSealed(null, createPsaReview(), TRUE), - checkReadyToBeSealed(null, createPsaReview(), FALSE), - checkReadyToBeSealed(null, createPsaReview(),null) + checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null, TRUE), + checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null, FALSE), + checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null, null), + checkJudgeNeedsToMakeChanges(null, createPsaReview(), null, TRUE), + checkJudgeNeedsToMakeChanges(null, createPsaReview(), null, FALSE), + checkJudgeNeedsToMakeChanges(null, createPsaReview(), null, null), + checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(true), TRUE), + checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(true), FALSE), + checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(true), null), + checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(false), TRUE), + checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(false), FALSE), + checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(false), null), + + checkReadyToBeSealed(createDraftOrderReview(), null, null, TRUE), + checkReadyToBeSealed(createDraftOrderReview(), null, null, FALSE), + checkReadyToBeSealed(createDraftOrderReview(), null, null, null), + checkReadyToBeSealed(null, createPsaReview(), null, TRUE), + checkReadyToBeSealed(null, createPsaReview(), null, FALSE), + checkReadyToBeSealed(null, createPsaReview(),null, null), + checkReadyToBeSealed(null, null, createAgreedDraftOrder(true), TRUE), + checkReadyToBeSealed(null, null, createAgreedDraftOrder(true), FALSE), + checkReadyToBeSealed(null, null, createAgreedDraftOrder(true), null), + checkReadyToBeSealed(null, null, createAgreedDraftOrder(false), TRUE), + checkReadyToBeSealed(null, null, createAgreedDraftOrder(false), FALSE), + checkReadyToBeSealed(null, null, createAgreedDraftOrder(false), null) ); } From 83ef6293e2ef9aad0380da6773d2dc7637777859 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 12:31:38 +0000 Subject: [PATCH 302/336] checkstyle fix --- .../judgeapproval/JudgeApprovalResolverTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index e0b7e28870..a9e23e32e3 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -206,12 +206,12 @@ static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalB } else { judgeApproval = judgeApprovalBuilder .isFinalOrder(DynamicMultiSelectList.builder() - .value(TRUE.equals(isFinalOrder) ? - List.of( + .value(TRUE.equals(isFinalOrder) + ? List.of( DynamicMultiSelectListElement.builder() .code(YesOrNo.YES.getYesOrNo()) - .build() - ) : List.of() + .build()) + : List.of() ) .build()) .build(); @@ -233,7 +233,7 @@ static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalB } if (agreedDraftOrder != null) { draftOrdersWrapperBuilder.agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDraftOrder).build() + AgreedDraftOrderCollection.builder().value(agreedDraftOrder).build() )); } return Arguments.of( From ca2cf012021bc608f7c74d0af7947d64d275efdb Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 13:23:58 +0000 Subject: [PATCH 303/336] update test --- .../judgeapproval/JudgeApprovalResolver.java | 27 ++-- .../JudgeApprovalResolverTest.java | 130 ++++++++++++------ 2 files changed, 102 insertions(+), 55 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 9a8996ab5a..b98d66799f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -93,19 +93,22 @@ void processApprovableCollection(List approvables, CaseDoc * @param userAuthorisation the user authorization string to get the judge's full name */ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { - approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); - if (isJudgeApproved(judgeApproval)) { - approvable.setFinalOrder(YesOrNo.forValue(isFinalOrderSelected(judgeApproval))); - if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { - approvable.replaceDocument(judgeApproval.getAmendedDocument()); + if (isJudgeApproved(judgeApproval) || isJudgeRefused(judgeApproval)) { + approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); + + if (isJudgeApproved(judgeApproval)) { + approvable.setFinalOrder(YesOrNo.forValue(isFinalOrderSelected(judgeApproval))); + if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { + approvable.replaceDocument(judgeApproval.getAmendedDocument()); + } + approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + approvable.setApprovalDate(LocalDateTime.now()); } - approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); - approvable.setApprovalDate(LocalDateTime.now()); - } - if (isJudgeRefused(judgeApproval)) { - approvable.setOrderStatus(REFUSED); - if (approvable instanceof RefusalOrderConvertible refusalOrderConvertible) { - refusalOrderConvertible.setRefusedDate(LocalDateTime.now()); + if (isJudgeRefused(judgeApproval)) { + approvable.setOrderStatus(REFUSED); + if (approvable instanceof RefusalOrderConvertible refusalOrderConvertible) { + refusalOrderConvertible.setRefusedDate(LocalDateTime.now()); + } } } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index a9e23e32e3..eb088198da 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -52,6 +52,8 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; @ExtendWith(MockitoExtension.class) class JudgeApprovalResolverTest { @@ -123,10 +125,48 @@ static Stream provideShouldInvokeProcessHearingInstructionData() { ); } + @ParameterizedTest + @MethodSource("provideNotPopulateAnythingForReviewLaterDecisionArguments") + void shouldNotPopulateAnythingForReviewLaterDecision(DraftOrdersWrapper draftOrdersWrapper, + List approvablesToBeExamined) { + JudgeApproval judgeApproval = JudgeApproval.builder().judgeDecision(JudgeDecision.REVIEW_LATER).build(); + + // Mocking IDAM service for getting judge's full name + lenient().when(idamService.getIdamFullName(AUTH_TOKEN)).thenReturn(APPROVED_JUDGE_NAME); + + try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { + mockedStatic.when(LocalDateTime::now).thenReturn(FIXED_DATE_TIME); + judgeApprovalResolver.populateJudgeDecision(FinremCaseDetails.builder().build(), draftOrdersWrapper, TARGET_DOCUMENT, judgeApproval, + AUTH_TOKEN); + + if (approvablesToBeExamined != null) { + for (Approvable approvable : approvablesToBeExamined) { + assertEquals(TO_BE_REVIEWED, approvable.getOrderStatus()); + assertNull(approvable.getApprovalDate()); + assertNull(approvable.getApprovalJudge()); + assertNull(approvable.getFinalOrder()); + } + } + } + } + + static Stream provideNotPopulateAnythingForReviewLaterDecisionArguments() { + DraftOrderDocumentReview draftOrderDocumentReview = createDraftOrderDocumentReview(); + PsaDocumentReview psaDocumentReview = createPsaDocumentReview(); + AgreedDraftOrder agreedDraftOrder = createAgreedDraftOrder(true); + AgreedDraftOrder agreedPsa = createAgreedDraftOrder(false); + return Stream.of( + Arguments.of(createDraftOrdersWrapper(draftOrderDocumentReview, null, null), List.of(draftOrderDocumentReview)), + Arguments.of(createDraftOrdersWrapper(null, psaDocumentReview, null), List.of(psaDocumentReview)), + Arguments.of(createDraftOrdersWrapper(null, null, agreedDraftOrder), List.of(agreedDraftOrder)), + Arguments.of(createDraftOrdersWrapper(null, null, agreedPsa), List.of(agreedPsa)) + ); + } + @ParameterizedTest @MethodSource("providePopulateJudgeDecisionForApprovedDocumentsArguments") void shouldPopulateJudgeDecisionForApprovedDocuments(DraftOrdersWrapper draftOrdersWrapper, - List approvables, + List approvablesToBeExamined, JudgeApproval judgeApproval, CaseDocument expectedAmendedDocument, YesOrNo expectedFinalOrder) { @@ -140,10 +180,10 @@ void shouldPopulateJudgeDecisionForApprovedDocuments(DraftOrdersWrapper draftOrd draftOrdersWrapper, TARGET_DOCUMENT, judgeApproval, AUTH_TOKEN); boolean approvedDocument = false; - if (approvables != null) { - for (Approvable approvable : approvables) { + if (approvablesToBeExamined != null) { + for (Approvable approvable : approvablesToBeExamined) { if (approvable.match(expectedAmendedDocument != null ? expectedAmendedDocument : TARGET_DOCUMENT)) { - assertEquals(OrderStatus.APPROVED_BY_JUDGE, approvable.getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, approvable.getOrderStatus()); if (!(approvable instanceof AgreedDraftOrder)) { assertEquals(FIXED_DATE_TIME, approvable.getApprovalDate()); assertEquals(APPROVED_JUDGE_NAME, approvable.getApprovalJudge()); @@ -164,20 +204,44 @@ void shouldPopulateJudgeDecisionForApprovedDocuments(DraftOrdersWrapper draftOrd } } - static DraftOrderDocumentReview createDraftOrderReview() { - return DraftOrderDocumentReview.builder().draftOrderDocument(TARGET_DOCUMENT).build(); + static DraftOrderDocumentReview createDraftOrderDocumentReview() { + return DraftOrderDocumentReview.builder().draftOrderDocument(TARGET_DOCUMENT).orderStatus(TO_BE_REVIEWED).build(); } - static PsaDocumentReview createPsaReview() { - return PsaDocumentReview.builder().psaDocument(TARGET_DOCUMENT).build(); + static PsaDocumentReview createPsaDocumentReview() { + return PsaDocumentReview.builder().psaDocument(TARGET_DOCUMENT).orderStatus(TO_BE_REVIEWED).build(); } static AgreedDraftOrder createAgreedDraftOrder(boolean draftOrderOrPsa) { if (draftOrderOrPsa) { - return AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT).build(); + return AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT).orderStatus(TO_BE_REVIEWED).build(); } else { - return AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).build(); + return AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT).orderStatus(TO_BE_REVIEWED).build(); + } + } + + static DraftOrdersWrapper createDraftOrdersWrapper(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, + AgreedDraftOrder agreedDraftOrder) { + DraftOrdersWrapper.DraftOrdersWrapperBuilder draftOrdersWrapperBuilder = DraftOrdersWrapper.builder(); + if (draftReview != null || psaReview != null) { + DraftOrdersReview.DraftOrdersReviewBuilder b = DraftOrdersReview.builder(); + if (draftReview != null) { + b.draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder().value(draftReview).build())); + } + if (psaReview != null) { + b.psaDocReviewCollection(List.of(PsaDocReviewCollection.builder().value(psaReview).build())); + } + draftOrdersWrapperBuilder.draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder() + .value(b.build()) + .build())); } + if (agreedDraftOrder != null) { + draftOrdersWrapperBuilder.agreedDraftOrderCollection(List.of( + AgreedDraftOrderCollection.builder().value(agreedDraftOrder).build() + )); + } + return draftOrdersWrapperBuilder.build(); } static Arguments checkJudgeNeedsToMakeChanges(DraftOrderDocumentReview draftReview, PsaDocumentReview psaReview, @@ -216,28 +280,8 @@ static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalB .build()) .build(); } - - DraftOrdersWrapper.DraftOrdersWrapperBuilder draftOrdersWrapperBuilder = DraftOrdersWrapper.builder(); - if (draftReview != null || psaReview != null) { - DraftOrdersReview.DraftOrdersReviewBuilder b = DraftOrdersReview.builder(); - if (draftReview != null) { - b.draftOrderDocReviewCollection(List.of(DraftOrderDocReviewCollection.builder().value(draftReview).build())); - } - if (psaReview != null) { - b.psaDocReviewCollection(List.of(PsaDocReviewCollection.builder().value(psaReview).build())); - } - draftOrdersWrapperBuilder.draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder() - .value(b.build()) - .build())); - } - if (agreedDraftOrder != null) { - draftOrdersWrapperBuilder.agreedDraftOrderCollection(List.of( - AgreedDraftOrderCollection.builder().value(agreedDraftOrder).build() - )); - } return Arguments.of( - draftOrdersWrapperBuilder.build(), + createDraftOrdersWrapper(draftReview, psaReview, agreedDraftOrder), Stream.of(draftReview, psaReview, agreedDraftOrder).filter(Objects::nonNull).toList(), judgeApproval, amendedDocument, @@ -247,12 +291,12 @@ static Arguments buildArgumentsForApprovingDocument(JudgeApproval.JudgeApprovalB static Stream providePopulateJudgeDecisionForApprovedDocumentsArguments() { return Stream.of( - checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null, TRUE), - checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null, FALSE), - checkJudgeNeedsToMakeChanges(createDraftOrderReview(), null, null, null), - checkJudgeNeedsToMakeChanges(null, createPsaReview(), null, TRUE), - checkJudgeNeedsToMakeChanges(null, createPsaReview(), null, FALSE), - checkJudgeNeedsToMakeChanges(null, createPsaReview(), null, null), + checkJudgeNeedsToMakeChanges(createDraftOrderDocumentReview(), null, null, TRUE), + checkJudgeNeedsToMakeChanges(createDraftOrderDocumentReview(), null, null, FALSE), + checkJudgeNeedsToMakeChanges(createDraftOrderDocumentReview(), null, null, null), + checkJudgeNeedsToMakeChanges(null, createPsaDocumentReview(), null, TRUE), + checkJudgeNeedsToMakeChanges(null, createPsaDocumentReview(), null, FALSE), + checkJudgeNeedsToMakeChanges(null, createPsaDocumentReview(), null, null), checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(true), TRUE), checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(true), FALSE), checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(true), null), @@ -260,12 +304,12 @@ static Stream providePopulateJudgeDecisionForApprovedDocumentsArgumen checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(false), FALSE), checkJudgeNeedsToMakeChanges(null, null, createAgreedDraftOrder(false), null), - checkReadyToBeSealed(createDraftOrderReview(), null, null, TRUE), - checkReadyToBeSealed(createDraftOrderReview(), null, null, FALSE), - checkReadyToBeSealed(createDraftOrderReview(), null, null, null), - checkReadyToBeSealed(null, createPsaReview(), null, TRUE), - checkReadyToBeSealed(null, createPsaReview(), null, FALSE), - checkReadyToBeSealed(null, createPsaReview(),null, null), + checkReadyToBeSealed(createDraftOrderDocumentReview(), null, null, TRUE), + checkReadyToBeSealed(createDraftOrderDocumentReview(), null, null, FALSE), + checkReadyToBeSealed(createDraftOrderDocumentReview(), null, null, null), + checkReadyToBeSealed(null, createPsaDocumentReview(), null, TRUE), + checkReadyToBeSealed(null, createPsaDocumentReview(), null, FALSE), + checkReadyToBeSealed(null, createPsaDocumentReview(),null, null), checkReadyToBeSealed(null, null, createAgreedDraftOrder(true), TRUE), checkReadyToBeSealed(null, null, createAgreedDraftOrder(true), FALSE), checkReadyToBeSealed(null, null, createAgreedDraftOrder(true), null), From 0fe0b51a627928cd13bc0e14dbd574754fb3994a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 13:47:07 +0000 Subject: [PATCH 304/336] add comments --- .../model/ccd/draftorders/agreed/AgreedDraftOrder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index b1d255ce30..72d82b4327 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -51,18 +51,21 @@ public boolean match(CaseDocument targetDoc) { @JsonIgnore @Override public LocalDateTime getApprovalDate() { + // @JsonIgnore is necessary, as it ensures the property is not visible in AgreedDraftOrder return null; } @JsonIgnore @Override public String getApprovalJudge() { + // @JsonIgnore is necessary, as it ensures the property is not visible in AgreedDraftOrder return null; } @JsonIgnore @Override public YesOrNo getFinalOrder() { + // @JsonIgnore is necessary, as it ensures the property is not visible in AgreedDraftOrder return null; } From fd920b999329a0b1244653d16e34ccad64aa677f Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 13:59:47 +0000 Subject: [PATCH 305/336] Added buildIsFinalOrderDynamicMultiSelectList --- .../ApproveDraftOrdersAboutToStartHandler.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java index 23d44493d1..2f100dd3f1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandler.java @@ -120,6 +120,13 @@ private String buildHearingInfoFromDraftOrdersReview(DraftOrdersReview draftOrde draftOrdersReview.getHearingDate(), draftOrdersReview.getHearingTime()); } + private DynamicMultiSelectList buildIsFinalOrderDynamicMultiSelectList() { + return DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() + .code(YesOrNo.YES.getYesOrNo()) + .label("This is a final order") + .build())).build(); + } + private List getReviewableItems(List outstanding) { return outstanding.stream() .map(DraftOrdersReviewCollection::getValue) @@ -137,10 +144,7 @@ private List getReviewableItems(List .hearingInfo(hearingInfo) .hearingJudge(draftOrdersReview.getHearingJudge()) .hearingDate(draftOrdersReview.getHearingDate()) - .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() - .code(YesOrNo.YES.getYesOrNo()) - .label("This is a final order") - .build())).build()) + .isFinalOrder(buildIsFinalOrderDynamicMultiSelectList()) .document(a.getDraftOrderDocument()) .attachments(a.getAttachments()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), @@ -160,10 +164,7 @@ private List getReviewableItems(List .hearingInfo(hearingInfo) .hearingJudge(draftOrdersReview.getHearingJudge()) .hearingDate(draftOrdersReview.getHearingDate()) - .isFinalOrder(DynamicMultiSelectList.builder().listItems(List.of(DynamicMultiSelectListElement.builder() - .code(YesOrNo.YES.getYesOrNo()) - .label("This is a final order") - .build())).build()) + .isFinalOrder(buildIsFinalOrderDynamicMultiSelectList()) .document(a.getPsaDocument()) .sortKey(new SortKey(draftOrdersReview.getHearingTime(), draftOrdersReview.getHearingDate(), From 7152a62aa0b72a0c1d39106731e336b984a21fc1 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 15:42:26 +0000 Subject: [PATCH 306/336] remove duplication --- .../service/judgeapproval/JudgeApprovalResolver.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b98d66799f..76f1e6f1f1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -93,10 +93,11 @@ void processApprovableCollection(List approvables, CaseDoc * @param userAuthorisation the user authorization string to get the judge's full name */ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String userAuthorisation) { - if (isJudgeApproved(judgeApproval) || isJudgeRefused(judgeApproval)) { + boolean approved = isJudgeApproved(judgeApproval); + boolean refused = isJudgeRefused(judgeApproval); + if (approved || refused) { approvable.setApprovalJudge(idamService.getIdamFullName(userAuthorisation)); - - if (isJudgeApproved(judgeApproval)) { + if (approved) { approvable.setFinalOrder(YesOrNo.forValue(isFinalOrderSelected(judgeApproval))); if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { approvable.replaceDocument(judgeApproval.getAmendedDocument()); @@ -104,7 +105,7 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); approvable.setApprovalDate(LocalDateTime.now()); } - if (isJudgeRefused(judgeApproval)) { + if (refused) { approvable.setOrderStatus(REFUSED); if (approvable instanceof RefusalOrderConvertible refusalOrderConvertible) { refusalOrderConvertible.setRefusedDate(LocalDateTime.now()); From 0fae95547c4939efc11f7193a57fcf870a805a8a Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 20 Dec 2024 15:55:56 +0000 Subject: [PATCH 307/336] Fine tuning --- .../service/judgeapproval/JudgeApprovalResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index 76f1e6f1f1..11fd374ab7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -13,7 +13,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.IdamService; @@ -24,6 +23,7 @@ import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; @Component @@ -102,7 +102,7 @@ void handleApprovable(Approvable approvable, JudgeApproval judgeApproval, String if (judgeApproval.getJudgeDecision() == JUDGE_NEEDS_TO_MAKE_CHANGES) { approvable.replaceDocument(judgeApproval.getAmendedDocument()); } - approvable.setOrderStatus(OrderStatus.APPROVED_BY_JUDGE); + approvable.setOrderStatus(APPROVED_BY_JUDGE); approvable.setApprovalDate(LocalDateTime.now()); } if (refused) { From b66edc2a233fa39ada80a4258418d427ffe5919d Mon Sep 17 00:00:00 2001 From: Ashley Wong <50691452+so99y@users.noreply.github.com> Date: Mon, 23 Dec 2024 10:22:19 +0000 Subject: [PATCH 308/336] DFR-3495 capture judge type (#2050) * DFR-3495 Capturing Refusal Order Judge Title * Update test case. * update unit test * Fix test case * Linked with the class by calling Class.getSimpleName() * Remove an extra blank line. * typo * auto configuration * checkstyle * Auto Resolving Complex Type * readability * compare it in lowercase * reverting all * Fix NPE * Bug fix * NPE * Bug fix * simplifying * Add a warning message. * Trigger build * underscore missing * change to info * warning message bug * update warning message --------- Co-authored-by: Ashley Wong --- .../ApproveDraftOrdersMidEventHandler.java | 20 +++- .../judgeapproval/JudgeDecision.java | 12 ++- .../RefusalOrderInstruction.java | 27 +++++ .../ccd/draftorders/review/RefusedOrder.java | 3 + .../model/ccd/wrapper/DraftOrdersWrapper.java | 4 + .../judgeapproval/RefusedOrderGenerator.java | 65 +++++++++++ .../judgeapproval/RefusedOrderProcessor.java | 54 +++------- ...ApproveDraftOrdersMidEventHandlerTest.java | 74 ++++++++++--- .../RefusedOrderGeneratorTest.java | 102 ++++++++++++++++++ .../RefusedOrderProcessorTest.java | 33 +++--- 10 files changed, 315 insertions(+), 79 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java index 741137520e..d2a9547beb 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandler.java @@ -19,6 +19,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @@ -62,6 +63,13 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseData finremCaseData = caseDetails.getData(); DraftOrdersWrapper draftOrdersWrapper = finremCaseData.getDraftOrdersWrapper(); + setupHearingInstruction(draftOrdersWrapper); + setupRefusalOrderInstruction(draftOrdersWrapper); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + } + + private void setupHearingInstruction(DraftOrdersWrapper draftOrdersWrapper) { boolean isHearingInstructionRequired = IntStream.rangeClosed(1, 5) .mapToObj(i -> approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i)) .filter(Objects::nonNull) @@ -78,8 +86,18 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .build() )) .build()); + } - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(finremCaseData).build(); + private void setupRefusalOrderInstruction(DraftOrdersWrapper draftOrdersWrapper) { + boolean isRefusalOrderInstructionRequired = IntStream.rangeClosed(1, 5) + .mapToObj(i -> approveOrderService.resolveJudgeApproval(draftOrdersWrapper, i)) + .filter(Objects::nonNull) + .map(JudgeApproval::getJudgeDecision) + .anyMatch(decision -> decision != null && decision.isRefusalOrderInstructionRequired()); + + draftOrdersWrapper.setRefusalOrderInstruction(RefusalOrderInstruction.builder() + .showRequireRefusalOrderInstructionQuestion(YesOrNo.forValue(isRefusalOrderInstructionRequired)) + .build()); } /** diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java index 694cee3595..9196bbe731 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/JudgeDecision.java @@ -5,18 +5,20 @@ @Getter public enum JudgeDecision { - REVIEW_LATER(false, false, false), - LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false, false, true), - JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, false), - READY_TO_BE_SEALED(true, true, false); + REVIEW_LATER(false, false, false, false), + LEGAL_REP_NEEDS_TO_MAKE_CHANGE(false, false, true, true), + JUDGE_NEEDS_TO_MAKE_CHANGES(true, true, false, false), + READY_TO_BE_SEALED(true, true, false, false); private final boolean hearingInstructionRequired; private final boolean approved; private final boolean refused; + private final boolean refusalOrderInstructionRequired; - JudgeDecision(boolean hearingInstructionRequired, boolean approved, boolean refused) { + JudgeDecision(boolean hearingInstructionRequired, boolean approved, boolean refused, boolean refusalOrderInstructionRequired) { this.hearingInstructionRequired = hearingInstructionRequired; this.approved = approved; this.refused = refused; + this.refusalOrderInstructionRequired = refusalOrderInstructionRequired; } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java new file mode 100644 index 0000000000..ea9e53264b --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/judgeapproval/RefusalOrderInstruction.java @@ -0,0 +1,27 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +@Builder(toBuilder = true) +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class RefusalOrderInstruction { + + @JsonProperty("showRequireRefusalOrderInstructionQuestion") + private YesOrNo showRequireRefusalOrderInstructionQuestion; + + @JsonProperty("judgeType") + private JudgeType judgeType; + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java index 0d3cac14da..1cec7ee919 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/RefusedOrder.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import java.time.LocalDate; @@ -48,4 +49,6 @@ public class RefusedOrder implements HasCaseDocument { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private LocalDate hearingDate; + private JudgeType judgeType; + } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index e6304978bc..859264c988 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -17,6 +17,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.HearingInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.suggested.SuggestedDraftOrderCollection; @@ -76,6 +77,9 @@ public class DraftOrdersWrapper implements HasCaseDocument { @JsonProperty("hearingInstruction") private HearingInstruction hearingInstruction; + @JsonProperty("refusalOrderInstruction") + private RefusalOrderInstruction refusalOrderInstruction; + private String generatedOrderReason; @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java new file mode 100644 index 0000000000..118a231561 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGenerator.java @@ -0,0 +1,65 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; + +import java.time.LocalDateTime; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; + +@Component +@RequiredArgsConstructor +public class RefusedOrderGenerator { + + private final GenericDocumentService genericDocumentService; + + private final DocumentConfiguration documentConfiguration; + + private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + + /** + * Generates a refused order document for the given case details. + * This method sets temporary values in the DraftOrdersWrapper for use during document generation, + * then clears them after the document has been created. + * + * @param finremCaseDetails the details of the financial remedy case + * @param refusalReason the reason for refusing the order + * @param refusedDate the date and time the order was refused + * @param judgeName the name of the judge refusing the order + * @param judgeType the type of judge refusing the order + * @param authorisationToken the authorisation token for accessing document services + * @return the generated CaseDocument representing the refused order + */ + public CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, + String judgeName, JudgeType judgeType, String authorisationToken) { + DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); + draftOrdersWrapper.setGeneratedOrderReason(refusalReason); + draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); + draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); + draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); + + try { + return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, + contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, + finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() + ), + documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), + insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), + finremCaseDetails.getId().toString()); + } finally { + // Clear the temp values as they are for report generation purpose. + draftOrdersWrapper.setGeneratedOrderReason(null); + draftOrdersWrapper.setGeneratedOrderRefusedDate(null); + draftOrdersWrapper.setGeneratedOrderJudgeType(null); + draftOrdersWrapper.setGeneratedOrderJudgeName(null); + } + } + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index 10e1f00c70..82a563b1e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -1,10 +1,8 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; @@ -13,6 +11,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -21,10 +20,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -37,17 +34,13 @@ import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils.insertTimestamp; +@Slf4j @Component @RequiredArgsConstructor public class RefusedOrderProcessor { - private final GenericDocumentService genericDocumentService; - - private final DocumentConfiguration documentConfiguration; - - private final ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + private final RefusedOrderGenerator refusedOrderGenerator; /** * Processes refused draft orders and pension sharing annexes (PSAs) by removing them from collections, @@ -94,10 +87,17 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder UUID uuid = UUID.randomUUID(); refusalOrderIds.add(uuid); + JudgeType judgeType = ofNullable(draftOrdersWrapper.getRefusalOrderInstruction()).map(RefusalOrderInstruction::getJudgeType) + .orElse(null); + if (judgeType == null) { + log.warn("{} - Judge type was not captured and an empty string will be shown in the refusal order.", + finremCaseDetails.getId()); + } + RefusedOrder.RefusedOrderBuilder orderBuilder = RefusedOrder.builder() .refusedDocument(refusalOrderConvertible.getRefusedDocument()) - .refusalOrder(generateRefuseOrder(finremCaseDetails, judgeFeedback, refusalOrderConvertible.getRefusedDate(), - refusalOrderConvertible.getApprovalJudge(), null, userAuthorisation)) + .refusalOrder(refusedOrderGenerator.generateRefuseOrder(finremCaseDetails, judgeFeedback, + refusalOrderConvertible.getRefusedDate(), refusalOrderConvertible.getApprovalJudge(), judgeType, userAuthorisation)) .refusedDate(refusalOrderConvertible.getRefusedDate()) .submittedDate(refusalOrderConvertible.getSubmittedDate()) .submittedBy(refusalOrderConvertible.getSubmittedBy()) @@ -105,7 +105,8 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder .refusalJudge(refusalOrderConvertible.getApprovalJudge()) .attachments(item.getValue() instanceof DraftOrderDocumentReview d ? d.getAttachments() : null) .judgeFeedback(judgeFeedback) - .hearingDate(hearingDate); + .hearingDate(hearingDate) + .judgeType(judgeType); return RefusedOrderCollection.builder().id(uuid).value(orderBuilder.build()).build(); } else { @@ -124,31 +125,6 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UuidCollection::new).toList()); } - private CaseDocument generateRefuseOrder(FinremCaseDetails finremCaseDetails, String refusalReason, LocalDateTime refusedDate, - String judgeName, JudgeType judgeType, String authorisationToken) { - DraftOrdersWrapper draftOrdersWrapper = finremCaseDetails.getData().getDraftOrdersWrapper(); - draftOrdersWrapper.setGeneratedOrderReason(refusalReason); - draftOrdersWrapper.setGeneratedOrderRefusedDate(refusedDate); - draftOrdersWrapper.setGeneratedOrderJudgeName(judgeName); - draftOrdersWrapper.setGeneratedOrderJudgeType(judgeType); - - try { - return genericDocumentService.generateDocumentFromPlaceholdersMap(authorisationToken, - contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap(finremCaseDetails, - finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList() - ), - documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails), - insertTimestamp(documentConfiguration.getContestedDraftOrderNotApprovedFileName()), - finremCaseDetails.getId().toString()); - } finally { - // Clear the temp values as they are for report generation purpose. - draftOrdersWrapper.setGeneratedOrderReason(null); - draftOrdersWrapper.setGeneratedOrderRefusedDate(null); - draftOrdersWrapper.setGeneratedOrderJudgeType(null); - draftOrdersWrapper.setGeneratedOrderJudgeName(null); - } - } - private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( List removedItems, List draftOrdersReviewCollection) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java index 693e14efad..85d2608d81 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersMidEventHandlerTest.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler.judgeapproval; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -19,6 +20,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.AnotherHearingRequestCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval.ApproveOrderService; @@ -28,9 +30,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Mockito.when; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.lenient; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.YES; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.JUDGE_NEEDS_TO_MAKE_CHANGES; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.LEGAL_REP_NEEDS_TO_MAKE_CHANGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.READY_TO_BE_SEALED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeDecision.REVIEW_LATER; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @@ -44,6 +51,11 @@ class ApproveDraftOrdersMidEventHandlerTest { @Mock private ApproveOrderService approveOrderService; + @BeforeEach + void setup() { + lenient().when(approveOrderService.resolveJudgeApproval(any(), anyInt())).thenCallRealMethod(); + } + @Test void canHandle() { assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.APPROVE_ORDERS); @@ -92,7 +104,21 @@ void shouldPopulateAnEmptyAnotherHearingRequestEntry() { @Test void shouldPopulateWhichOrder() { // Arrange - DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder().build(); + DraftOrdersWrapper draftOrdersWrapper = DraftOrdersWrapper.builder() + .judgeApproval1( + JudgeApproval.builder() + .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) + .docType(JudgeApprovalDocType.DRAFT_ORDER) + .amendedDocument(CaseDocument.builder().documentFilename("AMENDED_DOC.doc").build()) + .build() + ) + .judgeApproval2( + JudgeApproval.builder() + .judgeDecision(READY_TO_BE_SEALED) + .docType(JudgeApprovalDocType.PSA) + .document(CaseDocument.builder().documentFilename("PSA.doc").build()) + .build()) + .build(); FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() .caseDetails(FinremCaseDetails.builder() @@ -103,19 +129,6 @@ void shouldPopulateWhichOrder() { .build()) .build(); - when(approveOrderService.resolveJudgeApproval(draftOrdersWrapper, 1)).thenReturn( - JudgeApproval.builder() - .judgeDecision(JUDGE_NEEDS_TO_MAKE_CHANGES) - .docType(JudgeApprovalDocType.DRAFT_ORDER) - .amendedDocument(CaseDocument.builder().documentFilename("AMENDED_DOC.doc").build()) - .build()); - when(approveOrderService.resolveJudgeApproval(draftOrdersWrapper, 2)).thenReturn( - JudgeApproval.builder() - .judgeDecision(READY_TO_BE_SEALED) - .docType(JudgeApprovalDocType.PSA) - .document(CaseDocument.builder().documentFilename("PSA.doc").build()) - .build()); - // Act GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); @@ -126,6 +139,7 @@ void shouldPopulateWhichOrder() { List actualCollection = responseDraftOrdersWrapper.getHearingInstruction().getAnotherHearingRequestCollection(); + assertEquals(YES, responseDraftOrdersWrapper.getHearingInstruction().getShowRequireAnotherHearingQuestion()); assertNotNull(actualCollection, "anotherHearingRequestCollection should not be null"); assertEquals(1, actualCollection.size(), "anotherHearingRequestCollection should contain exactly one element"); @@ -138,4 +152,34 @@ void shouldPopulateWhichOrder() { )).build(); assertEquals(actualRequest.getWhichOrder(), expectedDynamicList); } + + @Test + void shouldPopulateRefusalOrderInstruction() { + // Arrange + FinremCallbackRequest callbackRequest = FinremCallbackRequest.builder() + .caseDetails(FinremCaseDetails.builder() + .id(12345L) + .data(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .judgeApproval1(JudgeApproval.builder() + .judgeDecision(LEGAL_REP_NEEDS_TO_MAKE_CHANGE) + .build()) + .build()) + .build()) + .build()) + .build(); + + // Act + GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(callbackRequest, AUTH_TOKEN); + + // Assert + assertNotNull(response); + FinremCaseData responseData = response.getData(); + DraftOrdersWrapper responseDraftOrdersWrapper = responseData.getDraftOrdersWrapper(); + + RefusalOrderInstruction refusalOrderInstruction = responseDraftOrdersWrapper.getRefusalOrderInstruction(); + assertEquals(NO, responseDraftOrdersWrapper.getHearingInstruction().getShowRequireAnotherHearingQuestion()); + assertNotNull(refusalOrderInstruction, "refusalOrderInstruction should not be null"); + assertEquals(YES, refusalOrderInstruction.getShowRequireRefusalOrderInstructionQuestion()); + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java new file mode 100644 index 0000000000..8ab6fd9b3f --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderGeneratorTest.java @@ -0,0 +1,102 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.judgeapproval; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +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.JudgeType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.utils.FileUtils; + +import java.time.LocalDateTime; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; + +@ExtendWith(MockitoExtension.class) +class RefusedOrderGeneratorTest { + + @Mock + private GenericDocumentService genericDocumentService; + + @Mock + private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + + @Mock + private DocumentConfiguration documentConfiguration; + + @InjectMocks + private RefusedOrderGenerator underTest; + + @Test + void shouldGenerateRefuseOrder() { + // Arrange + FinremCaseDetails finremCaseDetails = FinremCaseDetails.builder().id(12345L).build(); + FinremCaseData caseData = new FinremCaseData(); + DraftOrdersWrapper draftOrdersWrapper = new DraftOrdersWrapper(); + caseData.setDraftOrdersWrapper(draftOrdersWrapper); + finremCaseDetails.setData(caseData); + + String refusalReason = "Insufficient information"; + LocalDateTime refusedDate = LocalDateTime.now(); + String judgeName = "Judge Doe"; + JudgeType judgeType = JudgeType.DISTRICT_JUDGE; + String templateName = "templateName"; + String fileName = "fileName.dcc"; + String modifiedFilename = "fileName_ABC.doc"; + String caseId = "12345"; + CaseDocument expectedDocument = new CaseDocument(); + + Map templateDetailsMap = Map.of("key", "value"); + + // Mock dependencies + when(contestedDraftOrderNotApprovedDetailsMapper.getDocumentTemplateDetailsAsMap( + finremCaseDetails, finremCaseDetails.getData().getRegionWrapper().getDefaultCourtList())).thenReturn(templateDetailsMap); + when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(finremCaseDetails)).thenReturn(templateName); + when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn(fileName); + try (MockedStatic mockedStatic = mockStatic(FileUtils.class)) { + mockedStatic.when(() -> FileUtils.insertTimestamp(fileName)).thenReturn(modifiedFilename); + + when(genericDocumentService.generateDocumentFromPlaceholdersMap( + AUTH_TOKEN, + templateDetailsMap, + templateName, + modifiedFilename, // Match the actual argument + caseId + )).thenReturn(expectedDocument); + + // Act + CaseDocument result = underTest.generateRefuseOrder( + finremCaseDetails, refusalReason, refusedDate, judgeName, judgeType, AUTH_TOKEN); + + // Assert + assertNotNull(result); + assertEquals(expectedDocument, result); + + // Verify that temporary values are cleared + assertNull(draftOrdersWrapper.getGeneratedOrderReason()); + assertNull(draftOrdersWrapper.getGeneratedOrderRefusedDate()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeName()); + assertNull(draftOrdersWrapper.getGeneratedOrderJudgeType()); + + verify(genericDocumentService).generateDocumentFromPlaceholdersMap(AUTH_TOKEN, templateDetailsMap, templateName, modifiedFilename, + caseId); + verifyNoMoreInteractions(genericDocumentService); + } + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java index c9b8ef9b81..c80bed6f0b 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java @@ -9,15 +9,15 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.config.DocumentConfiguration; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.letterdetails.contestordernotapproved.ContestedDraftOrderNotApprovedDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; 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.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.CaseDocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApproval; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -28,7 +28,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import java.time.LocalDate; import java.time.LocalDateTime; @@ -43,8 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.lenient; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.CASE_ID; @@ -70,17 +69,12 @@ class RefusedOrderProcessorTest { private RefusedOrderProcessor underTest; @Mock - private GenericDocumentService genericDocumentService; - - @Mock - private DocumentConfiguration documentConfiguration; - - @Mock - private ContestedDraftOrderNotApprovedDetailsMapper contestedDraftOrderNotApprovedDetailsMapper; + private RefusedOrderGenerator refusedOrderGenerator; @ParameterizedTest @MethodSource("provideProcessRefusedDocumentsAndUpdateTheirState") void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApproval, + RefusalOrderInstruction refusalOrderInstruction, List agreedDraftOrderCollections, List draftOrdersReviewCollection, List existingRefusedOrders, @@ -92,11 +86,11 @@ void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApprova .agreedDraftOrderCollection(agreedDraftOrderCollections) .draftOrdersReviewCollection(draftOrdersReviewCollection) .refusedOrdersCollection(existingRefusedOrders) + .refusalOrderInstruction(refusalOrderInstruction) .build(); - lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedFileName()).thenReturn("RefusalOrder.doc"); - lenient().when(documentConfiguration.getContestedDraftOrderNotApprovedTemplate(any(FinremCaseDetails.class))).thenReturn("TemplateName"); - lenient().when(genericDocumentService.generateDocumentFromPlaceholdersMap(anyString(), anyMap(), anyString(), anyString(), anyString())) + lenient().when(refusedOrderGenerator.generateRefuseOrder(any(FinremCaseDetails.class), eq(JUDGE_FEEDBACK), eq(FIXED_DATE_TIME), + eq(APPROVED_JUDGE_NAME), refusalOrderInstruction == null ? isNull() : eq(refusalOrderInstruction.getJudgeType()), eq(AUTH_TOKEN))) .thenReturn(GENERATED_REFUSED_ORDER); try (MockedStatic mockedStatic = Mockito.mockStatic(LocalDateTime.class, Mockito.CALLS_REAL_METHODS)) { @@ -166,7 +160,7 @@ static Stream provideProcessRefusedDocumentsAndUpdateTheirState() { } static Arguments targetDocNotFound(JudgeApproval judgeApproval) { - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, null, List.of(), List.of( DraftOrdersReviewCollection.builder() @@ -212,7 +206,7 @@ static Arguments refuseTargetedDraftOrder(JudgeApproval judgeApproval, boolean w .approvalJudge("Mary Chapman") .build()).build(); - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, null, List.of(agreedDraftOrderCollectionToBeExamined), List.of( DraftOrdersReviewCollection.builder() @@ -270,7 +264,7 @@ static Arguments refuseTargetedPsa(JudgeApproval judgeApproval, boolean withSubm .build()) .build(); - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, null, List.of(agreedDraftOrderCollectionToBeExamined), List.of( DraftOrdersReviewCollection.builder() @@ -317,7 +311,7 @@ static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeA .build()) .build(); - return Arguments.of(judgeApproval, + return Arguments.of(judgeApproval, RefusalOrderInstruction.builder().judgeType(JudgeType.DEPUTY_DISTRICT_JUDGE).build(), List.of(agreedDraftOrderCollectionToBeExamined), List.of( DraftOrdersReviewCollection.builder() @@ -355,6 +349,7 @@ static Arguments refuseTargetedPsaWithExistingRefusedOrders(JudgeApproval judgeA .judgeFeedback(JUDGE_FEEDBACK) .submittedByEmail(SUBMITTED_BY_EMAIL).submittedDate(SUBMITTED_DATE).submittedBy(SUBMITTED_BY) .hearingDate(HEARING_DATE) + .judgeType(JudgeType.DEPUTY_DISTRICT_JUDGE) .build() ); } From 8836c35ab168451e9303bb41067e7617f42b5888 Mon Sep 17 00:00:00 2001 From: Ashley Wong <50691452+so99y@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:39:40 +0000 Subject: [PATCH 309/336] Refactoring - HasApprovableCollectionReader (#2056) * Refactoring - HasApprovableCollectionReader * Renaming * Add JavaDoc * Unit test --------- Co-authored-by: Ashley Wong --- .../HasApprovableCollectionReader.java | 118 ++++++++++++++++ .../judgeapproval/RefusedOrderProcessor.java | 81 ++--------- .../HasApprovableCollectionReaderTest.java | 132 ++++++++++++++++++ .../RefusedOrderProcessorTest.java | 5 + 4 files changed, 264 insertions(+), 72 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java new file mode 100644 index 0000000000..6c084fe553 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java @@ -0,0 +1,118 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders; + +import org.springframework.stereotype.Component; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; + +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.function.Predicate; + +import static java.util.Optional.ofNullable; +import static java.util.stream.Collectors.partitioningBy; + +@Component +public class HasApprovableCollectionReader { + + /** + * Partitions a list of elements implementing {@code HasApprovable} into two groups based on their {@link OrderStatus}. + * The partitioning is determined by the provided {@link Predicate} applied to the {@code OrderStatus}. + * + * @param the type of elements in the list, which must implement {@link HasApprovable} + * @param hasApprovables the list of elements to be partitioned; may be {@code null}, in which case an empty map is returned + * @param statusPredicate the {@link Predicate} used to test the {@code OrderStatus} of each element + * @return a map where the key {@code true} contains elements matching the predicate, and {@code false} contains those that do not + */ + public Map> partitionByOrderStatus(List hasApprovables, Predicate statusPredicate) { + return ofNullable(hasApprovables).orElse(List.of()).stream() + .collect(partitioningBy( + hasApprovable -> ofNullable(hasApprovable) + .map(HasApprovable::getValue) + .map(Approvable::getOrderStatus) + .filter(statusPredicate) + .isPresent() + )); + } + + /** + * Filters and collects {@link DraftOrderDocReviewCollection} from a list of {@link DraftOrdersReviewCollection} + * based on a given {@link Predicate} applied to their {@link OrderStatus}. + * The filtered results are collected into the provided {@code collector}. + * + * @param draftOrdersReviewCollection the list of {@link DraftOrdersReviewCollection} to filter; may be {@code null}, + * in which case an empty list is returned + * @param collector the list where filtered {@link DraftOrderDocReviewCollection} will be collected + * @param statusPredicate the {@link Predicate} used to filter {@link DraftOrderDocReviewCollection} by their {@link OrderStatus} + * @return a list of filtered {@link DraftOrdersReviewCollection}, each containing the filtered {@link DraftOrderDocReviewCollection} + */ + public List filterAndCollectDraftOrderDocs( + List draftOrdersReviewCollection, + List collector, + Predicate statusPredicate) { + return filterAndCollect( + draftOrdersReviewCollection, collector, statusPredicate, + DraftOrdersReview::getDraftOrderDocReviewCollection, + DraftOrdersReview.DraftOrdersReviewBuilder::draftOrderDocReviewCollection + ); + } + + /** + * Filters and collects {@link PsaDocReviewCollection} from a list of {@link DraftOrdersReviewCollection} + * based on a given {@link Predicate} applied to their {@link OrderStatus}. + * The filtered results are collected into the provided {@code collector}. + * + * @param draftOrdersReviewCollection the list of {@link DraftOrdersReviewCollection} to filter; may be {@code null}, + * in which case an empty list is returned + * @param collector the list where filtered {@link PsaDocReviewCollection} will be collected + * @param statusPredicate the {@link Predicate} used to filter {@link PsaDocReviewCollection} by their {@link OrderStatus} + * @return a list of filtered {@link DraftOrdersReviewCollection}, each containing the filtered {@link PsaDocReviewCollection} + */ + public List filterAndCollectPsaDocs( + List draftOrdersReviewCollection, + List collector, + Predicate statusPredicate) { + return filterAndCollect( + draftOrdersReviewCollection, collector, statusPredicate, + DraftOrdersReview::getPsaDocReviewCollection, + DraftOrdersReview.DraftOrdersReviewBuilder::psaDocReviewCollection + ); + } + + private List filterAndCollect( + List draftOrdersReviewCollection, + List collector, + Predicate statusPredicate, + Function> getReviewCollection, + BiConsumer> setReviewCollection) { + + return ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream() + .map(draftOrdersReview -> { + DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); + + // Partition items into kept and removed + Map> partitioned = + partitionByOrderStatus(getReviewCollection.apply(draftOrdersReview.getValue()), statusPredicate); + + // Keep the items not matching the status + setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); + + // Collect the removed items + if (collector != null) { + collector.addAll(partitioned.get(true)); + } + + // Create a new DraftOrdersReviewCollection + DraftOrdersReviewCollection updatedCollection = new DraftOrdersReviewCollection(); + updatedCollection.setValue(updatedReviewBuilder.build()); + return updatedCollection; + }) + .toList(); + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index 82a563b1e1..6b352a673e 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -6,7 +6,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -14,12 +13,11 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import java.time.LocalDate; import java.util.ArrayList; @@ -27,9 +25,7 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; -import java.util.function.BiConsumer; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; import static java.util.Optional.ofNullable; @@ -42,6 +38,8 @@ public class RefusedOrderProcessor { private final RefusedOrderGenerator refusedOrderGenerator; + private final HasApprovableCollectionReader hasApprovableCollectionReader; + /** * Processes refused draft orders and pension sharing annexes (PSAs) by removing them from collections, * creating refused orders, and updating the {@link DraftOrdersWrapper}. @@ -68,10 +66,10 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder filterRefusedDraftOrderCollections(draftOrdersWrapper); // remove refused draft orders/PSAs from PsaDocReviewCollection and DraftOrderDocReviewCollection and collect them - draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection(removedItems, - draftOrdersWrapper.getDraftOrdersReviewCollection())); - draftOrdersWrapper.setDraftOrdersReviewCollection(filterAndCollectRefusedItemsFromPsaDocReviewCollection(removedPsaItems, - draftOrdersWrapper.getDraftOrdersReviewCollection())); + draftOrdersWrapper.setDraftOrdersReviewCollection(hasApprovableCollectionReader + .filterAndCollectDraftOrderDocs(draftOrdersWrapper.getDraftOrdersReviewCollection(), removedItems, REFUSED::equals)); + draftOrdersWrapper.setDraftOrdersReviewCollection(hasApprovableCollectionReader + .filterAndCollectPsaDocs(draftOrdersWrapper.getDraftOrdersReviewCollection(), removedPsaItems, REFUSED::equals)); // create RefusedOrder from collected items. String judgeFeedback = judgeApproval.getChangesRequestedByJudge(); @@ -125,72 +123,11 @@ public void processRefusedOrders(FinremCaseDetails finremCaseDetails, DraftOrder draftOrdersWrapper.setRefusalOrderIdsToBeSent(refusalOrderIds.stream().map(UuidCollection::new).toList()); } - private List filterAndCollectRefusedItemsFromDraftOrderDocReviewCollection( - List removedItems, - List draftOrdersReviewCollection) { - return filterAndCollectRefusedItemsFromReviewCollection( - removedItems, - draftOrdersReviewCollection, - DraftOrdersReview::getDraftOrderDocReviewCollection, - DraftOrdersReview.DraftOrdersReviewBuilder::draftOrderDocReviewCollection - ); - } - - private List filterAndCollectRefusedItemsFromPsaDocReviewCollection( - List removedItems, - List draftOrdersReviewCollection) { - return filterAndCollectRefusedItemsFromReviewCollection( - removedItems, - draftOrdersReviewCollection, - DraftOrdersReview::getPsaDocReviewCollection, - DraftOrdersReview.DraftOrdersReviewBuilder::psaDocReviewCollection - ); - } - - private List filterAndCollectRefusedItemsFromReviewCollection( - List removedItemsCollector, - List draftOrdersReviewCollection, - Function> getReviewCollection, - BiConsumer> setReviewCollection) { - - return ofNullable(draftOrdersReviewCollection).orElse(List.of()).stream() - .map(draftOrdersReview -> { - DraftOrdersReview.DraftOrdersReviewBuilder updatedReviewBuilder = draftOrdersReview.getValue().toBuilder(); - - // Partition items into kept and removed - Map> partitioned = - partitionRefusedDraftOrderDocReviewCollection(getReviewCollection.apply(draftOrdersReview.getValue())); - - // Keep the items not matching the status - setReviewCollection.accept(updatedReviewBuilder, partitioned.get(false)); - - // Collect the removed items - if (removedItemsCollector != null) { - removedItemsCollector.addAll(partitioned.get(true)); - } - - // Create a new DraftOrdersReviewCollection - DraftOrdersReviewCollection updatedCollection = new DraftOrdersReviewCollection(); - updatedCollection.setValue(updatedReviewBuilder.build()); - return updatedCollection; - }) - .toList(); - } - private void filterRefusedDraftOrderCollections(DraftOrdersWrapper draftOrdersWrapper) { Map> partitioned = - partitionRefusedDraftOrderDocReviewCollection(draftOrdersWrapper.getAgreedDraftOrderCollection()); + hasApprovableCollectionReader.partitionByOrderStatus(draftOrdersWrapper.getAgreedDraftOrderCollection(), + REFUSED::equals); draftOrdersWrapper.setAgreedDraftOrderCollection(partitioned.get(false)); } - private Map> partitionRefusedDraftOrderDocReviewCollection(List draftOrderDocReviewCollection) { - return ofNullable(draftOrderDocReviewCollection).orElse(List.of()).stream() - .collect(Collectors.partitioningBy( - docReview -> ofNullable(docReview) - .map(HasApprovable::getValue) - .map(Approvable::getOrderStatus) - .filter(REFUSED::equals) - .isPresent() - )); - } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java new file mode 100644 index 0000000000..d547962e1d --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java @@ -0,0 +1,132 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; + +@ExtendWith(MockitoExtension.class) +class HasApprovableCollectionReaderTest { + + @InjectMocks + private HasApprovableCollectionReader underTest; + + @Test + void shouldPartitionByOrderStatus() { + List sample = + List.of( + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().orderStatus(REFUSED).build()).build(), + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().orderStatus(TO_BE_REVIEWED).build()).build(), + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().orderStatus(APPROVED_BY_JUDGE).build()).build(), + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().orderStatus(APPROVED_BY_JUDGE).build()).build() + ); + + Map> result = underTest.partitionByOrderStatus(sample, REFUSED::equals); + assertThat(result.get(true)).hasSize(1); + assertThat(result.get(false)).hasSize(3); + + Map> result2 = underTest.partitionByOrderStatus(sample, TO_BE_REVIEWED::equals); + assertThat(result2.get(true)).hasSize(1); + assertThat(result2.get(false)).hasSize(3); + + Map> result3 = underTest.partitionByOrderStatus(sample, APPROVED_BY_JUDGE::equals); + assertThat(result3.get(true)).hasSize(2); + assertThat(result3.get(false)).hasSize(2); + } + + @Test + void shouldFilterAndCollectDraftOrderDocs() { + List collector = new ArrayList<>(); + + CaseDocument draftOrderDocument1 = CaseDocument.builder().documentUrl("do1.doc").build(); + CaseDocument draftOrderDocument2 = CaseDocument.builder().documentUrl("do2.doc").build(); + + List sample = List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder().draftOrderDocReviewCollection( + List.of( + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder().draftOrderDocument(draftOrderDocument1).orderStatus(REFUSED).build()) + .build(), + DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder().draftOrderDocument(draftOrderDocument2).orderStatus(TO_BE_REVIEWED).build()) + .build() + ) + ).build()).build() + ); + List result = underTest.filterAndCollectDraftOrderDocs(sample, collector, REFUSED::equals); + + assertThat(result).hasSize(1); + assertThat(result.get(0).getValue().getDraftOrderDocReviewCollection()).hasSize(1); + assertEquals(draftOrderDocument2, result.get(0).getValue().getDraftOrderDocReviewCollection().get(0).getValue().getDraftOrderDocument()); + + assertThat(collector).hasSize(1); + assertEquals(draftOrderDocument1, collector.get(0).getValue().getDraftOrderDocument()); + } + + @Test + void shouldFilterAndCollectPsaDocs() { + List collector = new ArrayList<>(); + + CaseDocument psaDocument1 = CaseDocument.builder().documentUrl("psa1.doc").build(); + CaseDocument psaDocument2 = CaseDocument.builder().documentUrl("psa2.doc").build(); + CaseDocument psaDocument3 = CaseDocument.builder().documentUrl("psa3.doc").build(); + CaseDocument psaDocument4 = CaseDocument.builder().documentUrl("psa4.doc").build(); + + List sample = List.of( + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder().psaDocReviewCollection( + List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(psaDocument1).orderStatus(REFUSED).build()) + .build(), + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(psaDocument2).orderStatus(TO_BE_REVIEWED).build()) + .build() + ) + ).build()).build(), + + DraftOrdersReviewCollection.builder() + .value(DraftOrdersReview.builder().psaDocReviewCollection( + List.of( + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(psaDocument3).orderStatus(REFUSED).build()) + .build(), + PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(psaDocument4).orderStatus(APPROVED_BY_JUDGE).build()) + .build() + ) + ).build()).build() + ); + List result = underTest.filterAndCollectPsaDocs(sample, collector, REFUSED::equals); + + assertThat(result).hasSize(2); + assertThat(result.get(0).getValue().getPsaDocReviewCollection()).hasSize(1); + assertThat(result.get(1).getValue().getPsaDocReviewCollection()).hasSize(1); + assertEquals(psaDocument2, result.get(0).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()); + assertEquals(psaDocument4, result.get(1).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()); + + assertThat(collector).hasSize(2); + assertEquals(psaDocument1, collector.get(0).getValue().getPsaDocument()); + assertEquals(psaDocument3, collector.get(1).getValue().getPsaDocument()); + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java index c80bed6f0b..95d38a0158 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessorTest.java @@ -8,6 +8,7 @@ import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; +import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; @@ -28,6 +29,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import java.time.LocalDate; import java.time.LocalDateTime; @@ -71,6 +73,9 @@ class RefusedOrderProcessorTest { @Mock private RefusedOrderGenerator refusedOrderGenerator; + @Spy + private HasApprovableCollectionReader hasApprovableCollectionReader; + @ParameterizedTest @MethodSource("provideProcessRefusedDocumentsAndUpdateTheirState") void shouldProcessRefusedDocumentsAndUpdateTheirState(JudgeApproval judgeApproval, From 8c7922539318b33feb92f054c5856c395d060531 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Thu, 2 Jan 2025 18:12:18 +0000 Subject: [PATCH 310/336] Checkstyle --- .../service/judgeapproval/JudgeApprovalResolver.java | 1 - .../service/judgeapproval/RefusedOrderProcessor.java | 9 --------- 2 files changed, 10 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java index b9e3e17821..11fd374ab7 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolver.java @@ -6,7 +6,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DynamicMultiSelectList; 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.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java index 39611ce727..1823b0965f 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/RefusedOrderProcessor.java @@ -6,8 +6,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; - -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.RefusalOrderConvertible; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; @@ -15,26 +13,19 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.RefusalOrderInstruction; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; - -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; - import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.RefusedOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; - import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.UUID; -import java.util.function.BiConsumer; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; import static java.util.Optional.ofNullable; From 989481cde4359138fa0a152a42723b988b8238dc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 3 Jan 2025 11:56:21 +0000 Subject: [PATCH 311/336] DFR-3501+3512 Process Order (Before Refactoring) --- ...ectionUploadOrderAboutToSubmitHandler.java | 7 +- .../DirectionUploadOrderMidHandler.java | 7 +- .../DirectionUploadOrderSubmittedHandler.java | 15 +- .../ProcessOrdersAboutToStartHandler.java | 66 ++++ .../ProcessOrdersAboutToSubmitHandler.java | 166 ++++++++ .../ProcessOrdersMidHandler.java | 79 ++++ .../caseorchestration/model/EventType.java | 1 + .../model/ccd/DirectionOrder.java | 2 + .../model/ccd/draftorders/Approvable.java | 16 +- .../draftorders/agreed/AgreedDraftOrder.java | 2 +- .../review/DraftOrderDocumentReview.java | 2 +- .../ccd/draftorders/review/OrderStatus.java | 2 +- .../draftorders/review/PsaDocumentReview.java | 2 +- .../model/ccd/wrapper/DraftOrdersWrapper.java | 7 + .../HasApprovableCollectionReader.java | 20 + .../processorder/ProcessOrderService.java | 146 +++++++ .../FinremCallbackRequestFactory.java | 6 + ...onUploadOrderAboutToSubmitHandlerTest.java | 31 +- .../DirectionUploadOrderMidHandlerTest.java | 29 +- ...ectionUploadOrderSubmittedHandlerTest.java | 37 +- ...oveDraftOrdersAboutToStartHandlerTest.java | 8 +- .../ProcessOrdersAboutToStartHandlerTest.java | 126 ++++++ ...ProcessOrdersAboutToSubmitHandlerTest.java | 364 +++++++++++++++++ .../ProcessOrdersMidHandlerTest.java | 132 +++++++ .../review/DraftOrdersReviewTest.java | 17 +- .../service/DraftOrderServiceTest.java | 23 +- .../HasApprovableCollectionReaderTest.java | 25 ++ .../JudgeApprovalResolverTest.java | 2 +- .../ProcessOrderServiceTest.java | 366 ++++++++++++++++++ 29 files changed, 1585 insertions(+), 121 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java create mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java create mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index ca39bb35df..e10ed31e1a 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -32,7 +32,7 @@ public DirectionUploadOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCa public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { return CallbackType.ABOUT_TO_SUBMIT.equals(callbackType) && CaseType.CONTESTED.equals(caseType) - && (EventType.DIRECTION_UPLOAD_ORDER.equals(eventType)); + && EventType.DIRECTION_UPLOAD_ORDER.equals(eventType); } @Override @@ -40,8 +40,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem String userAuthorisation) { FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); String caseId = String.valueOf(caseDetails.getId()); - log.info("Invoking contested event {} mid callback for Case ID: {}", - EventType.DIRECTION_UPLOAD_ORDER, caseId); + log.info("Invoking contested event {} mid callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData caseData = caseDetails.getData(); List errors = new ArrayList<>(); @@ -56,4 +55,4 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem return GenericAboutToStartOrSubmitCallbackResponse.builder() .data(caseData).errors(errors).build(); } -} \ No newline at end of file +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java index e8a5dcb224..462cd7d5f2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java @@ -32,7 +32,7 @@ public DirectionUploadOrderMidHandler(FinremCaseDetailsMapper finremCaseDetailsM public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { return CallbackType.MID_EVENT.equals(callbackType) && CaseType.CONTESTED.equals(caseType) - && (EventType.DIRECTION_UPLOAD_ORDER.equals(eventType)); + && EventType.DIRECTION_UPLOAD_ORDER.equals(eventType); } @Override @@ -40,8 +40,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem String userAuthorisation) { FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); String caseId = String.valueOf(caseDetails.getId()); - log.info("Invoking contested event {} mid callback for Case ID: {}", - EventType.DIRECTION_UPLOAD_ORDER, caseId); + log.info("Invoking contested event {} mid callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData caseData = caseDetails.getData(); List errors = new ArrayList<>(); @@ -75,4 +74,4 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem return GenericAboutToStartOrSubmitCallbackResponse.builder() .data(caseData).errors(errors).build(); } -} \ No newline at end of file +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java index f24f708ee5..8424536cb1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java @@ -14,6 +14,13 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingDocumentService; +import java.util.List; + +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.SUBMITTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; + @Slf4j @Service public class DirectionUploadOrderSubmittedHandler extends FinremCallbackHandler { @@ -30,9 +37,8 @@ public DirectionUploadOrderSubmittedHandler(FinremCaseDetailsMapper finremCaseDe @Override public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return CallbackType.SUBMITTED.equals(callbackType) - && CaseType.CONTESTED.equals(caseType) - && EventType.DIRECTION_UPLOAD_ORDER.equals(eventType); + return SUBMITTED.equals(callbackType) && CONTESTED.equals(caseType) + && List.of(DIRECTION_UPLOAD_ORDER, PROCESS_ORDER).contains(eventType); } @Override @@ -40,8 +46,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem String userAuthorisation) { FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); - log.info("Handling contested event {} submit callback for case id: {}", - EventType.DIRECTION_UPLOAD_ORDER, caseDetails.getId()); + log.info("Handling contested event {} submit callback for case id: {}", callbackRequest.getEventType(), caseDetails.getId()); FinremCaseDetails caseDetailsBefore = callbackRequest.getCaseDetailsBefore(); if (CollectionUtils.isNotEmpty(caseDetails.getData().getDirectionDetailsCollection())) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java new file mode 100644 index 0000000000..06e9f084b8 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java @@ -0,0 +1,66 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; +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.handler.FinremCallbackHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +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.service.processorder.ProcessOrderService; + +import java.util.ArrayList; +import java.util.List; + +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_START; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; + +@Slf4j +@Service +public class ProcessOrdersAboutToStartHandler extends FinremCallbackHandler { + + private final ProcessOrderService processOrderService; + + public ProcessOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, + ProcessOrderService processOrderService) { + super(finremCaseDetailsMapper); + this.processOrderService = processOrderService; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return ABOUT_TO_START.equals(callbackType) && CONTESTED.equals(caseType) && PROCESS_ORDER.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseDetails caseDetails = callbackRequest.getCaseDetails(); + String caseId = String.valueOf(caseDetails.getId()); + log.info("Invoking contested event {} about to start callback for Case ID: {}", callbackRequest.getEventType(), caseId); + FinremCaseData caseData = caseDetails.getData(); + + List errors = new ArrayList<>(); + + processOrderService.populateUnprocessedApprovedDocuments(caseData); + populateMetaDataFields(caseData); + + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseData).errors(errors).build(); + } + + private void populateMetaDataFields(FinremCaseData caseData) { + caseData.getDraftOrdersWrapper().setIsLegacyApprovedOrderPresent(YesOrNo.forValue(!CollectionUtils + .isEmpty(caseData.getUploadHearingOrder()))); + caseData.getDraftOrdersWrapper().setIsUnprocessedApprovedDocumentPresent(YesOrNo.forValue(!ofNullable(caseData.getDraftOrdersWrapper() + .getUnprocessedApprovedDocuments()).orElse(List.of()).isEmpty())); + } + +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java new file mode 100644 index 0000000000..37e9dbee2a --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java @@ -0,0 +1,166 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.DirectionUploadOrderAboutToSubmitHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; + +import java.util.ArrayList; +import java.util.List; + +import static java.util.Optional.ofNullable; +import static java.util.function.Predicate.not; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; + +@Slf4j +@Service +public class ProcessOrdersAboutToSubmitHandler extends DirectionUploadOrderAboutToSubmitHandler { + + private final HasApprovableCollectionReader hasApprovableCollectionReader; + + public ProcessOrdersAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, + AdditionalHearingDocumentService service, + HasApprovableCollectionReader hasApprovableCollectionReader) { + super(finremCaseDetailsMapper, service); + this.hasApprovableCollectionReader = hasApprovableCollectionReader; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return ABOUT_TO_SUBMIT.equals(callbackType) && CONTESTED.equals(caseType) && PROCESS_ORDER.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, + String userAuthorisation) { + FinremCaseData caseData = callbackRequest.getCaseDetails().getData(); + // handleNewDocument is required to be done before calling super method which stamps the uploading document. + handleNewDocument(caseData); + GenericAboutToStartOrSubmitCallbackResponse resp = super.handle(callbackRequest, userAuthorisation); + caseData = resp.getData(); + + handleDraftOrderDocuments(caseData); + handlePsaDocuments(caseData); + handleAgreedDraftOrdersCollection(caseData); + clearTemporaryFields(caseData); + + return resp; + } + + private List nullSafeUnprocessedApprovedDocuments(FinremCaseData caseData) { + return ofNullable(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).orElse(List.of()); + } + + void handleNewDocument(FinremCaseData caseData) { + nullSafeUnprocessedApprovedDocuments(caseData).forEach(unprocessedApprovedOrder -> { + if (isNewDocument(unprocessedApprovedOrder)) { + insertNewDocumentToUploadHearingOrder(caseData, unprocessedApprovedOrder); + } + }); + } + + private void handleDraftOrderDocuments(FinremCaseData caseData) { + List collector = new ArrayList<>(); + hasApprovableCollectionReader.filterAndCollectDraftOrderDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), + collector, APPROVED_BY_JUDGE::equals); + + nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + .forEach(unprocessedApprovedOrder -> + collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { + toBeUpdated.getValue().setOrderStatus(PROCESSED); + toBeUpdated.getValue().setDraftOrderDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + }) + ); + } + + private void handlePsaDocuments(FinremCaseData caseData) { + List psaCollector = new ArrayList<>(); + hasApprovableCollectionReader.filterAndCollectPsaDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), + psaCollector, APPROVED_BY_JUDGE::equals); + + nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + .forEach(unprocessedApprovedOrder -> + psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { + toBeUpdated.getValue().setOrderStatus(PROCESSED); + toBeUpdated.getValue().setPsaDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + }) + ); + } + + private void handleAgreedDraftOrdersCollection(FinremCaseData caseData) { + List agreedOrderCollector = new ArrayList<>(); + hasApprovableCollectionReader.collectAgreedDraftOrders(caseData.getDraftOrdersWrapper().getAgreedDraftOrderCollection(), + agreedOrderCollector, APPROVED_BY_JUDGE::equals); + + nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + .forEach(unprocessedApprovedOrder -> + agreedOrderCollector.stream().filter(agreedDraftOrder -> doesDocumentMatch(agreedDraftOrder, unprocessedApprovedOrder)) + .forEach(toBeUpdated -> { + toBeUpdated.getValue().setOrderStatus(PROCESSED); + // replace the document by the new uploaded approved document + if (toBeUpdated.getValue().getPensionSharingAnnex() != null) { + toBeUpdated.getValue().setPensionSharingAnnex(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + } else if (toBeUpdated.getValue().getDraftOrder() != null) { + toBeUpdated.getValue().setDraftOrder(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + } + }) + ); + } + + private void insertNewDocumentToUploadHearingOrder(FinremCaseData caseData, DirectionOrderCollection unprocessedApprovedOrder) { + if (caseData.getUploadHearingOrder() == null) { + caseData.setUploadHearingOrder(new ArrayList<>()); + } + caseData.getUploadHearingOrder().add(DirectionOrderCollection.builder() + .value(DirectionOrder.builder() + .uploadDraftDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()) + .build()) + .build()); + } + + private void clearTemporaryFields(FinremCaseData caseData) { + clearUnprocessedApprovedDocuments(caseData.getDraftOrdersWrapper()); + clearMetaDataFields(caseData); + } + + private void clearUnprocessedApprovedDocuments(DraftOrdersWrapper draftOrdersWrapper) { + draftOrdersWrapper.setUnprocessedApprovedDocuments(List.of()); + } + + private void clearMetaDataFields(FinremCaseData caseData) { + caseData.getDraftOrdersWrapper().setIsLegacyApprovedOrderPresent(null); + caseData.getDraftOrdersWrapper().setIsUnprocessedApprovedDocumentPresent(null); + } + + private boolean doesDocumentMatch(HasApprovable hasApprovable, DirectionOrderCollection unprocessedApprovedOrder) { + return doesDocumentMatch(hasApprovable.getValue().getTargetDocument(), unprocessedApprovedOrder.getValue().getOriginalDocument()); + } + + private boolean doesDocumentMatch(CaseDocument doc1, CaseDocument doc2) { + return doc1.getDocumentUrl().equals(doc2.getDocumentUrl()); + } + + private boolean isNewDocument(DirectionOrderCollection unprocessedApprovedOrder) { + return unprocessedApprovedOrder.getValue().getOriginalDocument() == null; + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java new file mode 100644 index 0000000000..1cf71b21d8 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java @@ -0,0 +1,79 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +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.handler.DirectionUploadOrderMidHandler; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetail; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetailCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.BulkPrintDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; + +import java.util.List; + +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.MID_EVENT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; + +@Slf4j +@Service +public class ProcessOrdersMidHandler extends DirectionUploadOrderMidHandler { + + private final ProcessOrderService processOrderService; + + public ProcessOrdersMidHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, BulkPrintDocumentService service, + ProcessOrderService processOrderService) { + super(finremCaseDetailsMapper, service); + this.processOrderService = processOrderService; + } + + @Override + public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { + return MID_EVENT.equals(callbackType) && CONTESTED.equals(caseType) && PROCESS_ORDER.equals(eventType); + } + + @Override + public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, String userAuthorisation) { + FinremCaseData caseDataBefore = callbackRequest.getCaseDetailsBefore().getData(); + FinremCaseData caseData = callbackRequest.getCaseDetails().getData(); + + processOrderService.populateUnprocessedApprovedDocuments(caseDataBefore); + + if (processOrderService.areAllLegacyApprovedOrdersRemoved(caseDataBefore, caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("Upload Approved Order is required.")).build(); + } + if (!processOrderService.areAllNewOrdersPdfFiles(caseDataBefore, caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("You must upload a PDF file for new documents.")).build(); + } + // Validate the modifying legacy approved orders + if (!processOrderService.areAllLegacyApprovedOrdersPdf(caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("You must upload a PDF file for modifying legacy approved documents.")).build(); + } + // Validate the modifying unprocessed approved orders are word documents + if (!processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("You must upload a Microsoft Word file for modifying an unprocessed approved documents.")) + .build(); + } + + GenericAboutToStartOrSubmitCallbackResponse res = super.handle(callbackRequest, userAuthorisation); + + // Create an empty entry if it is empty to save a click on add new button + if (ofNullable(caseData.getDirectionDetailsCollection()).orElse(List.of()).isEmpty()) { + caseData.setDirectionDetailsCollection(List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + )); + } + return res; + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java index c99c727b63..9b3533de38 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java @@ -73,6 +73,7 @@ public enum EventType { SOLICITOR_CW_DRAFT_ORDER("FR_solicitorDraftDirectionOrder"), JUDGE_DRAFT_ORDER("FR_judgeDraftDirectionOrder"), DIRECTION_UPLOAD_ORDER("FR_directionOrder"), + PROCESS_ORDER("FR_directionOrderNew"), CONSENT_ORDER("FR_consentOrder"), ASSIGN_DOCUMENT_CATEGORIES("FR_assignDocumentCategories"), GIVE_ALLOCATION_DIRECTIONS("FR_giveAllocationDirections"), diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DirectionOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DirectionOrder.java index f1d20cae94..740f24d613 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DirectionOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/DirectionOrder.java @@ -24,4 +24,6 @@ public class DirectionOrder implements HasCaseDocument { LocalDateTime orderDateTime; @JsonProperty("isOrderStamped") YesOrNo isOrderStamped; + @JsonProperty("originalDocument") + CaseDocument originalDocument; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java index 2a9be7d026..9cd2605165 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/Approvable.java @@ -17,7 +17,21 @@ public interface Approvable extends DocumentMatcher { YesOrNo getFinalOrder(); - CaseDocument getReplacedDocument(); + /** + * Retrieves the target document from the available options. + * + *

    + * It returns the target document. + * In some cases, the method checks if the draft order is present and returns it. + * If the draft order is not available, it checks for the presence of + * the pension sharing annex and returns it. If neither is available, + * the method returns {@code null}. + *

    + * + * @return the {@link CaseDocument} representing the target document, + * or {@code null} if no document is available. + */ + CaseDocument getTargetDocument(); void setOrderStatus(OrderStatus orderStatus); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java index 72d82b4327..a7e3b99a78 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/agreed/AgreedDraftOrder.java @@ -71,7 +71,7 @@ public YesOrNo getFinalOrder() { @JsonIgnore @Override - public CaseDocument getReplacedDocument() { + public CaseDocument getTargetDocument() { if (draftOrder != null) { return draftOrder; } else if (pensionSharingAnnex != null) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java index f64d64a813..87dd29d291 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrderDocumentReview.java @@ -49,7 +49,7 @@ public class DraftOrderDocumentReview implements HasCaseDocument, Reviewable, Re @JsonIgnore @Override - public CaseDocument getReplacedDocument() { + public CaseDocument getTargetDocument() { return draftOrderDocument; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java index 0666f222e1..89e74a940b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/OrderStatus.java @@ -3,7 +3,7 @@ public enum OrderStatus { TO_BE_REVIEWED, APPROVED_BY_JUDGE, - PROCESSED_BY_ADMIN, + PROCESSED, REFUSED; public static boolean isJudgeReviewable(OrderStatus status) { diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java index e7b7f7bc41..a73f54e4f8 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/PsaDocumentReview.java @@ -46,7 +46,7 @@ public class PsaDocumentReview implements HasCaseDocument, Reviewable, RefusalOr @JsonIgnore @Override - public CaseDocument getReplacedDocument() { + public CaseDocument getTargetDocument() { return psaDocument; } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java index 859264c988..e80c0eca69 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/DraftOrdersWrapper.java @@ -10,6 +10,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.HasCaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.JudgeType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.UuidCollection; @@ -91,6 +92,12 @@ public class DraftOrdersWrapper implements HasCaseDocument { private List refusalOrderIdsToBeSent; + private List unprocessedApprovedDocuments; + + private YesOrNo isLegacyApprovedOrderPresent; + + private YesOrNo isUnprocessedApprovedDocumentPresent; + public void appendAgreedDraftOrderCollection(List newAgreedDraftOrderCollection) { if (agreedDraftOrderCollection == null) { agreedDraftOrderCollection = new ArrayList<>(); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java index 6c084fe553..92727f3058 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReader.java @@ -3,6 +3,7 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.Approvable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; @@ -85,6 +86,25 @@ public List filterAndCollectPsaDocs( ); } + /** + * Collects agreed draft orders from the given list that match the specified status predicate + * and adds them to the provided collector list. + * + * @param agreedDraftOrderCollections the list of agreed draft orders to process; + * if null, no processing is performed. + * @param collector the list where matching agreed draft orders are collected; + * if null, no items are added. + * @param statusPredicate the predicate used to determine the order status to collect. + * Orders that satisfy this predicate are added to the collector. + */ + public void collectAgreedDraftOrders( + List agreedDraftOrderCollections, + List collector, + Predicate statusPredicate) { + Map> partitioned = partitionByOrderStatus(agreedDraftOrderCollections, statusPredicate); + collector.addAll(partitioned.getOrDefault(true, List.of())); + } + private List filterAndCollect( List draftOrdersReviewCollection, List collector, diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java new file mode 100644 index 0000000000..464108e2f5 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java @@ -0,0 +1,146 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +import static java.util.Optional.of; +import static java.util.Optional.ofNullable; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; + +@Service +@Slf4j +@RequiredArgsConstructor +public class ProcessOrderService { + + private final HasApprovableCollectionReader hasApprovableCollectionReader; + + private static List nullSafeList(List t) { + return ofNullable(t).orElse(List.of()); + } + + /** + * Populates the `unprocessedApprovedDocuments` collection in the `DraftOrdersWrapper` + * with approved draft orders and PSA documents that have not been processed yet. + * + *

    The method collects documents marked as approved by the judge from the + * `draftOrdersReviewCollection` within the `DraftOrdersWrapper`. It then converts + * these documents into `DirectionOrderCollection` objects and sets them in the + * `unprocessedApprovedDocuments` field. + * + * @param caseData the case data containing the draft orders and PSA documents + * to process. + */ + public void populateUnprocessedApprovedDocuments(FinremCaseData caseData) { + DraftOrdersWrapper draftOrdersWrapper = caseData.getDraftOrdersWrapper(); + + List draftOrderCollector = new ArrayList<>(); + hasApprovableCollectionReader.filterAndCollectDraftOrderDocs(draftOrdersWrapper.getDraftOrdersReviewCollection(), + draftOrderCollector, APPROVED_BY_JUDGE::equals); + List psaCollector = new ArrayList<>(); + hasApprovableCollectionReader.filterAndCollectPsaDocs(draftOrdersWrapper.getDraftOrdersReviewCollection(), + psaCollector, APPROVED_BY_JUDGE::equals); + + Function directionOrderCollectionConvertor = d -> DirectionOrderCollection.builder() + .value(DirectionOrder.builder() + .isOrderStamped(YesOrNo.NO) // It's not stamped in the new draft order flow + .orderDateTime(d.getValue().getApprovalDate()) + .uploadDraftDocument(d.getValue().getTargetDocument()) + .originalDocument(d.getValue().getTargetDocument()) + .build()) + .build(); + + List result = new ArrayList<>(draftOrderCollector.stream() + .map(directionOrderCollectionConvertor).toList()); + result.addAll(psaCollector.stream() + .map(directionOrderCollectionConvertor).toList()); + caseData.getDraftOrdersWrapper().setUnprocessedApprovedDocuments(result); + } + + /** + * Determines if all legacy approved orders have been removed by comparing the state of + * the "upload hearing order" field in the provided case data before and after an update. + * + * @param caseDataBefore the case data before the update, used to check if legacy orders existed + * @param caseData the case data after the update, used to check if legacy orders have been removed + * @return {@code true} if the "upload hearing order" was not empty in {@code caseDataBefore} + * and is empty in {@code caseData}, otherwise {@code false} + */ + public boolean areAllLegacyApprovedOrdersRemoved(FinremCaseData caseDataBefore, FinremCaseData caseData) { + return !isUploadHearingOrderEmpty(caseDataBefore) && isUploadHearingOrderEmpty(caseData); + } + + /** + * Checks if all newly uploaded orders in the given case data are PDF documents. + * + * @param caseDataBefore the case data before the operation. + * @param caseData the case data after the operation. + * @return true if all newly uploaded orders are PDF documents; false otherwise. + */ + public boolean areAllNewOrdersPdfFiles(FinremCaseData caseDataBefore, FinremCaseData caseData) { + return areAllNewDocumentsPdf(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()) + && areAllNewDocumentsPdf(caseData.getUploadHearingOrder() + ); + } + + /** + * Checks if all legacy approved orders in the case data are PDF files. + * + *

    This method verifies that each document in the {@code uploadHearingOrder} collection + * has the specified file extension (in this case, "pdf").

    + * + * @param caseData the {@link FinremCaseData} object containing the uploaded hearing orders + * @return {@code true} if all documents in {@code uploadHearingOrder} have the "pdf" extension; {@code false} otherwise + */ + public boolean areAllLegacyApprovedOrdersPdf(FinremCaseData caseData) { + return areAllDocumentsWithExtensions(caseData.getUploadHearingOrder(), List.of("pdf")); + } + + /** + * Checks if all the documents in the unprocessed approved draft orders of the given case data + * have filenames with extensions matching the specified Word document formats (.doc or .docx). + * + * @param caseData the FinremCaseData object containing the draft orders wrapper + * with unprocessed approved documents. + * @return {@code true} if all unprocessed approved documents have filenames ending with + * ".doc" or ".docx" (case-insensitive), {@code false} otherwise. + */ + public boolean areAllModifyingUnprocessedOrdersWordDocuments(FinremCaseData caseData) { + return areAllDocumentsWithExtensions(nullSafeList(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()) + .stream().filter(doc -> doc.getValue().getOriginalDocument() != null).toList(), List.of("doc", "docx")); + } + + private boolean areAllDocumentsWithExtensions(List list, List fileExtensions) { + return nullSafeList(list).stream() + .allMatch(doc -> of(doc).map(DirectionOrderCollection::getValue) + .map(DirectionOrder::getUploadDraftDocument) + .map(CaseDocument::getDocumentFilename) + .orElse("") + .matches(String.format("(?i).*\\.(%s)$", String.join("|", fileExtensions)))); + } + + private boolean areAllNewDocumentsPdf(List afterList) { + + return areAllDocumentsWithExtensions(nullSafeList(afterList).stream() + .filter(doc -> doc.getValue().getOriginalDocument() == null).toList(), List.of("pdf")); + } + + private boolean isUploadHearingOrderEmpty(FinremCaseData caseData) { + return nullSafeList(caseData.getUploadHearingOrder()).isEmpty(); + } + +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java index 96d25fb99f..e0ccfe9a67 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/FinremCallbackRequestFactory.java @@ -40,8 +40,14 @@ public static FinremCallbackRequest from(Long id, CaseType caseType, FinremCaseD } public static FinremCallbackRequest from(FinremCaseDetails.FinremCaseDetailsBuilder caseDetailsBuilder) { + return from(caseDetailsBuilder, caseDetailsBuilder); + } + + public static FinremCallbackRequest from(FinremCaseDetails.FinremCaseDetailsBuilder caseDetailsBeforeBuilder, + FinremCaseDetails.FinremCaseDetailsBuilder caseDetailsBuilder) { return FinremCallbackRequest.builder() .caseDetails(caseDetailsBuilder.build()) + .caseDetailsBefore(caseDetailsBeforeBuilder.build()) .build(); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 733020b304..1bd073e9ac 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -16,16 +16,15 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) class DirectionUploadOrderAboutToSubmitHandlerTest { - public static final String AUTH_TOKEN = "tokien:)"; @InjectMocks private DirectionUploadOrderAboutToSubmitHandler handler; @@ -33,28 +32,8 @@ class DirectionUploadOrderAboutToSubmitHandlerTest { private AdditionalHearingDocumentService service; @Test - void handlerCanNotHandleWhenNonExpectedEventTypeReceived() { - assertFalse(handler.canHandle(CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.LIST_FOR_HEARING)); - } - - @Test - void handlerCanNotHandleWhenNonExpectedCaseTypeReceived() { - assertFalse(handler.canHandle(CallbackType.ABOUT_TO_SUBMIT, CaseType.CONSENTED, EventType.DIRECTION_UPLOAD_ORDER)); - } - - @Test - void handlerCanNotHandleWhenNonExpectedCallbackTypeReceived() { - assertFalse(handler.canHandle(CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER)); - } - - @Test - void handlerCanNotHandleWhenNonExpectedInputReceived() { - assertFalse(handler.canHandle(CallbackType.ABOUT_TO_START, CaseType.CONSENTED, EventType.CLOSE)); - } - - @Test - void handlerCanHandleWhenExpectedInputReceived() { - assertTrue(handler.canHandle(CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER)); + void testCanHandle() { + assertCanHandle(handler, CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER); } @Test @@ -86,4 +65,4 @@ private FinremCallbackRequest buildCallbackRequest() { .data(new FinremCaseData()).build()) .build(); } -} \ No newline at end of file +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java index 4f9f5fc304..9a0be3ca1f 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java @@ -23,12 +23,13 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) class DirectionUploadOrderMidHandlerTest extends BaseHandlerTestSetup { @@ -39,8 +40,6 @@ class DirectionUploadOrderMidHandlerTest extends BaseHandlerTestSetup { private static final String FILE_URL = "http://dm:80/documents/kbjh87y8y9JHVKKKJVJ"; private static final String FILE_BINARY_URL = "http://dm:80/documents/kbjh87y8y9JHVKKKJVJ/binary"; private static final String FILE_NAME = "abc.pdf"; - public static final String AUTH_TOKEN = "tokien:)"; - @BeforeEach void setup() { @@ -49,26 +48,10 @@ void setup() { } @Test - void canHandle() { - assertTrue(handler.canHandle(CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER)); - } - - @Test - void canNotHandle() { - assertFalse(handler.canHandle(CallbackType.MID_EVENT, CaseType.CONSENTED, EventType.DIRECTION_UPLOAD_ORDER)); + void testCanHandle() { + assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER); } - @Test - void canNotHandleWrongEventType() { - assertFalse(handler.canHandle(CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.CLOSE)); - } - - @Test - void canNotHandleWrongCallbackType() { - assertFalse(handler.canHandle(CallbackType.ABOUT_TO_START, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER)); - } - - @Test void givenContestedCase_whenDirectionUploadOrderButNonEncryptedFileShouldNotGetError() { FinremCallbackRequest finremCallbackRequest = buildCallbackRequest(EventType.DIRECTION_UPLOAD_ORDER); @@ -114,11 +97,11 @@ void givenContestedCase_whenExistingDirectionUploadOrderAndUploadedSame_thenShou hearingOrderOtherDocuments.add(documentCollection); caseData.setHearingOrderOtherDocuments(hearingOrderOtherDocuments); - finremCallbackRequest.getCaseDetailsBefore().getData().setHearingOrderOtherDocuments(hearingOrderOtherDocuments);; + finremCallbackRequest.getCaseDetailsBefore().getData().setHearingOrderOtherDocuments(hearingOrderOtherDocuments); GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(finremCallbackRequest, AUTH_TOKEN); assertTrue(response.getErrors().isEmpty()); verify(service, never()).validateEncryptionOnUploadedDocument(any(), any(), any(), any()); } -} \ No newline at end of file +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java index 78cad5bad1..8c5d11c4e3 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java @@ -2,6 +2,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.provider.Arguments; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -25,16 +26,15 @@ import java.util.List; import static java.util.List.of; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) class DirectionUploadOrderSubmittedHandlerTest { - public static final String AUTH_TOKEN = "tokien:)"; @Mock private HearingDocumentService hearingDocumentService; @Mock @@ -43,33 +43,11 @@ class DirectionUploadOrderSubmittedHandlerTest { @InjectMocks private DirectionUploadOrderSubmittedHandler handler; - - @Test - void givenACcdCallbackContestedCase_WhenASubmitEventDirectionUploadOrder_thenHandlerCanHandle() { - assertThat(handler - .canHandle(CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER), - is(true)); - } - @Test - void givenACcdCallbackConsentedCase_WhenCaseTypeIsConsented_thenHandlerCanNotHandle() { - assertThat(handler - .canHandle(CallbackType.SUBMITTED, CaseType.CONSENTED, EventType.DIRECTION_UPLOAD_ORDER), - is(false)); - } - - @Test - void givenACcdCallbackConsentedCase_WhenASubmitEventListForHearing_thenHandlerCanNotHandle() { - assertThat(handler - .canHandle(CallbackType.ABOUT_TO_SUBMIT, CaseType.CONSENTED, EventType.DIRECTION_UPLOAD_ORDER), - is(false)); - } - - @Test - void givenACcdCallbackConsentedCase_WhenEventIsClose_thenHandlerCanNotHandle() { - assertThat(handler - .canHandle(CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.CLOSE), - is(false)); + void testCanHandle() { + assertCanHandle(handler, + Arguments.of(CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER), + Arguments.of(CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.PROCESS_ORDER)); } @Test @@ -138,7 +116,6 @@ private DynamicMultiSelectList getParties() { .build(); } - private List partyList() { return of(CaseRole.APP_SOLICITOR.getCcdCode(), CaseRole.RESP_SOLICITOR.getCcdCode(), CaseRole.INTVR_SOLICITOR_1.getCcdCode(), CaseRole.INTVR_SOLICITOR_2.getCcdCode(), diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java index ad8613655e..2085a2606a 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/judgeapproval/ApproveDraftOrdersAboutToStartHandlerTest.java @@ -52,7 +52,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.DRAFT_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.judgeapproval.JudgeApprovalDocType.PSA; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED_BY_ADMIN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @@ -81,7 +81,7 @@ void givenUserHasJudgeProcessedDraftOrders_thenReturnError() { DraftOrderDocumentReview document1 = DraftOrderDocumentReview.builder().orderStatus(APPROVED_BY_JUDGE) .build(); - DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED_BY_ADMIN) + DraftOrderDocumentReview document2 = DraftOrderDocumentReview.builder().orderStatus(PROCESSED) .build(); DraftOrderDocReviewCollection collectionItem1 = new DraftOrderDocReviewCollection(document1); @@ -470,12 +470,12 @@ private static Arguments withProcessedDraftOrderAndPsa() { .value(applyHearingInfo1(DraftOrdersReview.builder() .psaDocReviewCollection(List.of( buildPsaDocReviewCollection(APPROVED_BY_JUDGE), - buildPsaDocReviewCollection(PROCESSED_BY_ADMIN), + buildPsaDocReviewCollection(PROCESSED), buildPsaDocReviewCollection(PSA_DOC_2, TO_BE_REVIEWED) )) .draftOrderDocReviewCollection(List.of( buildDraftOrderDocumentReview(APPROVED_BY_JUDGE), - buildDraftOrderDocumentReview(PROCESSED_BY_ADMIN), + buildDraftOrderDocumentReview(PROCESSED), buildDraftOrderDocumentReview(DO_DOC_2, List.of(DO_ATTACHMENT_2), TO_BE_REVIEWED) ))) .build()) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java new file mode 100644 index 0000000000..5cf93fd351 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java @@ -0,0 +1,126 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; +import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; + +import java.time.LocalDateTime; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_START; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ProcessOrdersAboutToStartHandlerTest { + + private static final CaseDocument TARGET_DOCUMENT_1 = CaseDocument.builder().documentUrl("targetDoc1.docx").build(); + + private static final LocalDateTime APPROVAL_DATE = LocalDateTime.of(2024, 12, 24, 23, 0, 0); + + @InjectMocks + private ProcessOrdersAboutToStartHandler underTest; + + @Spy + private HasApprovableCollectionReader hasApprovableCollectionReader = new HasApprovableCollectionReader(); + + @Spy + private ProcessOrderService processOrderService = new ProcessOrderService(hasApprovableCollectionReader); + + @Test + void testCanHandle() { + assertCanHandle(underTest, ABOUT_TO_START, CONTESTED, PROCESS_ORDER); + } + + @Test + void shouldPopulateIsHavingOldDraftOrders() { + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(List.of(DirectionOrderCollection.builder().build())) + .build()); + assertEquals(YesOrNo.YES, underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData().getDraftOrdersWrapper() + .getIsLegacyApprovedOrderPresent()); + + finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + assertEquals(YesOrNo.NO, underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData().getDraftOrdersWrapper() + .getIsLegacyApprovedOrderPresent()); + finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().uploadHearingOrder(List.of()).build()); + assertEquals(YesOrNo.NO, underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData().getDraftOrdersWrapper() + .getIsLegacyApprovedOrderPresent()); + } + + @Test + void shouldPopulateUnprocessedApprovedDocuments() { + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1, APPROVAL_DATE), + buildDraftOrderDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocReviewCollection(PROCESSED), + buildDraftOrderDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build() + )) + .build()) + .build()); + GenericAboutToStartOrSubmitCallbackResponse result = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertThat(result.getData().getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).hasSize(1); + assertThat(result.getData().getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).contains( + DirectionOrderCollection.builder().value(DirectionOrder.builder() + .isOrderStamped(YesOrNo.NO) + .uploadDraftDocument(TARGET_DOCUMENT_1) + .originalDocument(TARGET_DOCUMENT_1) + .orderDateTime(APPROVAL_DATE) + .build()).build() + ); + assertTrue(YesOrNo.isYes(result.getData().getDraftOrdersWrapper().getIsUnprocessedApprovedDocumentPresent())); + } + + private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus) { + return buildDraftOrderDocReviewCollection(orderStatus, null, null); + } + + private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus, CaseDocument caseDocument, + LocalDateTime approvalDate) { + return DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder() + .orderStatus(orderStatus) + .draftOrderDocument(caseDocument) + .approvalDate(approvalDate) + .build()) + .build(); + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java new file mode 100644 index 0000000000..19ebc9664b --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java @@ -0,0 +1,364 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; + +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.ArgumentCaptor; +import org.mockito.InOrder; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; +import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; +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.draftorders.agreed.AgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; + +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.inOrder; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ProcessOrdersAboutToSubmitHandlerTest { + + private static final CaseDocument TARGET_DOCUMENT_1 = CaseDocument.builder().documentUrl("targetDoc1.docx").build(); + + private static final CaseDocument TARGET_DOCUMENT_2 = CaseDocument.builder().documentUrl("targetDoc2.docx").build(); + + private static final CaseDocument TARGET_DOCUMENT_3 = CaseDocument.builder().documentUrl("targetDoc3.docx").build(); + + private static final CaseDocument TARGET_DOCUMENT_4 = CaseDocument.builder().documentUrl("targetDoc4.docx").build(); + + @Spy + @InjectMocks + private ProcessOrdersAboutToSubmitHandler underTest; + + @Spy + private HasApprovableCollectionReader hasApprovableCollectionReader; + + @Mock + private AdditionalHearingDocumentService additionalHearingDocumentService; + + @Test + void testCanHandle() { + assertCanHandle(underTest, ABOUT_TO_SUBMIT, CONTESTED, PROCESS_ORDER); + } + + @Test + void shouldHandleUploadHearingOrdersWithoutUnprocessedDraftDocuments() { + List uploadHearingOrder = new ArrayList<>(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .build()); + + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertThat(res.getData().getUploadHearingOrder()).hasSize(1); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrders(boolean nullExistingUploadHearingOrder) { + List uploadHearingOrder = nullExistingUploadHearingOrder ? null : new ArrayList<>(); + DirectionOrderCollection expectedNewDirectionOrderCollection = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), + expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() + )) + .build()) + .build()); + + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertThat(res.getData().getUploadHearingOrder()).hasSize(1); + assertThat(res.getData().getUploadHearingOrder().get(0)).isEqualTo(expectedNewDirectionOrderCollection); + } + + @Test + void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrdersWithExistingUploadHearingOrder() { + List uploadHearingOrder = new ArrayList<>(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )); + DirectionOrderCollection expectedNewDirectionOrderCollection = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), + expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() + )) + .build()) + .build()); + + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertThat(res.getData().getUploadHearingOrder()).hasSize(2); + assertThat(res.getData().getUploadHearingOrder().get(1)).isEqualTo(expectedNewDirectionOrderCollection); + } + + @Test + void shouldStampNewUploadedDocumentsFromUnprocessedApprovedDocuments() throws JsonProcessingException { + List uploadHearingOrder = new ArrayList<>(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )); + DirectionOrderCollection expectedNewDirectionOrderCollection = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), + expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() + )) + .build()) + .build()); + + // Captor to capture the argument passed to the service + ArgumentCaptor caseDetailsCaptor = ArgumentCaptor.forClass(FinremCaseDetails.class); + + // Use InOrder to verify the order of method calls + InOrder inOrder = inOrder(underTest, additionalHearingDocumentService); + + // verify handleNewDocument should be invoked before createAndStoreAdditionalHearingDocuments which stamps the PDF file uploaded. + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + inOrder.verify(underTest).handleNewDocument(any(FinremCaseData.class)); + inOrder.verify(additionalHearingDocumentService).createAndStoreAdditionalHearingDocuments(caseDetailsCaptor.capture(), eq(AUTH_TOKEN)); + + FinremCaseData capturedData = caseDetailsCaptor.getValue().getData(); + assertTrue(capturedData.getUploadHearingOrder().contains(expectedNewDirectionOrderCollection)); + assertTrue(capturedData.getUploadHearingOrder().containsAll(uploadHearingOrder)); + } + + @Test + void shouldMarkDraftOrdersReviewCollectionProcessed() { + DraftOrderDocReviewCollection test1 = null; + DraftOrderDocReviewCollection test2 = null; + AgreedDraftOrderCollection test3 = null; + AgreedDraftOrderCollection test4 = null; + AgreedDraftOrderCollection test5 = null; + AgreedDraftOrderCollection test6 = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build() + )) + .agreedDraftOrderCollection(List.of( + test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_1) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_2) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test5 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_3) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test6 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_4) + .orderStatus(TO_BE_REVIEWED).build()).build() + )) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + test1 = buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), + buildDraftOrderDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocReviewCollection(PROCESSED), + test2 = buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) + )) + .build()).build() + )) + .build()) + .build()); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); + assertEquals(TO_BE_REVIEWED, test6.getValue().getOrderStatus()); + } + + @Test + void shouldMarkPsaCollectionProcessed() { + PsaDocReviewCollection test1 = null; + PsaDocReviewCollection test2 = null; + AgreedDraftOrderCollection test3 = null; + AgreedDraftOrderCollection test4 = null; + AgreedDraftOrderCollection test5 = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder() + .originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder() + .originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build() + )) + .agreedDraftOrderCollection(List.of( + test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_1) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_2) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test5 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_3) + .orderStatus(APPROVED_BY_JUDGE).build()).build() + )) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + test1 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), + buildPsaDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PROCESSED), + test2 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) + )) + .build()).build() + )) + .build()) + .build()); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); + } + + @Test + void shouldReplaceApprovedDocumentAndMarkAsProcessed() { + PsaDocReviewCollection test1 = null; + PsaDocReviewCollection test2 = null; + AgreedDraftOrderCollection test3 = null; + AgreedDraftOrderCollection test4 = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )) + .agreedDraftOrderCollection(List.of( + test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_1) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_2) + .orderStatus(APPROVED_BY_JUDGE).build()).build() + )) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + test1 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), + buildPsaDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PROCESSED), + test2 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) + )) + .build()).build() + )) + .build()) + .build()); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(TARGET_DOCUMENT_3, test1.getValue().getPsaDocument()); + assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + assertEquals(TARGET_DOCUMENT_4, test2.getValue().getPsaDocument()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + } + + private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus) { + return buildDraftOrderDocReviewCollection(orderStatus, null); + } + + private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus, CaseDocument document) { + return DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder().draftOrderDocument(document).orderStatus(orderStatus).build()) + .build(); + } + + private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { + return buildPsaDocReviewCollection(orderStatus, null); + } + + private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus, CaseDocument document) { + return PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(document).orderStatus(orderStatus).build()) + .build(); + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java new file mode 100644 index 0000000000..75111322e4 --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java @@ -0,0 +1,132 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; +import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CfcCourt; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetail; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetailCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.MID_EVENT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; + +@ExtendWith(MockitoExtension.class) +class ProcessOrdersMidHandlerTest { + + @InjectMocks + private ProcessOrdersMidHandler underTest; + + @Mock + private ProcessOrderService processOrderService; + + @Test + void testCanHandle() { + assertCanHandle(underTest, MID_EVENT, CONTESTED, PROCESS_ORDER); + } + + private void mockPassAllValidations() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(any(FinremCaseData.class))).thenReturn(true); + } + + @Test + void shouldCreateEmptyEntryWhenDirectionDetailsCollectionIsEmptyOrNull() { + List expected = List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + ); + + mockPassAllValidations(); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + FinremCaseData result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertEquals(expected, result.getDirectionDetailsCollection()); + + finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().directionDetailsCollection(List.of()).build()); + result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertEquals(expected, result.getDirectionDetailsCollection()); + } + + @Test + void shouldNotCreateEmptyEntryWhenDirectionDetailsCollectionIsNotEmpty() { + List notExpected = List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + ); + + mockPassAllValidations(); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .directionDetailsCollection(List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build(), + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + )) + .build()); + FinremCaseData result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertNotEquals(notExpected, result.getDirectionDetailsCollection()); + + finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .directionDetailsCollection(List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().cfcList(CfcCourt.BARNET_CIVIL_AND_FAMILY_COURTS_CENTRE) + .build()).build() + )) + .build()); + result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertNotEquals(notExpected, result.getDirectionDetailsCollection()); + } + + @Test + void shouldShowErrorMessageWhenAllLegacyApprovedOrdersRemoved() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("Upload Approved Order is required."), res.getErrors()); + } + + @Test + void shouldShowErrorMessageWhenNotAllNewOrdersPdfFiles() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("You must upload a PDF file for new documents."), res.getErrors()); + } + + @Test + void shouldShowErrorMessageWhenNotAllLegacyApprovedOrdersPdf() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(false); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("You must upload a PDF file for modifying legacy approved documents."), res.getErrors()); + } + + @Test + void shouldShowErrorMessageWhenNotAllModifyingUnprocessedOrdersWordDocuments() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(any(FinremCaseData.class))).thenReturn(false); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("You must upload a Microsoft Word file for modifying an unprocessed approved documents."), res.getErrors()); + } +} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReviewTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReviewTest.java index 5fb587e3cd..22728a830d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReviewTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/draftorders/review/DraftOrdersReviewTest.java @@ -16,6 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; class DraftOrdersReviewTest { @@ -151,7 +152,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { Arguments.of( List.of(Optional.of(LocalDateTime.of(2023, 5, 10, 10, 0)), Optional.of(LocalDateTime.of(2023, 6, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2023, 3, 15, 10, 0)), Optional.of(LocalDateTime.of(2023, 4, 20, 10, 0))), List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.APPROVED_BY_JUDGE)), @@ -160,10 +161,10 @@ static Stream provideMultipleReviewsWithStatusTestCases() { Arguments.of( List.of(Optional.of(LocalDateTime.of(2023, 1, 10, 10, 0)), Optional.of(LocalDateTime.of(2023, 1, 5, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2023, 1, 15, 10, 0)), Optional.of(LocalDateTime.of(2023, 1, 12, 10, 0))), - List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(PROCESSED)), LocalDateTime.of(2023, 1, 10, 10, 0) ), Arguments.of( @@ -171,7 +172,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { List.of(Optional.of(OrderStatus.TO_BE_REVIEWED)), List.of(Optional.of(LocalDateTime.of(2023, 2, 22, 10, 0)), Optional.of(LocalDateTime.of(2023, 2, 21, 10, 0))), - List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(PROCESSED)), LocalDateTime.of(2023, 2, 20, 10, 0) ), Arguments.of( @@ -185,10 +186,10 @@ static Stream provideMultipleReviewsWithStatusTestCases() { Arguments.of( List.of(Optional.of(LocalDateTime.of(2023, 4, 1, 10, 0)), Optional.of(LocalDateTime.of(2023, 4, 3, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2023, 4, 2, 10, 0)), Optional.of(LocalDateTime.of(2023, 4, 4, 10, 0))), - List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(PROCESSED)), LocalDateTime.of(2023, 4, 1, 10, 0) ), Arguments.of( @@ -196,7 +197,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { List.of(Optional.empty()), // No statuses List.of(Optional.of(LocalDateTime.of(2023, 5, 5, 10, 0)), Optional.of(LocalDateTime.of(2023, 5, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), LocalDateTime.of(2023, 5, 5, 10, 0) ), Arguments.of( @@ -204,7 +205,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { List.of(Optional.empty()), // No statuses List.of(Optional.of(LocalDateTime.of(2023, 5, 5, 10, 0)), Optional.of(LocalDateTime.of(2023, 5, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), LocalDateTime.of(2023, 5, 5, 10, 0) ), Arguments.of( diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java index d0de4a9d40..3fd52f3aae 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/DraftOrderServiceTest.java @@ -68,6 +68,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.ORDER_TYPE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.PSA_TYPE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.DraftOrdersConstants.UPLOAD_PARTY_APPLICANT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; @ExtendWith(MockitoExtension.class) class DraftOrderServiceTest { @@ -994,7 +995,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { return Stream.of( Arguments.of( List.of(Optional.of(LocalDateTime.of(2024, 5, 10, 10, 0)), Optional.of(LocalDateTime.of(2024, 6, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2024, 3, 15, 10, 0)), Optional.of(LocalDateTime.of(2024, 4, 20, 10, 0))), List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.APPROVED_BY_JUDGE)), List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 4, 19, 10, 0))), // Notification dates @@ -1003,7 +1004,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { ), Arguments.of( List.of(Optional.of(LocalDateTime.of(2024, 10, 18, 10, 0)), Optional.of(LocalDateTime.of(2024, 6, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2024, 10, 18, 10, 0)), Optional.of(LocalDateTime.of(2024, 4, 20, 10, 0))), List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.APPROVED_BY_JUDGE)), List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 4, 19, 10, 0))), // Notification dates @@ -1012,9 +1013,9 @@ static Stream provideMultipleReviewsWithStatusTestCases() { ), Arguments.of( List.of(Optional.of(LocalDateTime.of(2024, 1, 10, 10, 0)), Optional.of(LocalDateTime.of(2024, 1, 5, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2024, 1, 15, 10, 0)), Optional.of(LocalDateTime.of(2024, 1, 12, 10, 0))), - List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(PROCESSED)), List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 1, 4, 10, 0))), // Notification dates List.of(Optional.empty(), Optional.empty()), // Notification dates 1, 1 @@ -1023,7 +1024,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { List.of(Optional.of(LocalDateTime.of(2024, 2, 20, 10, 0))), List.of(Optional.of(OrderStatus.TO_BE_REVIEWED)), List.of(Optional.of(LocalDateTime.of(2024, 2, 22, 10, 0)), Optional.of(LocalDateTime.of(2024, 2, 21, 10, 0))), - List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(PROCESSED)), List.of(Optional.empty()), // Notification dates List.of(Optional.of(LocalDateTime.of(2024, 2, 22, 10, 0)), Optional.of(LocalDateTime.of(2024, 2, 21, 10, 0))), // Notification dates 1, 1 @@ -1039,9 +1040,9 @@ static Stream provideMultipleReviewsWithStatusTestCases() { ), Arguments.of( List.of(Optional.of(LocalDateTime.of(2024, 4, 1, 10, 0)), Optional.of(LocalDateTime.of(2024, 4, 3, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.of(LocalDateTime.of(2024, 4, 2, 10, 0)), Optional.of(LocalDateTime.of(2024, 4, 4, 10, 0))), - List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.APPROVED_BY_JUDGE), Optional.of(PROCESSED)), List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 4, 3, 10, 0))), // Notification dates List.of(Optional.of(LocalDateTime.of(2024, 4, 2, 10, 0)), Optional.empty()), // Notification dates 1, 1 @@ -1050,7 +1051,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { List.of(Optional.empty()), // Empty DraftOrderDocumentReview List.of(Optional.empty()), // No statuses List.of(Optional.of(LocalDateTime.of(2024, 5, 5, 10, 0)), Optional.of(LocalDateTime.of(2024, 5, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 5, 1, 10, 0))), // Notification dates List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 5, 2, 10, 0))), // Notification dates 1, 2 @@ -1059,7 +1060,7 @@ static Stream provideMultipleReviewsWithStatusTestCases() { List.of(Optional.empty()), // Empty DraftOrderDocumentReview List.of(Optional.empty()), // No statuses List.of(Optional.of(LocalDateTime.of(2024, 5, 5, 10, 0)), Optional.of(LocalDateTime.of(2024, 5, 1, 10, 0))), - List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(OrderStatus.PROCESSED_BY_ADMIN)), + List.of(Optional.of(OrderStatus.TO_BE_REVIEWED), Optional.of(PROCESSED)), List.of(Optional.empty(), Optional.of(LocalDateTime.of(2024, 5, 1, 10, 0))), // Notification dates List.of(Optional.of(LocalDateTime.of(2024, 5, 2, 10, 0)), Optional.of(LocalDateTime.of(2024, 5, 2, 10, 0))), // Notification dates 0, 0 @@ -1203,7 +1204,7 @@ private DraftOrdersReview createDraftOrdersReview() { createDraftOrder(OrderStatus.TO_BE_REVIEWED, LocalDate.of(2024, 9, 1), null), createDraftOrder(OrderStatus.TO_BE_REVIEWED, LocalDate.of(2024, 11, 1), null), createDraftOrder(OrderStatus.APPROVED_BY_JUDGE, LocalDate.of(2024, 9, 1), null), - createDraftOrder(OrderStatus.PROCESSED_BY_ADMIN, LocalDate.of(2024, 9, 1), null) + createDraftOrder(PROCESSED, LocalDate.of(2024, 9, 1), null) )) .psaDocReviewCollection(List.of( createPsa(OrderStatus.TO_BE_REVIEWED, LocalDate.of(2024, 9, 1), @@ -1211,7 +1212,7 @@ private DraftOrdersReview createDraftOrdersReview() { createPsa(OrderStatus.TO_BE_REVIEWED, LocalDate.of(2024, 9, 1), null), createPsa(OrderStatus.TO_BE_REVIEWED, LocalDate.of(2024, 11, 1), null), createPsa(OrderStatus.APPROVED_BY_JUDGE, LocalDate.of(2024, 9, 1), null), - createPsa(OrderStatus.PROCESSED_BY_ADMIN, LocalDate.of(2024, 9, 1), null) + createPsa(PROCESSED, LocalDate.of(2024, 9, 1), null) )) .build(); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java index d547962e1d..2325b8c3fc 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; @@ -129,4 +130,28 @@ void shouldFilterAndCollectPsaDocs() { assertEquals(psaDocument1, collector.get(0).getValue().getPsaDocument()); assertEquals(psaDocument3, collector.get(1).getValue().getPsaDocument()); } + + @Test + void shouldCollectAgreedDraftOrder() { + List collector = new ArrayList<>(); + + CaseDocument psaDocument1 = CaseDocument.builder().documentUrl("psa1.doc").build(); + CaseDocument draftOrderDocument1 = CaseDocument.builder().documentUrl("draftOrder1.doc").build(); + + List sample = List.of( + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().orderStatus(PROCESSED).build()) + .build(), + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().orderStatus(APPROVED_BY_JUDGE).build()) + .build(), + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(psaDocument1).orderStatus(REFUSED).build()) + .build(), + AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(draftOrderDocument1).orderStatus(REFUSED).build()) + .build() + ); + underTest.collectAgreedDraftOrders(sample, collector, REFUSED::equals); + + assertThat(collector).hasSize(2); + assertEquals(psaDocument1, collector.get(0).getValue().getTargetDocument()); + assertEquals(draftOrderDocument1, collector.get(1).getValue().getTargetDocument()); + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java index eb088198da..0a578ba049 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/judgeapproval/JudgeApprovalResolverTest.java @@ -194,7 +194,7 @@ void shouldPopulateJudgeDecisionForApprovedDocuments(DraftOrdersWrapper draftOrd assertNull(approvable.getFinalOrder()); } if (expectedAmendedDocument != null) { - assertEquals(expectedAmendedDocument, approvable.getReplacedDocument()); + assertEquals(expectedAmendedDocument, approvable.getTargetDocument()); } approvedDocument = true; } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java new file mode 100644 index 0000000000..5ddeacca3c --- /dev/null +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java @@ -0,0 +1,366 @@ +package uk.gov.hmcts.reform.finrem.caseorchestration.service.processorders; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.InjectMocks; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo.NO; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; + +@ExtendWith(MockitoExtension.class) +class ProcessOrderServiceTest { + + @Spy + private HasApprovableCollectionReader hasApprovableCollectionReader = new HasApprovableCollectionReader(); + + @InjectMocks + private ProcessOrderService underTest; + + @SuppressWarnings("unchecked") + @Test + void testPopulateUnprocessedApprovedDocuments() { + // Prepare mock objects + FinremCaseData caseData = mock(FinremCaseData.class); + DraftOrdersWrapper draftOrdersWrapper = mock(DraftOrdersWrapper.class); + CaseDocument doc1 = createCaseDocument("http://doc1.pdf"); + CaseDocument doc2 = createCaseDocument("http://doc2.pdf"); + CaseDocument doc3 = createCaseDocument("http://doc3.pdf"); + CaseDocument doc4 = createCaseDocument("http://doc4.pdf"); + + List draftOrderDocs = List.of( + createDraftOrderDocReview(APPROVED_BY_JUDGE, doc1, LocalDateTime.of(2024, 1, 1, 12, 0, 0)), + createDraftOrderDocReview(TO_BE_REVIEWED, doc2, LocalDateTime.of(2024, 1, 2, 12, 0, 0)) + ); + + List psaDocs = List.of( + createPsaDocReview(APPROVED_BY_JUDGE, doc3, LocalDateTime.of(2024, 1, 3, 12, 0, 0)), + createPsaDocReview(TO_BE_REVIEWED, doc4, LocalDateTime.of(2024, 1, 4, 12, 0, 0)) + ); + + // Mock behaviour of the reader + List draftOrdersReviewCollections = List.of( + DraftOrdersReviewCollection.builder().value(DraftOrdersReview.builder() + .draftOrderDocReviewCollection(draftOrderDocs) + .psaDocReviewCollection(psaDocs).build()).build() + ); + when(draftOrdersWrapper.getDraftOrdersReviewCollection()).thenReturn(draftOrdersReviewCollections); + when(caseData.getDraftOrdersWrapper()).thenReturn(draftOrdersWrapper); + doAnswer(invocation -> { + ((List) invocation.getArgument(1)).add(draftOrderDocs.get(0)); // Collect only the approved document + return null; + }).when(hasApprovableCollectionReader) + .filterAndCollectDraftOrderDocs(eq(draftOrdersReviewCollections), anyList(), any()); + doAnswer(invocation -> { + ((List) invocation.getArgument(1)).add(psaDocs.get(0)); // Collect only the approved document + return null; + }).when(hasApprovableCollectionReader) + .filterAndCollectPsaDocs(eq(draftOrdersReviewCollections), anyList(), any()); + + // Execute the method + underTest.populateUnprocessedApprovedDocuments(caseData); + + // Verify the result + verify(draftOrdersWrapper).setUnprocessedApprovedDocuments(argThat(result -> { + assertEquals(2, result.size()); + + DirectionOrder firstDirectionOrder = result.get(0).getValue(); + assertEquals("http://doc1.pdf", firstDirectionOrder.getOriginalDocument().getDocumentUrl()); + assertEquals(LocalDateTime.of(2024, 1, 1, 12, 0, 0), firstDirectionOrder.getOrderDateTime()); + assertEquals(NO, firstDirectionOrder.getIsOrderStamped()); + assertEquals(doc1, firstDirectionOrder.getUploadDraftDocument()); + assertEquals(firstDirectionOrder.getOriginalDocument(), firstDirectionOrder.getUploadDraftDocument()); + + DirectionOrder secondDirectionOrder = result.get(1).getValue(); + assertEquals("http://doc3.pdf", secondDirectionOrder.getOriginalDocument().getDocumentUrl()); + assertEquals(LocalDateTime.of(2024, 1, 3, 12, 0, 0), secondDirectionOrder.getOrderDateTime()); + assertEquals(NO, secondDirectionOrder.getIsOrderStamped()); + assertEquals(doc3, secondDirectionOrder.getUploadDraftDocument()); + assertEquals(secondDirectionOrder.getOriginalDocument(), secondDirectionOrder.getUploadDraftDocument()); + + return true; + })); + } + + @ParameterizedTest + @MethodSource("provideIsAllLegacyApprovedOrdersRemovedTestCases") + void testIsAllLegacyApprovedOrdersRemoved(FinremCaseData caseDataBefore, FinremCaseData caseData, boolean expectedResult) { + boolean result = underTest.areAllLegacyApprovedOrdersRemoved(caseDataBefore, caseData); + assertEquals(expectedResult, result); + } + + private static Stream provideIsAllLegacyApprovedOrdersRemovedTestCases() { + final FinremCaseData caseDataBeforeWithOrders = new FinremCaseData(); + final FinremCaseData caseDataWithOrders = new FinremCaseData(); + final FinremCaseData emptyCaseDataBefore = new FinremCaseData(); + final FinremCaseData emptyCaseData = new FinremCaseData(); + + caseDataBeforeWithOrders.setUploadHearingOrder(List.of(DirectionOrderCollection.builder().build())); + caseDataWithOrders.setUploadHearingOrder(List.of(DirectionOrderCollection.builder().build())); + emptyCaseDataBefore.setUploadHearingOrder(List.of()); + emptyCaseData.setUploadHearingOrder(List.of()); + + return Stream.of( + // Legacy approved orders removed + Arguments.of(caseDataBeforeWithOrders, emptyCaseData, true), + + // No legacy approved orders to remove + Arguments.of(emptyCaseDataBefore, emptyCaseData, false), + + // Legacy approved orders still exist + Arguments.of(caseDataBeforeWithOrders, caseDataWithOrders, false), + + // Legacy approved orders already removed + Arguments.of(emptyCaseDataBefore, caseDataWithOrders, false) + ); + } + + @ParameterizedTest + @MethodSource("provideAreAllNewUploadedOrdersPdfDocumentsPresentTestCases") + void testAreAllNewUploadedOrdersPdfDocumentsPresent(FinremCaseData caseDataBefore, FinremCaseData caseData, boolean expectedResult) { + boolean result = underTest.areAllNewOrdersPdfFiles(caseDataBefore, caseData); + assertEquals(expectedResult, result); + } + + private static Stream provideAreAllNewUploadedOrdersPdfDocumentsPresentTestCases() { + DirectionOrderCollection existingWordOrder = createDirectionOrder("http://example.com/document1.DOCX", true); + DirectionOrderCollection legacyExistingPdfOrder = createDirectionOrder("http://example.com/document1.pdf"); + + DirectionOrderCollection newPdfOrder1 = createDirectionOrder("http://example.com/document2.PDF"); + DirectionOrderCollection newPdfOrder2 = createDirectionOrder("http://example.com/document3.pdf"); + DirectionOrderCollection newWordOrder2 = createDirectionOrder("http://example.com/document4.doc"); + DirectionOrderCollection newWordOrder3 = createDirectionOrder("http://example.com/document5.docx"); + + return Stream.of( + // Valid Cases: + // 1. All new documents are valid PDFs + Arguments.of(createCaseData(List.of(existingWordOrder), false), + createCaseData(List.of(existingWordOrder, newPdfOrder1, newPdfOrder2), false), true), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), true), + createCaseData(List.of(legacyExistingPdfOrder, newPdfOrder1, newPdfOrder2), true), true), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), List.of(existingWordOrder)), + createCaseData(List.of(legacyExistingPdfOrder), List.of(existingWordOrder, newPdfOrder1, newPdfOrder2)), true), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), List.of(existingWordOrder)), + createCaseData(List.of(legacyExistingPdfOrder, newPdfOrder2), List.of(existingWordOrder, newPdfOrder1)), true), + // 2. No new documents + Arguments.of(createCaseData(List.of(existingWordOrder), false), createCaseData(List.of(existingWordOrder), false), true), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), true), createCaseData(List.of(legacyExistingPdfOrder), true), true), + + // Invalid cases: + // New document(s) is/are not a PDF document + Arguments.of(createCaseData(List.of(existingWordOrder), false), + createCaseData(List.of(existingWordOrder, newWordOrder2), false), false), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), true), + createCaseData(List.of(legacyExistingPdfOrder, newWordOrder2), true), false), + Arguments.of(createCaseData(List.of(existingWordOrder), false), + createCaseData(List.of(existingWordOrder, newWordOrder3), false), false), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), true), + createCaseData(List.of(legacyExistingPdfOrder, newWordOrder3), true), false), + Arguments.of(createCaseData(List.of(existingWordOrder), false), + createCaseData(List.of(existingWordOrder, newWordOrder2, newWordOrder3), false), false), + Arguments.of(createCaseData(List.of(legacyExistingPdfOrder), true), + createCaseData(List.of(legacyExistingPdfOrder, newWordOrder2, newWordOrder3), true), false) + ); + } + + private static Stream provideAreAllLegacyApprovedOrdersPdfData() { + return Stream.of( + Arguments.of( + List.of( + createDirectionOrder("http://example.xyz/document.pdf"), + createDirectionOrder("http://example.xyz/document.pdf", "http://example.xyz/document_new.pdf") + ), true + ), + Arguments.of( + List.of( + createDirectionOrder("http://example.xyz/document.docx") + ), false + ), + Arguments.of( + List.of( + createDirectionOrder("http://example.xyz/documentX.pdf", "http://example.xyz/document.doc") + ), false + ) + ); + } + + @ParameterizedTest + @MethodSource("provideAreAllLegacyApprovedOrdersPdfData") + void testAreAllLegacyApprovedOrdersPdf(List uploadHearingOrder, boolean expectedTrue) { + // Mocking the unprocessed approved documents + FinremCaseData caseData = mock(FinremCaseData.class); + + // Set up the mock data based on expectedResult + when(caseData.getUploadHearingOrder()).thenReturn(uploadHearingOrder); + + // Call the method to test + boolean result = underTest.areAllLegacyApprovedOrdersPdf(caseData); + + // Assert the expected result + if (expectedTrue) { + assertTrue(result, "Expected all documents to have .pdf extensions"); + } else { + assertFalse(result, "Expected not all documents to have .pdf extensions, but the method returned true."); + } + } + + private static Stream provideAreAllModifyingUnprocessedOrdersWordDocumentsTestCases() { + return Stream.of( + Arguments.of( + List.of( + createDirectionOrder("http://example.xyz/document.docx"), + createDirectionOrder("http://example.xyz/document.docx", true), + createDirectionOrder("http://example.xyz/document.docx", "http://example.xyz/document.doc") + ), true + ), + Arguments.of( + List.of( + createDirectionOrder("http://example.xyz/document.pdf") + ), true + ), + Arguments.of( + List.of( + createDirectionOrder("http://example.xyz/documentX.docx", "http://example.xyz/document.txt") + ), false + ) + ); + } + + @ParameterizedTest + @MethodSource("provideAreAllModifyingUnprocessedOrdersWordDocumentsTestCases") + void testAreAllModifyingUnprocessedOrdersWordDocuments(List unprocessedApprovedDocuments, boolean expectedTrue) { + // Mocking the unprocessed approved documents + DraftOrdersWrapper draftOrdersWrapper = mock(DraftOrdersWrapper.class); + FinremCaseData caseData = mock(FinremCaseData.class); + when(caseData.getDraftOrdersWrapper()).thenReturn(draftOrdersWrapper); + + // Set up the mock data based on expectedResult + when(draftOrdersWrapper.getUnprocessedApprovedDocuments()).thenReturn(unprocessedApprovedDocuments); + + + // Call the method to test + boolean result = underTest.areAllModifyingUnprocessedOrdersWordDocuments(caseData); + + // Assert the expected result + if (expectedTrue) { + assertTrue(result, "Expected all documents to have .doc or .docx extensions"); + } else { + assertFalse(result, "Expected not all documents to have .doc or .docx extensions, but the method returned true."); + } + } + + private static String extractFileName(String url) { + if (url == null || url.isEmpty()) { + return null; // or throw an exception if you prefer + } + + // Find the last '/' and extract the substring after it + int lastSlashIndex = url.lastIndexOf('/'); + if (lastSlashIndex != -1 && lastSlashIndex < url.length() - 1) { + return url.substring(lastSlashIndex + 1); + } + + return null; // No file name found + } + + private static DirectionOrderCollection createDirectionOrder(String documentUrl) { + return createDirectionOrder(documentUrl, false); + } + + private static DirectionOrderCollection createDirectionOrder(String documentUrl, boolean markOriginalDocument) { + return DirectionOrderCollection.builder() + .value(DirectionOrder.builder() + .uploadDraftDocument(CaseDocument.builder().documentUrl(documentUrl).documentFilename(extractFileName(documentUrl)).build()) + .originalDocument(markOriginalDocument + ? CaseDocument.builder().documentUrl(documentUrl).documentFilename(extractFileName(documentUrl)).build() : null) + .build()) + .build(); + } + + private static DirectionOrderCollection createDirectionOrder(String originalDocumentUrl, String newDocumentUrl) { + return DirectionOrderCollection.builder() + .value(DirectionOrder.builder() + .uploadDraftDocument(CaseDocument.builder() + .documentUrl(originalDocumentUrl) + .documentFilename(extractFileName(newDocumentUrl)) + .build()) + .originalDocument(CaseDocument.builder() + .documentUrl(originalDocumentUrl) + .documentFilename(extractFileName(originalDocumentUrl)) + .build()) + .build()) + .build(); + } + + private static FinremCaseData createCaseData(List legacyTarget, List target) { + return FinremCaseData.builder() + .uploadHearingOrder(legacyTarget) + .draftOrdersWrapper(DraftOrdersWrapper.builder().unprocessedApprovedDocuments(target).build()) + .build(); + } + + private static FinremCaseData createCaseData(List target, boolean legacy) { + return legacy ? FinremCaseData.builder().uploadHearingOrder(target).build() + : FinremCaseData.builder().draftOrdersWrapper(DraftOrdersWrapper.builder().unprocessedApprovedDocuments(target).build()).build(); + } + + // Helper methods to create mock objects + private DraftOrderDocReviewCollection createDraftOrderDocReview(OrderStatus approvalStatus, CaseDocument document, LocalDateTime approvalDate) { + DraftOrderDocReviewCollection collection = mock(DraftOrderDocReviewCollection.class); + DraftOrderDocumentReview value = mock(DraftOrderDocumentReview.class); + lenient().when(collection.getValue()).thenReturn(value); + lenient().when(value.getApprovalDate()).thenReturn(approvalDate); + lenient().when(value.getTargetDocument()).thenReturn(document); + lenient().when(value.getOrderStatus()).thenReturn(approvalStatus); + return collection; + } + + private PsaDocReviewCollection createPsaDocReview(OrderStatus approvalStatus, CaseDocument document, LocalDateTime approvalDate) { + PsaDocReviewCollection collection = mock(PsaDocReviewCollection.class); + PsaDocumentReview value = mock(PsaDocumentReview.class); + lenient().when(collection.getValue()).thenReturn(value); + lenient().when(value.getApprovalDate()).thenReturn(approvalDate); + lenient().when(value.getTargetDocument()).thenReturn(document); + lenient().when(value.getOrderStatus()).thenReturn(approvalStatus); + return collection; + } + + private CaseDocument createCaseDocument(String documentUrl) { + return CaseDocument.builder().documentFilename(extractFileName(documentUrl)).documentUrl(documentUrl).build(); + } +} From 25e8a77b9f67f79cd3c1608cc2b806b728d504da Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 3 Jan 2025 15:20:47 +0000 Subject: [PATCH 312/336] Refactoring --- ...ectionUploadOrderAboutToStartHandler.java} | 14 +- ...ectionUploadOrderAboutToSubmitHandler.java | 121 +++++- .../DirectionUploadOrderMidHandler.java | 47 ++- .../DirectionUploadOrderSubmittedHandler.java | 3 +- .../ProcessOrdersAboutToSubmitHandler.java | 166 -------- .../ProcessOrdersMidHandler.java | 79 ---- .../caseorchestration/model/EventType.java | 1 - ...onUploadOrderAboutToStartHandlerTest.java} | 11 +- ...onUploadOrderAboutToSubmitHandlerTest.java | 305 ++++++++++++++- .../DirectionUploadOrderMidHandlerTest.java | 122 +++++- ...ectionUploadOrderSubmittedHandlerTest.java | 5 +- ...ProcessOrdersAboutToSubmitHandlerTest.java | 364 ------------------ .../ProcessOrdersMidHandlerTest.java | 132 ------- 13 files changed, 573 insertions(+), 797 deletions(-) rename src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/{processorders/ProcessOrdersAboutToStartHandler.java => DirectionUploadOrderAboutToStartHandler.java} (83%) delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java rename src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/{processorders/ProcessOrdersAboutToStartHandlerTest.java => DirectionUploadOrderAboutToStartHandlerTest.java} (94%) delete mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java delete mode 100644 src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java similarity index 83% rename from src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java rename to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java index 06e9f084b8..75bb7a5b87 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java @@ -1,12 +1,10 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; +package uk.gov.hmcts.reform.finrem.caseorchestration.handler; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; 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.handler.FinremCallbackHandler; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; @@ -20,24 +18,24 @@ import static java.util.Optional.ofNullable; import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_START; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; @Slf4j @Service -public class ProcessOrdersAboutToStartHandler extends FinremCallbackHandler { +public class DirectionUploadOrderAboutToStartHandler extends FinremCallbackHandler { private final ProcessOrderService processOrderService; - public ProcessOrdersAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, - ProcessOrderService processOrderService) { + public DirectionUploadOrderAboutToStartHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, + ProcessOrderService processOrderService) { super(finremCaseDetailsMapper); this.processOrderService = processOrderService; } @Override public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return ABOUT_TO_START.equals(callbackType) && CONTESTED.equals(caseType) && PROCESS_ORDER.equals(eventType); + return ABOUT_TO_START.equals(callbackType) && CONTESTED.equals(caseType) && DIRECTION_UPLOAD_ORDER.equals(eventType); } @Override diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index e10ed31e1a..589825d9df 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -8,24 +8,42 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.error.CourtDetailsParseException; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; 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.draftorders.HasApprovable; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import java.util.ArrayList; import java.util.List; +import static java.util.Optional.ofNullable; +import static java.util.function.Predicate.not; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; + @Slf4j @Service public class DirectionUploadOrderAboutToSubmitHandler extends FinremCallbackHandler { private final AdditionalHearingDocumentService service; + private final HasApprovableCollectionReader hasApprovableCollectionReader; + public DirectionUploadOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, - AdditionalHearingDocumentService service) { + AdditionalHearingDocumentService service, + HasApprovableCollectionReader hasApprovableCollectionReader) { super(finremCaseDetailsMapper); this.service = service; + this.hasApprovableCollectionReader = hasApprovableCollectionReader; } @Override @@ -43,6 +61,8 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem log.info("Invoking contested event {} mid callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData caseData = caseDetails.getData(); + handleNewDocument(caseData); + List errors = new ArrayList<>(); log.info("Storing Additional Hearing Document for Case ID: {}", caseId); try { @@ -52,7 +72,106 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem errors.add(e.getMessage()); } + handleDraftOrderDocuments(caseData); + handlePsaDocuments(caseData); + handleAgreedDraftOrdersCollection(caseData); + clearTemporaryFields(caseData); + return GenericAboutToStartOrSubmitCallbackResponse.builder() .data(caseData).errors(errors).build(); } + + private List nullSafeUnprocessedApprovedDocuments(FinremCaseData caseData) { + return ofNullable(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).orElse(List.of()); + } + + private void handleNewDocument(FinremCaseData caseData) { + nullSafeUnprocessedApprovedDocuments(caseData).forEach(unprocessedApprovedOrder -> { + if (isNewDocument(unprocessedApprovedOrder)) { + insertNewDocumentToUploadHearingOrder(caseData, unprocessedApprovedOrder); + } + }); + } + + private void handleDraftOrderDocuments(FinremCaseData caseData) { + List collector = new ArrayList<>(); + hasApprovableCollectionReader.filterAndCollectDraftOrderDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), + collector, APPROVED_BY_JUDGE::equals); + + nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + .forEach(unprocessedApprovedOrder -> + collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { + toBeUpdated.getValue().setOrderStatus(PROCESSED); + toBeUpdated.getValue().setDraftOrderDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + })); + } + + private void handlePsaDocuments(FinremCaseData caseData) { + List psaCollector = new ArrayList<>(); + hasApprovableCollectionReader.filterAndCollectPsaDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), + psaCollector, APPROVED_BY_JUDGE::equals); + + nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + .forEach(unprocessedApprovedOrder -> + psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { + toBeUpdated.getValue().setOrderStatus(PROCESSED); + toBeUpdated.getValue().setPsaDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + })); + } + + private void handleAgreedDraftOrdersCollection(FinremCaseData caseData) { + List agreedOrderCollector = new ArrayList<>(); + hasApprovableCollectionReader.collectAgreedDraftOrders(caseData.getDraftOrdersWrapper().getAgreedDraftOrderCollection(), + agreedOrderCollector, APPROVED_BY_JUDGE::equals); + + nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + .forEach(unprocessedApprovedOrder -> + agreedOrderCollector.stream().filter(agreedDraftOrder -> doesDocumentMatch(agreedDraftOrder, unprocessedApprovedOrder)) + .forEach(toBeUpdated -> { + toBeUpdated.getValue().setOrderStatus(PROCESSED); + // replace the document by the new uploaded approved document + if (toBeUpdated.getValue().getPensionSharingAnnex() != null) { + toBeUpdated.getValue().setPensionSharingAnnex(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + } else if (toBeUpdated.getValue().getDraftOrder() != null) { + toBeUpdated.getValue().setDraftOrder(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + } + })); + } + + private void insertNewDocumentToUploadHearingOrder(FinremCaseData caseData, DirectionOrderCollection unprocessedApprovedOrder) { + if (caseData.getUploadHearingOrder() == null) { + caseData.setUploadHearingOrder(new ArrayList<>()); + } + caseData.getUploadHearingOrder().add(DirectionOrderCollection.builder() + .value(DirectionOrder.builder() + .uploadDraftDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()) + .build()) + .build()); + } + + private void clearTemporaryFields(FinremCaseData caseData) { + clearUnprocessedApprovedDocuments(caseData.getDraftOrdersWrapper()); + clearMetaDataFields(caseData); + } + + private void clearUnprocessedApprovedDocuments(DraftOrdersWrapper draftOrdersWrapper) { + draftOrdersWrapper.setUnprocessedApprovedDocuments(List.of()); + } + + private void clearMetaDataFields(FinremCaseData caseData) { + caseData.getDraftOrdersWrapper().setIsLegacyApprovedOrderPresent(null); + caseData.getDraftOrdersWrapper().setIsUnprocessedApprovedDocumentPresent(null); + } + + private boolean doesDocumentMatch(HasApprovable hasApprovable, DirectionOrderCollection unprocessedApprovedOrder) { + return doesDocumentMatch(hasApprovable.getValue().getTargetDocument(), unprocessedApprovedOrder.getValue().getOriginalDocument()); + } + + private boolean doesDocumentMatch(CaseDocument doc1, CaseDocument doc2) { + return doc1.getDocumentUrl().equals(doc2.getDocumentUrl()); + } + + private boolean isNewDocument(DirectionOrderCollection unprocessedApprovedOrder) { + return unprocessedApprovedOrder.getValue().getOriginalDocument() == null; + } } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java index 462cd7d5f2..de6b72cf6b 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandler.java @@ -7,25 +7,33 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetail; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetailCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DocumentCollection; 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.service.BulkPrintDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.util.ArrayList; import java.util.List; +import static java.util.Optional.ofNullable; + @Slf4j @Service public class DirectionUploadOrderMidHandler extends FinremCallbackHandler { - private final BulkPrintDocumentService service; + private final BulkPrintDocumentService bulkPrintDocumentService; + + private final ProcessOrderService processOrderService; public DirectionUploadOrderMidHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, - BulkPrintDocumentService service) { + BulkPrintDocumentService bulkPrintDocumentService, ProcessOrderService processOrderService) { super(finremCaseDetailsMapper); - this.service = service; + this.bulkPrintDocumentService = bulkPrintDocumentService; + this.processOrderService = processOrderService; } @Override @@ -48,6 +56,11 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem FinremCaseDetails caseDetailsBefore = callbackRequest.getCaseDetailsBefore(); FinremCaseData caseDataBefore = caseDetailsBefore.getData(); + if (processOrderService.areAllLegacyApprovedOrdersRemoved(caseDataBefore, caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("Upload Approved Order is required.")).build(); + } + List uploadHearingOrders = caseData.getUploadHearingOrder(); if (uploadHearingOrders != null) { List uploadHearingOrdersBefore = caseDataBefore.getUploadHearingOrder(); @@ -55,7 +68,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem uploadHearingOrders.removeAll(uploadHearingOrdersBefore); } uploadHearingOrders.forEach(doc -> - service.validateEncryptionOnUploadedDocument(doc.getValue().getUploadDraftDocument(), + bulkPrintDocumentService.validateEncryptionOnUploadedDocument(doc.getValue().getUploadDraftDocument(), caseId, errors, userAuthorisation) ); } @@ -66,11 +79,35 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem hearingOrderOtherDocuments.removeAll(hearingOrderOtherDocumentsBefore); } hearingOrderOtherDocuments.forEach(doc -> - service.validateEncryptionOnUploadedDocument(doc.getValue(), + bulkPrintDocumentService.validateEncryptionOnUploadedDocument(doc.getValue(), caseId, errors, userAuthorisation) ); } + processOrderService.populateUnprocessedApprovedDocuments(caseDataBefore); + if (!processOrderService.areAllNewOrdersPdfFiles(caseDataBefore, caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("You must upload a PDF file for new documents.")).build(); + } + // Validate the modifying legacy approved orders + if (!processOrderService.areAllLegacyApprovedOrdersPdf(caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("You must upload a PDF file for modifying legacy approved documents.")).build(); + } + // Validate the modifying unprocessed approved orders are word documents + if (!processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(caseData)) { + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("You must upload a Microsoft Word file for modifying an unprocessed approved documents.")) + .build(); + } + + // Create an empty entry if it is empty to save a click on add new button + if (ofNullable(caseData.getDirectionDetailsCollection()).orElse(List.of()).isEmpty()) { + caseData.setDirectionDetailsCollection(List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + )); + } + return GenericAboutToStartOrSubmitCallbackResponse.builder() .data(caseData).errors(errors).build(); } diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java index 8424536cb1..5b0532feb2 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java @@ -18,7 +18,6 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.SUBMITTED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; @Slf4j @@ -38,7 +37,7 @@ public DirectionUploadOrderSubmittedHandler(FinremCaseDetailsMapper finremCaseDe @Override public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { return SUBMITTED.equals(callbackType) && CONTESTED.equals(caseType) - && List.of(DIRECTION_UPLOAD_ORDER, PROCESS_ORDER).contains(eventType); + && List.of(DIRECTION_UPLOAD_ORDER, DIRECTION_UPLOAD_ORDER).contains(eventType); } @Override diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java deleted file mode 100644 index 37e9dbee2a..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandler.java +++ /dev/null @@ -1,166 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -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.handler.DirectionUploadOrderAboutToSubmitHandler; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.HasApprovable; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; - -import java.util.ArrayList; -import java.util.List; - -import static java.util.Optional.ofNullable; -import static java.util.function.Predicate.not; -import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; - -@Slf4j -@Service -public class ProcessOrdersAboutToSubmitHandler extends DirectionUploadOrderAboutToSubmitHandler { - - private final HasApprovableCollectionReader hasApprovableCollectionReader; - - public ProcessOrdersAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, - AdditionalHearingDocumentService service, - HasApprovableCollectionReader hasApprovableCollectionReader) { - super(finremCaseDetailsMapper, service); - this.hasApprovableCollectionReader = hasApprovableCollectionReader; - } - - @Override - public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return ABOUT_TO_SUBMIT.equals(callbackType) && CONTESTED.equals(caseType) && PROCESS_ORDER.equals(eventType); - } - - @Override - public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, - String userAuthorisation) { - FinremCaseData caseData = callbackRequest.getCaseDetails().getData(); - // handleNewDocument is required to be done before calling super method which stamps the uploading document. - handleNewDocument(caseData); - GenericAboutToStartOrSubmitCallbackResponse resp = super.handle(callbackRequest, userAuthorisation); - caseData = resp.getData(); - - handleDraftOrderDocuments(caseData); - handlePsaDocuments(caseData); - handleAgreedDraftOrdersCollection(caseData); - clearTemporaryFields(caseData); - - return resp; - } - - private List nullSafeUnprocessedApprovedDocuments(FinremCaseData caseData) { - return ofNullable(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).orElse(List.of()); - } - - void handleNewDocument(FinremCaseData caseData) { - nullSafeUnprocessedApprovedDocuments(caseData).forEach(unprocessedApprovedOrder -> { - if (isNewDocument(unprocessedApprovedOrder)) { - insertNewDocumentToUploadHearingOrder(caseData, unprocessedApprovedOrder); - } - }); - } - - private void handleDraftOrderDocuments(FinremCaseData caseData) { - List collector = new ArrayList<>(); - hasApprovableCollectionReader.filterAndCollectDraftOrderDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), - collector, APPROVED_BY_JUDGE::equals); - - nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) - .forEach(unprocessedApprovedOrder -> - collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { - toBeUpdated.getValue().setOrderStatus(PROCESSED); - toBeUpdated.getValue().setDraftOrderDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); - }) - ); - } - - private void handlePsaDocuments(FinremCaseData caseData) { - List psaCollector = new ArrayList<>(); - hasApprovableCollectionReader.filterAndCollectPsaDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), - psaCollector, APPROVED_BY_JUDGE::equals); - - nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) - .forEach(unprocessedApprovedOrder -> - psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { - toBeUpdated.getValue().setOrderStatus(PROCESSED); - toBeUpdated.getValue().setPsaDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); - }) - ); - } - - private void handleAgreedDraftOrdersCollection(FinremCaseData caseData) { - List agreedOrderCollector = new ArrayList<>(); - hasApprovableCollectionReader.collectAgreedDraftOrders(caseData.getDraftOrdersWrapper().getAgreedDraftOrderCollection(), - agreedOrderCollector, APPROVED_BY_JUDGE::equals); - - nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) - .forEach(unprocessedApprovedOrder -> - agreedOrderCollector.stream().filter(agreedDraftOrder -> doesDocumentMatch(agreedDraftOrder, unprocessedApprovedOrder)) - .forEach(toBeUpdated -> { - toBeUpdated.getValue().setOrderStatus(PROCESSED); - // replace the document by the new uploaded approved document - if (toBeUpdated.getValue().getPensionSharingAnnex() != null) { - toBeUpdated.getValue().setPensionSharingAnnex(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); - } else if (toBeUpdated.getValue().getDraftOrder() != null) { - toBeUpdated.getValue().setDraftOrder(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); - } - }) - ); - } - - private void insertNewDocumentToUploadHearingOrder(FinremCaseData caseData, DirectionOrderCollection unprocessedApprovedOrder) { - if (caseData.getUploadHearingOrder() == null) { - caseData.setUploadHearingOrder(new ArrayList<>()); - } - caseData.getUploadHearingOrder().add(DirectionOrderCollection.builder() - .value(DirectionOrder.builder() - .uploadDraftDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()) - .build()) - .build()); - } - - private void clearTemporaryFields(FinremCaseData caseData) { - clearUnprocessedApprovedDocuments(caseData.getDraftOrdersWrapper()); - clearMetaDataFields(caseData); - } - - private void clearUnprocessedApprovedDocuments(DraftOrdersWrapper draftOrdersWrapper) { - draftOrdersWrapper.setUnprocessedApprovedDocuments(List.of()); - } - - private void clearMetaDataFields(FinremCaseData caseData) { - caseData.getDraftOrdersWrapper().setIsLegacyApprovedOrderPresent(null); - caseData.getDraftOrdersWrapper().setIsUnprocessedApprovedDocumentPresent(null); - } - - private boolean doesDocumentMatch(HasApprovable hasApprovable, DirectionOrderCollection unprocessedApprovedOrder) { - return doesDocumentMatch(hasApprovable.getValue().getTargetDocument(), unprocessedApprovedOrder.getValue().getOriginalDocument()); - } - - private boolean doesDocumentMatch(CaseDocument doc1, CaseDocument doc2) { - return doc1.getDocumentUrl().equals(doc2.getDocumentUrl()); - } - - private boolean isNewDocument(DirectionOrderCollection unprocessedApprovedOrder) { - return unprocessedApprovedOrder.getValue().getOriginalDocument() == null; - } -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java deleted file mode 100644 index 1cf71b21d8..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandler.java +++ /dev/null @@ -1,79 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -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.handler.DirectionUploadOrderMidHandler; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetail; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetailCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.BulkPrintDocumentService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; - -import java.util.List; - -import static java.util.Optional.ofNullable; -import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.MID_EVENT; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; - -@Slf4j -@Service -public class ProcessOrdersMidHandler extends DirectionUploadOrderMidHandler { - - private final ProcessOrderService processOrderService; - - public ProcessOrdersMidHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, BulkPrintDocumentService service, - ProcessOrderService processOrderService) { - super(finremCaseDetailsMapper, service); - this.processOrderService = processOrderService; - } - - @Override - public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return MID_EVENT.equals(callbackType) && CONTESTED.equals(caseType) && PROCESS_ORDER.equals(eventType); - } - - @Override - public GenericAboutToStartOrSubmitCallbackResponse handle(FinremCallbackRequest callbackRequest, String userAuthorisation) { - FinremCaseData caseDataBefore = callbackRequest.getCaseDetailsBefore().getData(); - FinremCaseData caseData = callbackRequest.getCaseDetails().getData(); - - processOrderService.populateUnprocessedApprovedDocuments(caseDataBefore); - - if (processOrderService.areAllLegacyApprovedOrdersRemoved(caseDataBefore, caseData)) { - return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(caseData).errors(List.of("Upload Approved Order is required.")).build(); - } - if (!processOrderService.areAllNewOrdersPdfFiles(caseDataBefore, caseData)) { - return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(caseData).errors(List.of("You must upload a PDF file for new documents.")).build(); - } - // Validate the modifying legacy approved orders - if (!processOrderService.areAllLegacyApprovedOrdersPdf(caseData)) { - return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(caseData).errors(List.of("You must upload a PDF file for modifying legacy approved documents.")).build(); - } - // Validate the modifying unprocessed approved orders are word documents - if (!processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(caseData)) { - return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(caseData).errors(List.of("You must upload a Microsoft Word file for modifying an unprocessed approved documents.")) - .build(); - } - - GenericAboutToStartOrSubmitCallbackResponse res = super.handle(callbackRequest, userAuthorisation); - - // Create an empty entry if it is empty to save a click on add new button - if (ofNullable(caseData.getDirectionDetailsCollection()).orElse(List.of()).isEmpty()) { - caseData.setDirectionDetailsCollection(List.of( - DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() - )); - } - return res; - } -} diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java index 9b3533de38..c99c727b63 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/EventType.java @@ -73,7 +73,6 @@ public enum EventType { SOLICITOR_CW_DRAFT_ORDER("FR_solicitorDraftDirectionOrder"), JUDGE_DRAFT_ORDER("FR_judgeDraftDirectionOrder"), DIRECTION_UPLOAD_ORDER("FR_directionOrder"), - PROCESS_ORDER("FR_directionOrderNew"), CONSENT_ORDER("FR_consentOrder"), ASSIGN_DOCUMENT_CATEGORIES("FR_assignDocumentCategories"), GIVE_ALLOCATION_DIRECTIONS("FR_giveAllocationDirections"), diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java similarity index 94% rename from src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java rename to src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java index 5cf93fd351..2c23def6ab 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java @@ -1,4 +1,4 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; +package uk.gov.hmcts.reform.finrem.caseorchestration.handler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -7,6 +7,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; +import uk.gov.hmcts.reform.finrem.caseorchestration.handler.DirectionUploadOrderAboutToStartHandler; import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; @@ -30,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_START; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; @@ -38,14 +39,14 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) -class ProcessOrdersAboutToStartHandlerTest { +class DirectionUploadOrderAboutToStartHandlerTest { private static final CaseDocument TARGET_DOCUMENT_1 = CaseDocument.builder().documentUrl("targetDoc1.docx").build(); private static final LocalDateTime APPROVAL_DATE = LocalDateTime.of(2024, 12, 24, 23, 0, 0); @InjectMocks - private ProcessOrdersAboutToStartHandler underTest; + private DirectionUploadOrderAboutToStartHandler underTest; @Spy private HasApprovableCollectionReader hasApprovableCollectionReader = new HasApprovableCollectionReader(); @@ -55,7 +56,7 @@ class ProcessOrdersAboutToStartHandlerTest { @Test void testCanHandle() { - assertCanHandle(underTest, ABOUT_TO_START, CONTESTED, PROCESS_ORDER); + assertCanHandle(underTest, ABOUT_TO_START, CONTESTED, DIRECTION_UPLOAD_ORDER); } @Test diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 1bd073e9ac..b19b1a87d8 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -3,66 +3,339 @@ import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; import uk.gov.hmcts.reform.finrem.caseorchestration.error.CourtDetailsParseException; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; 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.draftorders.agreed.AgreedDraftOrder; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) class DirectionUploadOrderAboutToSubmitHandlerTest { + private static final CaseDocument TARGET_DOCUMENT_1 = CaseDocument.builder().documentUrl("targetDoc1.docx").build(); + + private static final CaseDocument TARGET_DOCUMENT_2 = CaseDocument.builder().documentUrl("targetDoc2.docx").build(); + + private static final CaseDocument TARGET_DOCUMENT_3 = CaseDocument.builder().documentUrl("targetDoc3.docx").build(); + + private static final CaseDocument TARGET_DOCUMENT_4 = CaseDocument.builder().documentUrl("targetDoc4.docx").build(); + @InjectMocks - private DirectionUploadOrderAboutToSubmitHandler handler; + private DirectionUploadOrderAboutToSubmitHandler underTest; + + @Spy + private HasApprovableCollectionReader hasApprovableCollectionReader; @Mock private AdditionalHearingDocumentService service; @Test void testCanHandle() { - assertCanHandle(handler, CallbackType.ABOUT_TO_SUBMIT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER); + assertCanHandle(underTest, ABOUT_TO_SUBMIT, CONTESTED, DIRECTION_UPLOAD_ORDER); } @Test void createAndStoreAdditionalHearingDocumentsHandleException() throws JsonProcessingException { - FinremCallbackRequest finremCallbackRequest = buildCallbackRequest(); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.fromId(123L); FinremCaseDetails finremCaseDetails = finremCallbackRequest.getCaseDetails(); doThrow(new CourtDetailsParseException()).when(service) .createAndStoreAdditionalHearingDocuments(finremCaseDetails, AUTH_TOKEN); - GenericAboutToStartOrSubmitCallbackResponse res = handler.handle(finremCallbackRequest, AUTH_TOKEN); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); assertEquals(1, res.getErrors().size()); assertEquals("Failed to parse court details.", res.getErrors().get(0)); verify(service).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); } - @Test void createAndStoreAdditionalHearingDocuments() throws JsonProcessingException { - FinremCallbackRequest finremCallbackRequest = buildCallbackRequest(); - handler.handle(finremCallbackRequest, AUTH_TOKEN); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.fromId(123L); + underTest.handle(finremCallbackRequest, AUTH_TOKEN); verify(service).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); } - private FinremCallbackRequest buildCallbackRequest() { - return FinremCallbackRequest - .builder() - .eventType(EventType.DIRECTION_UPLOAD_ORDER) - .caseDetails(FinremCaseDetails.builder().id(123L).caseType(CONTESTED) - .data(new FinremCaseData()).build()) + @Test + void shouldHandleUploadHearingOrdersWithoutUnprocessedDraftDocuments() { + List uploadHearingOrder = new ArrayList<>(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .build()); + + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertThat(res.getData().getUploadHearingOrder()).hasSize(1); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrders(boolean nullExistingUploadHearingOrder) { + List uploadHearingOrder = nullExistingUploadHearingOrder ? null : new ArrayList<>(); + DirectionOrderCollection expectedNewDirectionOrderCollection = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), + expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() + )) + .build()) + .build()); + + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertThat(res.getData().getUploadHearingOrder()).hasSize(1); + assertThat(res.getData().getUploadHearingOrder().get(0)).isEqualTo(expectedNewDirectionOrderCollection); + } + + @Test + void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrdersWithExistingUploadHearingOrder() { + List uploadHearingOrder = new ArrayList<>(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )); + DirectionOrderCollection expectedNewDirectionOrderCollection = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(uploadHearingOrder) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), + expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() + )) + .build()) + .build()); + + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertThat(res.getData().getUploadHearingOrder()).hasSize(2); + assertThat(res.getData().getUploadHearingOrder().get(1)).isEqualTo(expectedNewDirectionOrderCollection); + } + + @Test + void shouldMarkDraftOrdersReviewCollectionProcessed() { + DraftOrderDocReviewCollection test1 = null; + DraftOrderDocReviewCollection test2 = null; + AgreedDraftOrderCollection test3 = null; + AgreedDraftOrderCollection test4 = null; + AgreedDraftOrderCollection test5 = null; + AgreedDraftOrderCollection test6 = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build() + )) + .agreedDraftOrderCollection(List.of( + test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_1) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_2) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test5 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_3) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test6 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_4) + .orderStatus(TO_BE_REVIEWED).build()).build() + )) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + test1 = buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), + buildDraftOrderDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .draftOrderDocReviewCollection(List.of( + buildDraftOrderDocReviewCollection(PROCESSED), + test2 = buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) + )) + .build()).build() + )) + .build()) + .build()); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); + assertEquals(TO_BE_REVIEWED, test6.getValue().getOrderStatus()); + } + + @Test + void shouldMarkPsaCollectionProcessed() { + PsaDocReviewCollection test1 = null; + PsaDocReviewCollection test2 = null; + AgreedDraftOrderCollection test3 = null; + AgreedDraftOrderCollection test4 = null; + AgreedDraftOrderCollection test5 = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder() + .originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder() + .originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build() + )) + .agreedDraftOrderCollection(List.of( + test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_1) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_2) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test5 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_3) + .orderStatus(APPROVED_BY_JUDGE).build()).build() + )) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + test1 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), + buildPsaDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PROCESSED), + test2 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) + )) + .build()).build() + )) + .build()) + .build()); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); + } + + @Test + void shouldReplaceApprovedDocumentAndMarkAsProcessed() { + PsaDocReviewCollection test1 = null; + PsaDocReviewCollection test2 = null; + AgreedDraftOrderCollection test3 = null; + AgreedDraftOrderCollection test4 = null; + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + )) + .agreedDraftOrderCollection(List.of( + test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_1) + .orderStatus(APPROVED_BY_JUDGE).build()).build(), + test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_2) + .orderStatus(APPROVED_BY_JUDGE).build()).build() + )) + .draftOrdersReviewCollection(List.of( + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + test1 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), + buildPsaDocReviewCollection(TO_BE_REVIEWED) + )) + .build()).build(), + DraftOrdersReviewCollection.builder().value( + DraftOrdersReview.builder() + .psaDocReviewCollection(List.of( + buildPsaDocReviewCollection(PROCESSED), + test2 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) + )) + .build()).build() + )) + .build()) + .build()); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + + assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(TARGET_DOCUMENT_3, test1.getValue().getPsaDocument()); + assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + assertEquals(TARGET_DOCUMENT_4, test2.getValue().getPsaDocument()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + } + + private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus) { + return buildDraftOrderDocReviewCollection(orderStatus, null); + } + + private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus, CaseDocument document) { + return DraftOrderDocReviewCollection.builder() + .value(DraftOrderDocumentReview.builder().draftOrderDocument(document).orderStatus(orderStatus).build()) + .build(); + } + + private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { + return buildPsaDocReviewCollection(orderStatus, null); + } + + private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus, CaseDocument document) { + return PsaDocReviewCollection.builder() + .value(PsaDocumentReview.builder().psaDocument(document).orderStatus(orderStatus).build()) .build(); } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java index 9a0be3ca1f..bf1a9230c8 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderMidHandlerTest.java @@ -1,55 +1,57 @@ package uk.gov.hmcts.reform.finrem.caseorchestration.handler; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.TestSetUpUtils; 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.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CfcCourt; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetail; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetailCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DocumentCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; import uk.gov.hmcts.reform.finrem.caseorchestration.service.BulkPrintDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) class DirectionUploadOrderMidHandlerTest extends BaseHandlerTestSetup { - private DirectionUploadOrderMidHandler handler; + @InjectMocks + private DirectionUploadOrderMidHandler underTest; @Mock private BulkPrintDocumentService service; + @Mock + private ProcessOrderService processOrderService; private static final String FILE_URL = "http://dm:80/documents/kbjh87y8y9JHVKKKJVJ"; private static final String FILE_BINARY_URL = "http://dm:80/documents/kbjh87y8y9JHVKKKJVJ/binary"; private static final String FILE_NAME = "abc.pdf"; - @BeforeEach - void setup() { - FinremCaseDetailsMapper finremCaseDetailsMapper = new FinremCaseDetailsMapper(new ObjectMapper().registerModule(new JavaTimeModule())); - handler = new DirectionUploadOrderMidHandler(finremCaseDetailsMapper, service); - } - @Test void testCanHandle() { - assertCanHandle(handler, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER); + assertCanHandle(underTest, CallbackType.MID_EVENT, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER); } @Test @@ -57,6 +59,7 @@ void givenContestedCase_whenDirectionUploadOrderButNonEncryptedFileShouldNotGetE FinremCallbackRequest finremCallbackRequest = buildCallbackRequest(EventType.DIRECTION_UPLOAD_ORDER); FinremCaseData caseData = finremCallbackRequest.getCaseDetails().getData(); + mockPassAllValidations(); CaseDocument caseDocument = TestSetUpUtils.caseDocument(FILE_URL, FILE_NAME, FILE_BINARY_URL); @@ -71,7 +74,7 @@ void givenContestedCase_whenDirectionUploadOrderButNonEncryptedFileShouldNotGetE hearingOrderOtherDocuments.add(documentCollection); caseData.setHearingOrderOtherDocuments(hearingOrderOtherDocuments); - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(finremCallbackRequest, AUTH_TOKEN); + GenericAboutToStartOrSubmitCallbackResponse response = underTest.handle(finremCallbackRequest, AUTH_TOKEN); assertTrue(response.getErrors().isEmpty()); verify(service, times(2)).validateEncryptionOnUploadedDocument(any(), any(), any(), any()); @@ -82,6 +85,7 @@ void givenContestedCase_whenExistingDirectionUploadOrderAndUploadedSame_thenShou FinremCallbackRequest finremCallbackRequest = buildCallbackRequest(EventType.DIRECTION_UPLOAD_ORDER); FinremCaseData caseData = finremCallbackRequest.getCaseDetails().getData(); + mockPassAllValidations(); CaseDocument caseDocument = TestSetUpUtils.caseDocument(FILE_URL, FILE_NAME, FILE_BINARY_URL); @@ -99,9 +103,99 @@ void givenContestedCase_whenExistingDirectionUploadOrderAndUploadedSame_thenShou finremCallbackRequest.getCaseDetailsBefore().getData().setHearingOrderOtherDocuments(hearingOrderOtherDocuments); - GenericAboutToStartOrSubmitCallbackResponse response = handler.handle(finremCallbackRequest, AUTH_TOKEN); + GenericAboutToStartOrSubmitCallbackResponse response = underTest.handle(finremCallbackRequest, AUTH_TOKEN); assertTrue(response.getErrors().isEmpty()); verify(service, never()).validateEncryptionOnUploadedDocument(any(), any(), any(), any()); } + + @Test + void shouldCreateEmptyEntryWhenDirectionDetailsCollectionIsEmptyOrNull() { + List expected = List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + ); + + mockPassAllValidations(); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + FinremCaseData result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertEquals(expected, result.getDirectionDetailsCollection()); + + finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().directionDetailsCollection(List.of()).build()); + result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertEquals(expected, result.getDirectionDetailsCollection()); + } + + @Test + void shouldNotCreateEmptyEntryWhenDirectionDetailsCollectionIsNotEmpty() { + List notExpected = List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + ); + + mockPassAllValidations(); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .directionDetailsCollection(List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build(), + DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() + )) + .build()); + FinremCaseData result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertNotEquals(notExpected, result.getDirectionDetailsCollection()); + + finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .directionDetailsCollection(List.of( + DirectionDetailCollection.builder().value(DirectionDetail.builder().cfcList(CfcCourt.BARNET_CIVIL_AND_FAMILY_COURTS_CENTRE) + .build()).build() + )) + .build()); + result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); + assertNotEquals(notExpected, result.getDirectionDetailsCollection()); + } + + @Test + void shouldShowErrorMessageWhenAllLegacyApprovedOrdersRemoved() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("Upload Approved Order is required."), res.getErrors()); + } + + @Test + void shouldShowErrorMessageWhenNotAllNewOrdersPdfFiles() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("You must upload a PDF file for new documents."), res.getErrors()); + } + + @Test + void shouldShowErrorMessageWhenNotAllLegacyApprovedOrdersPdf() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(false); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("You must upload a PDF file for modifying legacy approved documents."), res.getErrors()); + } + + @Test + void shouldShowErrorMessageWhenNotAllModifyingUnprocessedOrdersWordDocuments() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(any(FinremCaseData.class))).thenReturn(false); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); + GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); + assertEquals(List.of("You must upload a Microsoft Word file for modifying an unprocessed approved documents."), res.getErrors()); + } + + private void mockPassAllValidations() { + when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); + when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(true); + when(processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(any(FinremCaseData.class))).thenReturn(true); + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java index 8c5d11c4e3..4edbc1036e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandlerTest.java @@ -2,7 +2,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.provider.Arguments; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -45,9 +44,7 @@ class DirectionUploadOrderSubmittedHandlerTest { @Test void testCanHandle() { - assertCanHandle(handler, - Arguments.of(CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER), - Arguments.of(CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.PROCESS_ORDER)); + assertCanHandle(handler, CallbackType.SUBMITTED, CaseType.CONTESTED, EventType.DIRECTION_UPLOAD_ORDER); } @Test diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java deleted file mode 100644 index 19ebc9664b..0000000000 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersAboutToSubmitHandlerTest.java +++ /dev/null @@ -1,364 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; -import org.mockito.ArgumentCaptor; -import org.mockito.InOrder; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; -import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; -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.draftorders.agreed.AgreedDraftOrder; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.agreed.AgreedDraftOrderCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; - -import java.util.ArrayList; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.inOrder; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; - -@ExtendWith(MockitoExtension.class) -class ProcessOrdersAboutToSubmitHandlerTest { - - private static final CaseDocument TARGET_DOCUMENT_1 = CaseDocument.builder().documentUrl("targetDoc1.docx").build(); - - private static final CaseDocument TARGET_DOCUMENT_2 = CaseDocument.builder().documentUrl("targetDoc2.docx").build(); - - private static final CaseDocument TARGET_DOCUMENT_3 = CaseDocument.builder().documentUrl("targetDoc3.docx").build(); - - private static final CaseDocument TARGET_DOCUMENT_4 = CaseDocument.builder().documentUrl("targetDoc4.docx").build(); - - @Spy - @InjectMocks - private ProcessOrdersAboutToSubmitHandler underTest; - - @Spy - private HasApprovableCollectionReader hasApprovableCollectionReader; - - @Mock - private AdditionalHearingDocumentService additionalHearingDocumentService; - - @Test - void testCanHandle() { - assertCanHandle(underTest, ABOUT_TO_SUBMIT, CONTESTED, PROCESS_ORDER); - } - - @Test - void shouldHandleUploadHearingOrdersWithoutUnprocessedDraftDocuments() { - List uploadHearingOrder = new ArrayList<>(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() - )); - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .uploadHearingOrder(uploadHearingOrder) - .build()); - - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - assertThat(res.getData().getUploadHearingOrder()).hasSize(1); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrders(boolean nullExistingUploadHearingOrder) { - List uploadHearingOrder = nullExistingUploadHearingOrder ? null : new ArrayList<>(); - DirectionOrderCollection expectedNewDirectionOrderCollection = null; - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .uploadHearingOrder(uploadHearingOrder) - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .unprocessedApprovedDocuments(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) - .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) - .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), - expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() - .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() - )) - .build()) - .build()); - - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - assertThat(res.getData().getUploadHearingOrder()).hasSize(1); - assertThat(res.getData().getUploadHearingOrder().get(0)).isEqualTo(expectedNewDirectionOrderCollection); - } - - @Test - void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrdersWithExistingUploadHearingOrder() { - List uploadHearingOrder = new ArrayList<>(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() - )); - DirectionOrderCollection expectedNewDirectionOrderCollection = null; - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .uploadHearingOrder(uploadHearingOrder) - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .unprocessedApprovedDocuments(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) - .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) - .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), - expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() - .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() - )) - .build()) - .build()); - - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - assertThat(res.getData().getUploadHearingOrder()).hasSize(2); - assertThat(res.getData().getUploadHearingOrder().get(1)).isEqualTo(expectedNewDirectionOrderCollection); - } - - @Test - void shouldStampNewUploadedDocumentsFromUnprocessedApprovedDocuments() throws JsonProcessingException { - List uploadHearingOrder = new ArrayList<>(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() - )); - DirectionOrderCollection expectedNewDirectionOrderCollection = null; - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .uploadHearingOrder(uploadHearingOrder) - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .unprocessedApprovedDocuments(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) - .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) - .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), - expectedNewDirectionOrderCollection = DirectionOrderCollection.builder().value(DirectionOrder.builder() - .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build() - )) - .build()) - .build()); - - // Captor to capture the argument passed to the service - ArgumentCaptor caseDetailsCaptor = ArgumentCaptor.forClass(FinremCaseDetails.class); - - // Use InOrder to verify the order of method calls - InOrder inOrder = inOrder(underTest, additionalHearingDocumentService); - - // verify handleNewDocument should be invoked before createAndStoreAdditionalHearingDocuments which stamps the PDF file uploaded. - underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - inOrder.verify(underTest).handleNewDocument(any(FinremCaseData.class)); - inOrder.verify(additionalHearingDocumentService).createAndStoreAdditionalHearingDocuments(caseDetailsCaptor.capture(), eq(AUTH_TOKEN)); - - FinremCaseData capturedData = caseDetailsCaptor.getValue().getData(); - assertTrue(capturedData.getUploadHearingOrder().contains(expectedNewDirectionOrderCollection)); - assertTrue(capturedData.getUploadHearingOrder().containsAll(uploadHearingOrder)); - } - - @Test - void shouldMarkDraftOrdersReviewCollectionProcessed() { - DraftOrderDocReviewCollection test1 = null; - DraftOrderDocReviewCollection test2 = null; - AgreedDraftOrderCollection test3 = null; - AgreedDraftOrderCollection test4 = null; - AgreedDraftOrderCollection test5 = null; - AgreedDraftOrderCollection test6 = null; - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .unprocessedApprovedDocuments(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) - .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) - .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build() - )) - .agreedDraftOrderCollection(List.of( - test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_1) - .orderStatus(APPROVED_BY_JUDGE).build()).build(), - test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_2) - .orderStatus(APPROVED_BY_JUDGE).build()).build(), - test5 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().draftOrder(TARGET_DOCUMENT_3) - .orderStatus(APPROVED_BY_JUDGE).build()).build(), - test6 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_4) - .orderStatus(TO_BE_REVIEWED).build()).build() - )) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value( - DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - test1 = buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), - buildDraftOrderDocReviewCollection(TO_BE_REVIEWED) - )) - .build()).build(), - DraftOrdersReviewCollection.builder().value( - DraftOrdersReview.builder() - .draftOrderDocReviewCollection(List.of( - buildDraftOrderDocReviewCollection(PROCESSED), - test2 = buildDraftOrderDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) - )) - .build()).build() - )) - .build()) - .build()); - - underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - assertEquals(PROCESSED, test1.getValue().getOrderStatus()); - assertEquals(PROCESSED, test2.getValue().getOrderStatus()); - assertEquals(PROCESSED, test3.getValue().getOrderStatus()); - assertEquals(PROCESSED, test4.getValue().getOrderStatus()); - assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); - assertEquals(TO_BE_REVIEWED, test6.getValue().getOrderStatus()); - } - - @Test - void shouldMarkPsaCollectionProcessed() { - PsaDocReviewCollection test1 = null; - PsaDocReviewCollection test2 = null; - AgreedDraftOrderCollection test3 = null; - AgreedDraftOrderCollection test4 = null; - AgreedDraftOrderCollection test5 = null; - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .unprocessedApprovedDocuments(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder() - .originalDocument(TARGET_DOCUMENT_1) - .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), - DirectionOrderCollection.builder().value(DirectionOrder.builder() - .originalDocument(TARGET_DOCUMENT_2) - .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build() - )) - .agreedDraftOrderCollection(List.of( - test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_1) - .orderStatus(APPROVED_BY_JUDGE).build()).build(), - test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_2) - .orderStatus(APPROVED_BY_JUDGE).build()).build(), - test5 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_3) - .orderStatus(APPROVED_BY_JUDGE).build()).build() - )) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value( - DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - test1 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), - buildPsaDocReviewCollection(TO_BE_REVIEWED) - )) - .build()).build(), - DraftOrdersReviewCollection.builder().value( - DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PROCESSED), - test2 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) - )) - .build()).build() - )) - .build()) - .build()); - - underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - assertEquals(PROCESSED, test1.getValue().getOrderStatus()); - assertEquals(PROCESSED, test2.getValue().getOrderStatus()); - assertEquals(PROCESSED, test3.getValue().getOrderStatus()); - assertEquals(PROCESSED, test4.getValue().getOrderStatus()); - assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); - } - - @Test - void shouldReplaceApprovedDocumentAndMarkAsProcessed() { - PsaDocReviewCollection test1 = null; - PsaDocReviewCollection test2 = null; - AgreedDraftOrderCollection test3 = null; - AgreedDraftOrderCollection test4 = null; - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .draftOrdersWrapper(DraftOrdersWrapper.builder() - .unprocessedApprovedDocuments(List.of( - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) - .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build(), - DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) - .uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() - )) - .agreedDraftOrderCollection(List.of( - test3 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_1) - .orderStatus(APPROVED_BY_JUDGE).build()).build(), - test4 = AgreedDraftOrderCollection.builder().value(AgreedDraftOrder.builder().pensionSharingAnnex(TARGET_DOCUMENT_2) - .orderStatus(APPROVED_BY_JUDGE).build()).build() - )) - .draftOrdersReviewCollection(List.of( - DraftOrdersReviewCollection.builder().value( - DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - test1 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_1), - buildPsaDocReviewCollection(TO_BE_REVIEWED) - )) - .build()).build(), - DraftOrdersReviewCollection.builder().value( - DraftOrdersReview.builder() - .psaDocReviewCollection(List.of( - buildPsaDocReviewCollection(PROCESSED), - test2 = buildPsaDocReviewCollection(APPROVED_BY_JUDGE, TARGET_DOCUMENT_2) - )) - .build()).build() - )) - .build()) - .build()); - - underTest.handle(finremCallbackRequest, AUTH_TOKEN); - - assertEquals(PROCESSED, test1.getValue().getOrderStatus()); - assertEquals(TARGET_DOCUMENT_3, test1.getValue().getPsaDocument()); - assertEquals(PROCESSED, test2.getValue().getOrderStatus()); - assertEquals(TARGET_DOCUMENT_4, test2.getValue().getPsaDocument()); - assertEquals(PROCESSED, test3.getValue().getOrderStatus()); - assertEquals(PROCESSED, test4.getValue().getOrderStatus()); - } - - private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus) { - return buildDraftOrderDocReviewCollection(orderStatus, null); - } - - private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus, CaseDocument document) { - return DraftOrderDocReviewCollection.builder() - .value(DraftOrderDocumentReview.builder().draftOrderDocument(document).orderStatus(orderStatus).build()) - .build(); - } - - private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus) { - return buildPsaDocReviewCollection(orderStatus, null); - } - - private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStatus, CaseDocument document) { - return PsaDocReviewCollection.builder() - .value(PsaDocumentReview.builder().psaDocument(document).orderStatus(orderStatus).build()) - .build(); - } -} diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java deleted file mode 100644 index 75111322e4..0000000000 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/processorders/ProcessOrdersMidHandlerTest.java +++ /dev/null @@ -1,132 +0,0 @@ -package uk.gov.hmcts.reform.finrem.caseorchestration.handler.processorders; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; -import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CfcCourt; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetail; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionDetailCollection; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; - -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; -import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; -import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.MID_EVENT; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.PROCESS_ORDER; -import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; -import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; - -@ExtendWith(MockitoExtension.class) -class ProcessOrdersMidHandlerTest { - - @InjectMocks - private ProcessOrdersMidHandler underTest; - - @Mock - private ProcessOrderService processOrderService; - - @Test - void testCanHandle() { - assertCanHandle(underTest, MID_EVENT, CONTESTED, PROCESS_ORDER); - } - - private void mockPassAllValidations() { - when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); - when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); - when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(true); - when(processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(any(FinremCaseData.class))).thenReturn(true); - } - - @Test - void shouldCreateEmptyEntryWhenDirectionDetailsCollectionIsEmptyOrNull() { - List expected = List.of( - DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() - ); - - mockPassAllValidations(); - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); - FinremCaseData result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); - assertEquals(expected, result.getDirectionDetailsCollection()); - - finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().directionDetailsCollection(List.of()).build()); - result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); - assertEquals(expected, result.getDirectionDetailsCollection()); - } - - @Test - void shouldNotCreateEmptyEntryWhenDirectionDetailsCollectionIsNotEmpty() { - List notExpected = List.of( - DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() - ); - - mockPassAllValidations(); - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .directionDetailsCollection(List.of( - DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build(), - DirectionDetailCollection.builder().value(DirectionDetail.builder().build()).build() - )) - .build()); - FinremCaseData result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); - assertNotEquals(notExpected, result.getDirectionDetailsCollection()); - - finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() - .directionDetailsCollection(List.of( - DirectionDetailCollection.builder().value(DirectionDetail.builder().cfcList(CfcCourt.BARNET_CIVIL_AND_FAMILY_COURTS_CENTRE) - .build()).build() - )) - .build()); - result = underTest.handle(finremCallbackRequest, AUTH_TOKEN).getData(); - assertNotEquals(notExpected, result.getDirectionDetailsCollection()); - } - - @Test - void shouldShowErrorMessageWhenAllLegacyApprovedOrdersRemoved() { - when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - assertEquals(List.of("Upload Approved Order is required."), res.getErrors()); - } - - @Test - void shouldShowErrorMessageWhenNotAllNewOrdersPdfFiles() { - when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); - when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - assertEquals(List.of("You must upload a PDF file for new documents."), res.getErrors()); - } - - @Test - void shouldShowErrorMessageWhenNotAllLegacyApprovedOrdersPdf() { - when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); - when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); - when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(false); - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - assertEquals(List.of("You must upload a PDF file for modifying legacy approved documents."), res.getErrors()); - } - - @Test - void shouldShowErrorMessageWhenNotAllModifyingUnprocessedOrdersWordDocuments() { - when(processOrderService.areAllLegacyApprovedOrdersRemoved(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(false); - when(processOrderService.areAllNewOrdersPdfFiles(any(FinremCaseData.class), any(FinremCaseData.class))).thenReturn(true); - when(processOrderService.areAllLegacyApprovedOrdersPdf(any(FinremCaseData.class))).thenReturn(true); - when(processOrderService.areAllModifyingUnprocessedOrdersWordDocuments(any(FinremCaseData.class))).thenReturn(false); - - FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder().build()); - GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - assertEquals(List.of("You must upload a Microsoft Word file for modifying an unprocessed approved documents."), res.getErrors()); - } -} From 940951b57fa6726bff822160536052c565b04f2c Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Fri, 3 Jan 2025 18:43:35 +0000 Subject: [PATCH 313/336] Add test case on stamping new documents from unprocessedApprovedDocument --- ...ectionUploadOrderAboutToSubmitHandler.java | 42 +++++++++-------- ...onUploadOrderAboutToSubmitHandlerTest.java | 46 +++++++++++++++++-- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index 589825d9df..34f78a36a6 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -27,6 +27,9 @@ import static java.util.Optional.ofNullable; import static java.util.function.Predicate.not; +import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; +import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; @@ -34,23 +37,21 @@ @Service public class DirectionUploadOrderAboutToSubmitHandler extends FinremCallbackHandler { - private final AdditionalHearingDocumentService service; + private final AdditionalHearingDocumentService additionalHearingDocumentService; private final HasApprovableCollectionReader hasApprovableCollectionReader; public DirectionUploadOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, - AdditionalHearingDocumentService service, + AdditionalHearingDocumentService additionalHearingDocumentService, HasApprovableCollectionReader hasApprovableCollectionReader) { super(finremCaseDetailsMapper); - this.service = service; + this.additionalHearingDocumentService = additionalHearingDocumentService; this.hasApprovableCollectionReader = hasApprovableCollectionReader; } @Override public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { - return CallbackType.ABOUT_TO_SUBMIT.equals(callbackType) - && CaseType.CONTESTED.equals(caseType) - && EventType.DIRECTION_UPLOAD_ORDER.equals(eventType); + return ABOUT_TO_SUBMIT.equals(callbackType) && CONTESTED.equals(caseType) && DIRECTION_UPLOAD_ORDER.equals(eventType); } @Override @@ -61,15 +62,17 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem log.info("Invoking contested event {} mid callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData caseData = caseDetails.getData(); - handleNewDocument(caseData); + // handleNewDocument must be handled before storeAdditionalHearingDocuments in order to stamp the newly uploaded document. + handleNewDocumentInUnprocessedApprovedDocuments(caseData); List errors = new ArrayList<>(); log.info("Storing Additional Hearing Document for Case ID: {}", caseId); try { - service.createAndStoreAdditionalHearingDocuments(caseDetails, userAuthorisation); + storeAdditionalHearingDocuments(callbackRequest.getCaseDetails(), userAuthorisation); } catch (CourtDetailsParseException | JsonProcessingException e) { - log.error(e.getMessage()); - errors.add(e.getMessage()); + log.error("Case ID: {} {}", callbackRequest.getCaseDetails().getId(), e.getMessage()); + return GenericAboutToStartOrSubmitCallbackResponse.builder() + .data(caseData).errors(List.of("There was an unexpected error")).build(); } handleDraftOrderDocuments(caseData); @@ -77,18 +80,17 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem handleAgreedDraftOrdersCollection(caseData); clearTemporaryFields(caseData); - return GenericAboutToStartOrSubmitCallbackResponse.builder() - .data(caseData).errors(errors).build(); + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseData).errors(errors).build(); } - private List nullSafeUnprocessedApprovedDocuments(FinremCaseData caseData) { - return ofNullable(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).orElse(List.of()); + private void storeAdditionalHearingDocuments(FinremCaseDetails caseDetails, String userAuthorisation) throws JsonProcessingException { + additionalHearingDocumentService.createAndStoreAdditionalHearingDocuments(caseDetails, userAuthorisation); } - private void handleNewDocument(FinremCaseData caseData) { - nullSafeUnprocessedApprovedDocuments(caseData).forEach(unprocessedApprovedOrder -> { - if (isNewDocument(unprocessedApprovedOrder)) { - insertNewDocumentToUploadHearingOrder(caseData, unprocessedApprovedOrder); + private void handleNewDocumentInUnprocessedApprovedDocuments(FinremCaseData caseData) { + nullSafeUnprocessedApprovedDocuments(caseData).forEach(unprocessedApprovedDocuments -> { + if (isNewDocument(unprocessedApprovedDocuments)) { + insertNewDocumentToUploadHearingOrder(caseData, unprocessedApprovedDocuments); } }); } @@ -174,4 +176,8 @@ private boolean doesDocumentMatch(CaseDocument doc1, CaseDocument doc2) { private boolean isNewDocument(DirectionOrderCollection unprocessedApprovedOrder) { return unprocessedApprovedOrder.getValue().getOriginalDocument() == null; } + + private List nullSafeUnprocessedApprovedDocuments(FinremCaseData caseData) { + return ofNullable(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).orElse(List.of()); + } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index b19b1a87d8..63a3ce7390 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -35,7 +35,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; @@ -64,7 +68,7 @@ class DirectionUploadOrderAboutToSubmitHandlerTest { private HasApprovableCollectionReader hasApprovableCollectionReader; @Mock - private AdditionalHearingDocumentService service; + private AdditionalHearingDocumentService additionalHearingDocumentService; @Test void testCanHandle() { @@ -75,20 +79,20 @@ void testCanHandle() { void createAndStoreAdditionalHearingDocumentsHandleException() throws JsonProcessingException { FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.fromId(123L); FinremCaseDetails finremCaseDetails = finremCallbackRequest.getCaseDetails(); - doThrow(new CourtDetailsParseException()).when(service) + doThrow(new CourtDetailsParseException()).when(additionalHearingDocumentService) .createAndStoreAdditionalHearingDocuments(finremCaseDetails, AUTH_TOKEN); GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); assertEquals(1, res.getErrors().size()); assertEquals("Failed to parse court details.", res.getErrors().get(0)); - verify(service).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); + verify(additionalHearingDocumentService).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); } @Test void createAndStoreAdditionalHearingDocuments() throws JsonProcessingException { FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.fromId(123L); underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(service).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); + verify(additionalHearingDocumentService).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); } @Test @@ -338,4 +342,38 @@ private PsaDocReviewCollection buildPsaDocReviewCollection(OrderStatus orderStat .value(PsaDocumentReview.builder().psaDocument(document).orderStatus(orderStatus).build()) .build(); } + + @Test + void shouldStampNewUploadedDocumentsFromUnprocessedApprovedDocuments() throws JsonProcessingException { + DirectionOrderCollection expectedNewDocument = DirectionOrderCollection.builder().value(DirectionOrder.builder() + .uploadDraftDocument(TARGET_DOCUMENT_3).build()).build(); + + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() + .uploadHearingOrder(new ArrayList<>(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().uploadDraftDocument(TARGET_DOCUMENT_4).build()).build() + ))) + .draftOrdersWrapper(DraftOrdersWrapper.builder() + .unprocessedApprovedDocuments(List.of( + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_1) + .uploadDraftDocument(TARGET_DOCUMENT_1).build()).build(), + DirectionOrderCollection.builder().value(DirectionOrder.builder().originalDocument(TARGET_DOCUMENT_2) + .uploadDraftDocument(TARGET_DOCUMENT_2).build()).build(), + expectedNewDocument + )) + .build()) + .build()); + + lenient().doThrow(new AssertionError("Expected two documents to be processed, but only one was found")) + .when(additionalHearingDocumentService) + .createAndStoreAdditionalHearingDocuments( + any(FinremCaseDetails.class), + eq(AUTH_TOKEN)); + // mocking the valid invocation on createAndStoreAdditionalHearingDocuments + lenient().doNothing().when(additionalHearingDocumentService) + .createAndStoreAdditionalHearingDocuments( + argThat(a -> a.getData().getUploadHearingOrder().size() == 2 && a.getData().getUploadHearingOrder().contains(expectedNewDocument)), + eq(AUTH_TOKEN)); + + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + } } From ef6563363f1a4d6824fea78e80c00791688290a9 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Mon, 6 Jan 2025 09:36:01 +0000 Subject: [PATCH 314/336] update test case --- .../handler/DirectionUploadOrderAboutToSubmitHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 63a3ce7390..88325ea6de 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -84,7 +84,7 @@ void createAndStoreAdditionalHearingDocumentsHandleException() throws JsonProces GenericAboutToStartOrSubmitCallbackResponse res = underTest.handle(finremCallbackRequest, AUTH_TOKEN); assertEquals(1, res.getErrors().size()); - assertEquals("Failed to parse court details.", res.getErrors().get(0)); + assertEquals("There was an unexpected error", res.getErrors().get(0)); verify(additionalHearingDocumentService).createAndStoreAdditionalHearingDocuments(finremCallbackRequest.getCaseDetails(), AUTH_TOKEN); } From 7ef70ca66a86cb3e128ba1ca32296663943509fc Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 7 Jan 2025 12:31:31 +0000 Subject: [PATCH 315/336] Remove unused errors. --- .../handler/DirectionUploadOrderAboutToStartHandler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java index 75bb7a5b87..faf4c34b6c 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandler.java @@ -13,7 +13,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.YesOrNo; import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; -import java.util.ArrayList; import java.util.List; import static java.util.Optional.ofNullable; @@ -46,12 +45,10 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem log.info("Invoking contested event {} about to start callback for Case ID: {}", callbackRequest.getEventType(), caseId); FinremCaseData caseData = caseDetails.getData(); - List errors = new ArrayList<>(); - processOrderService.populateUnprocessedApprovedDocuments(caseData); populateMetaDataFields(caseData); - return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseData).errors(errors).build(); + return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseData).build(); } private void populateMetaDataFields(FinremCaseData caseData) { From a75c85b1894d66c2f62d45d1c7be939b42665715 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 7 Jan 2025 12:39:59 +0000 Subject: [PATCH 316/336] Tidy up --- .../DirectionUploadOrderAboutToSubmitHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index 34f78a36a6..a3096fd2c4 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -100,7 +100,7 @@ private void handleDraftOrderDocuments(FinremCaseData caseData) { hasApprovableCollectionReader.filterAndCollectDraftOrderDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), collector, APPROVED_BY_JUDGE::equals); - nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { toBeUpdated.getValue().setOrderStatus(PROCESSED); @@ -113,7 +113,7 @@ private void handlePsaDocuments(FinremCaseData caseData) { hasApprovableCollectionReader.filterAndCollectPsaDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), psaCollector, APPROVED_BY_JUDGE::equals); - nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { toBeUpdated.getValue().setOrderStatus(PROCESSED); @@ -126,7 +126,7 @@ private void handleAgreedDraftOrdersCollection(FinremCaseData caseData) { hasApprovableCollectionReader.collectAgreedDraftOrders(caseData.getDraftOrdersWrapper().getAgreedDraftOrderCollection(), agreedOrderCollector, APPROVED_BY_JUDGE::equals); - nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)) + getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> agreedOrderCollector.stream().filter(agreedDraftOrder -> doesDocumentMatch(agreedDraftOrder, unprocessedApprovedOrder)) .forEach(toBeUpdated -> { @@ -180,4 +180,8 @@ private boolean isNewDocument(DirectionOrderCollection unprocessedApprovedOrder) private List nullSafeUnprocessedApprovedDocuments(FinremCaseData caseData) { return ofNullable(caseData.getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).orElse(List.of()); } + + private List getApprovedDocumentsToProcess(FinremCaseData caseData) { + return nullSafeUnprocessedApprovedDocuments(caseData).stream().filter(not(this::isNewDocument)).toList(); + } } From cc3bdf6cd54ae08dc391910cb059ca1b281bf510 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 7 Jan 2025 12:59:08 +0000 Subject: [PATCH 317/336] Tidy up --- ...ionUploadOrderAboutToStartHandlerTest.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java index 2c23def6ab..b9d96b3c38 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java @@ -7,8 +7,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.DirectionUploadOrderAboutToStartHandler; -import uk.gov.hmcts.reform.finrem.caseorchestration.handler.FinremCallbackRequest; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; @@ -98,15 +96,15 @@ void shouldPopulateUnprocessedApprovedDocuments() { .build()) .build()); GenericAboutToStartOrSubmitCallbackResponse result = underTest.handle(finremCallbackRequest, AUTH_TOKEN); - assertThat(result.getData().getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).hasSize(1); - assertThat(result.getData().getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).contains( - DirectionOrderCollection.builder().value(DirectionOrder.builder() - .isOrderStamped(YesOrNo.NO) - .uploadDraftDocument(TARGET_DOCUMENT_1) - .originalDocument(TARGET_DOCUMENT_1) - .orderDateTime(APPROVAL_DATE) - .build()).build() - ); + assertThat(result.getData().getDraftOrdersWrapper().getUnprocessedApprovedDocuments()) + .hasSize(1) + .containsOnly( + DirectionOrderCollection.builder().value(DirectionOrder.builder() + .isOrderStamped(YesOrNo.NO) + .uploadDraftDocument(TARGET_DOCUMENT_1) + .originalDocument(TARGET_DOCUMENT_1) + .orderDateTime(APPROVAL_DATE) + .build()).build()); assertTrue(YesOrNo.isYes(result.getData().getDraftOrdersWrapper().getIsUnprocessedApprovedDocumentPresent())); } From a2f97e06e2592ada73c138aec3c58585761a9671 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 7 Jan 2025 13:17:26 +0000 Subject: [PATCH 318/336] Chained --- .../HasApprovableCollectionReaderTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java index 2325b8c3fc..b22af9dcd1 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java @@ -126,9 +126,10 @@ void shouldFilterAndCollectPsaDocs() { assertEquals(psaDocument2, result.get(0).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()); assertEquals(psaDocument4, result.get(1).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()); - assertThat(collector).hasSize(2); - assertEquals(psaDocument1, collector.get(0).getValue().getPsaDocument()); - assertEquals(psaDocument3, collector.get(1).getValue().getPsaDocument()); + assertThat(collector).hasSize(2) + .extracting(PsaDocReviewCollection::getValue) + .extracting(PsaDocumentReview::getPsaDocument) + .containsExactly(psaDocument1, psaDocument3); } @Test @@ -150,8 +151,9 @@ void shouldCollectAgreedDraftOrder() { ); underTest.collectAgreedDraftOrders(sample, collector, REFUSED::equals); - assertThat(collector).hasSize(2); - assertEquals(psaDocument1, collector.get(0).getValue().getTargetDocument()); - assertEquals(draftOrderDocument1, collector.get(1).getValue().getTargetDocument()); + assertThat(collector).hasSize(2) + .extracting(AgreedDraftOrderCollection::getValue) + .extracting(AgreedDraftOrder::getTargetDocument) + .containsExactly(psaDocument1, draftOrderDocument1); } } From 79a6a2df9522928f04d64263c406e72ae3e52e01 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 7 Jan 2025 13:25:10 +0000 Subject: [PATCH 319/336] Chain it --- .../HasApprovableCollectionReaderTest.java | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java index b22af9dcd1..b9001430db 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/draftorders/HasApprovableCollectionReaderTest.java @@ -19,7 +19,6 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.REFUSED; @@ -76,12 +75,22 @@ void shouldFilterAndCollectDraftOrderDocs() { ); List result = underTest.filterAndCollectDraftOrderDocs(sample, collector, REFUSED::equals); - assertThat(result).hasSize(1); - assertThat(result.get(0).getValue().getDraftOrderDocReviewCollection()).hasSize(1); - assertEquals(draftOrderDocument2, result.get(0).getValue().getDraftOrderDocReviewCollection().get(0).getValue().getDraftOrderDocument()); - - assertThat(collector).hasSize(1); - assertEquals(draftOrderDocument1, collector.get(0).getValue().getDraftOrderDocument()); + assertThat(result) + .hasSize(1) + .extracting(DraftOrdersReviewCollection::getValue) + .extracting(DraftOrdersReview::getDraftOrderDocReviewCollection) + .allSatisfy(draftOrderDocReviewCollection -> + assertThat(draftOrderDocReviewCollection) + .hasSize(1) + .extracting(DraftOrderDocReviewCollection::getValue) + .extracting(DraftOrderDocumentReview::getDraftOrderDocument) + .containsExactly(draftOrderDocument2)); + + assertThat(collector) + .hasSize(1) + .extracting(DraftOrderDocReviewCollection::getValue) + .extracting(DraftOrderDocumentReview::getDraftOrderDocument) + .containsExactly(draftOrderDocument1); } @Test @@ -120,11 +129,16 @@ void shouldFilterAndCollectPsaDocs() { ); List result = underTest.filterAndCollectPsaDocs(sample, collector, REFUSED::equals); - assertThat(result).hasSize(2); - assertThat(result.get(0).getValue().getPsaDocReviewCollection()).hasSize(1); - assertThat(result.get(1).getValue().getPsaDocReviewCollection()).hasSize(1); - assertEquals(psaDocument2, result.get(0).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()); - assertEquals(psaDocument4, result.get(1).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()); + assertThat(result) + .hasSize(2) + .extracting(DraftOrdersReviewCollection::getValue) + .extracting(DraftOrdersReview::getPsaDocReviewCollection) + .allSatisfy(psaDocReviewCollection -> assertThat(psaDocReviewCollection).hasSize(1)); + + assertThat(result.get(0).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()) + .isEqualTo(psaDocument2); + assertThat(result.get(1).getValue().getPsaDocReviewCollection().get(0).getValue().getPsaDocument()) + .isEqualTo(psaDocument4); assertThat(collector).hasSize(2) .extracting(PsaDocReviewCollection::getValue) From 75e6a6414667cdd78a8ff5dc25834be0901044f6 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Wed, 8 Jan 2025 09:57:35 +0000 Subject: [PATCH 320/336] Fix duplicated event type. --- .../handler/DirectionUploadOrderSubmittedHandler.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java index 5b0532feb2..fff0abfb18 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderSubmittedHandler.java @@ -14,8 +14,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingDocumentService; -import java.util.List; - import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.SUBMITTED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType.CONTESTED; @@ -37,7 +35,7 @@ public DirectionUploadOrderSubmittedHandler(FinremCaseDetailsMapper finremCaseDe @Override public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) { return SUBMITTED.equals(callbackType) && CONTESTED.equals(caseType) - && List.of(DIRECTION_UPLOAD_ORDER, DIRECTION_UPLOAD_ORDER).contains(eventType); + && DIRECTION_UPLOAD_ORDER.equals(eventType); } @Override From a2759fdbef42293aab0fe7eb1852e0bda1dd61e5 Mon Sep 17 00:00:00 2001 From: Ashley Wong Date: Tue, 14 Jan 2025 14:30:05 +0000 Subject: [PATCH 321/336] clear the unprocessedApprovedDocuments by setting it null. --- .../handler/DirectionUploadOrderAboutToSubmitHandler.java | 2 +- .../handler/DirectionUploadOrderAboutToSubmitHandlerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index a3096fd2c4..d5324e9b02 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -157,7 +157,7 @@ private void clearTemporaryFields(FinremCaseData caseData) { } private void clearUnprocessedApprovedDocuments(DraftOrdersWrapper draftOrdersWrapper) { - draftOrdersWrapper.setUnprocessedApprovedDocuments(List.of()); + draftOrdersWrapper.setUnprocessedApprovedDocuments(null); } private void clearMetaDataFields(FinremCaseData caseData) { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 88325ea6de..3a743b3c0d 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -161,6 +161,7 @@ void shouldInsertNewDocumentFromUnprocessedApprovedDocumentsToUploadHearingOrder assertThat(res.getData().getUploadHearingOrder()).hasSize(2); assertThat(res.getData().getUploadHearingOrder().get(1)).isEqualTo(expectedNewDirectionOrderCollection); + assertThat(res.getData().getDraftOrdersWrapper().getUnprocessedApprovedDocuments()).isNull(); } @Test From 3185b9fdb344cd80ecfdb0dceeffc25177b935d3 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:07:36 +0000 Subject: [PATCH 322/336] Add convertToPdfAndStampDocument method --- .../processorder/ProcessOrderService.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java index 464108e2f5..45a2bb4be0 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java @@ -3,15 +3,20 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; 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.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.document.DocumentCategory; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import java.util.ArrayList; @@ -28,6 +33,8 @@ public class ProcessOrderService { private final HasApprovableCollectionReader hasApprovableCollectionReader; + private final DocumentHelper documentHelper; + private final GenericDocumentService genericDocumentService; private static List nullSafeList(List t) { return ofNullable(t).orElse(List.of()); @@ -143,4 +150,20 @@ private boolean isUploadHearingOrderEmpty(FinremCaseData caseData) { return nullSafeList(caseData.getUploadHearingOrder()).isEmpty(); } + public CaseDocument convertToPdfAndStampDocument(FinremCaseDetails caseDetails, + CaseDocument document, + String authorisationToken) { + + String caseId = String.valueOf(caseDetails.getId()); + FinremCaseData caseData = caseDetails.getData(); + StampType stampType = documentHelper.getStampType(caseData); + + CaseDocument stampedDoc = genericDocumentService.stampDocument(document, + authorisationToken, stampType, caseId); + + stampedDoc.setCategoryId( + DocumentCategory.APPROVED_ORDERS.getDocumentCategoryId()); + + return stampedDoc; + } } From 8b8c93afaefda52e323d0810ff316685588b847c Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:08:53 +0000 Subject: [PATCH 323/336] call convertToPdfAndStampDocument in AboutToSubmit to update review collections. --- ...ectionUploadOrderAboutToSubmitHandler.java | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index d5324e9b02..4e958f868d 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -21,6 +21,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.util.ArrayList; import java.util.List; @@ -41,12 +42,17 @@ public class DirectionUploadOrderAboutToSubmitHandler extends FinremCallbackHand private final HasApprovableCollectionReader hasApprovableCollectionReader; + private final ProcessOrderService processOrderService; + + public DirectionUploadOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, AdditionalHearingDocumentService additionalHearingDocumentService, - HasApprovableCollectionReader hasApprovableCollectionReader) { + HasApprovableCollectionReader hasApprovableCollectionReader, + ProcessOrderService processOrderService) { super(finremCaseDetailsMapper); this.additionalHearingDocumentService = additionalHearingDocumentService; this.hasApprovableCollectionReader = hasApprovableCollectionReader; + this.processOrderService = processOrderService; } @Override @@ -75,9 +81,9 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem .data(caseData).errors(List.of("There was an unexpected error")).build(); } - handleDraftOrderDocuments(caseData); - handlePsaDocuments(caseData); - handleAgreedDraftOrdersCollection(caseData); + handleDraftOrderDocuments(caseDetails, userAuthorisation); + handlePsaDocuments(caseDetails, userAuthorisation); + handleAgreedDraftOrdersCollection(caseDetails); clearTemporaryFields(caseData); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseData).errors(errors).build(); @@ -95,7 +101,8 @@ private void handleNewDocumentInUnprocessedApprovedDocuments(FinremCaseData case }); } - private void handleDraftOrderDocuments(FinremCaseData caseData) { + private void handleDraftOrderDocuments(FinremCaseDetails caseDetails, String authorisation) { + FinremCaseData caseData = caseDetails.getData(); List collector = new ArrayList<>(); hasApprovableCollectionReader.filterAndCollectDraftOrderDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), collector, APPROVED_BY_JUDGE::equals); @@ -103,12 +110,15 @@ private void handleDraftOrderDocuments(FinremCaseData caseData) { getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { + CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, + unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); toBeUpdated.getValue().setOrderStatus(PROCESSED); - toBeUpdated.getValue().setDraftOrderDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + toBeUpdated.getValue().setDraftOrderDocument(stampedDoc); })); } - private void handlePsaDocuments(FinremCaseData caseData) { + private void handlePsaDocuments(FinremCaseDetails caseDetails, String authorisation) { + FinremCaseData caseData = caseDetails.getData(); List psaCollector = new ArrayList<>(); hasApprovableCollectionReader.filterAndCollectPsaDocs(caseData.getDraftOrdersWrapper().getDraftOrdersReviewCollection(), psaCollector, APPROVED_BY_JUDGE::equals); @@ -116,12 +126,15 @@ private void handlePsaDocuments(FinremCaseData caseData) { getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { + CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, + unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); toBeUpdated.getValue().setOrderStatus(PROCESSED); - toBeUpdated.getValue().setPsaDocument(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + toBeUpdated.getValue().setPsaDocument(stampedDoc); })); } - private void handleAgreedDraftOrdersCollection(FinremCaseData caseData) { + private void handleAgreedDraftOrdersCollection(FinremCaseDetails caseDetails) { + FinremCaseData caseData = caseDetails.getData(); List agreedOrderCollector = new ArrayList<>(); hasApprovableCollectionReader.collectAgreedDraftOrders(caseData.getDraftOrdersWrapper().getAgreedDraftOrderCollection(), agreedOrderCollector, APPROVED_BY_JUDGE::equals); From 781967609f3e3a7b72c3767cf380ec9687d183a3 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:27:43 +0000 Subject: [PATCH 324/336] update unit tests --- ...onUploadOrderAboutToSubmitHandlerTest.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 3a743b3c0d..6c921181f4 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -29,6 +29,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.util.ArrayList; import java.util.List; @@ -40,7 +41,9 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static uk.gov.hmcts.reform.finrem.caseorchestration.TestConstants.AUTH_TOKEN; import static uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType.ABOUT_TO_SUBMIT; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType.DIRECTION_UPLOAD_ORDER; @@ -70,6 +73,9 @@ class DirectionUploadOrderAboutToSubmitHandlerTest { @Mock private AdditionalHearingDocumentService additionalHearingDocumentService; + @Mock + private ProcessOrderService processOrderService; + @Test void testCanHandle() { assertCanHandle(underTest, ABOUT_TO_SUBMIT, CONTESTED, DIRECTION_UPLOAD_ORDER); @@ -172,6 +178,7 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { AgreedDraftOrderCollection test4 = null; AgreedDraftOrderCollection test5 = null; AgreedDraftOrderCollection test6 = null; + CaseDocument stampedDocument = CaseDocument.builder().build(); FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() @@ -210,8 +217,12 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { .build()) .build()); + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), + any(String.class))).thenReturn(stampedDocument); + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); @@ -281,6 +292,8 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { AgreedDraftOrderCollection test3 = null; AgreedDraftOrderCollection test4 = null; + CaseDocument stampedDocument = CaseDocument.builder().build(); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() .unprocessedApprovedDocuments(List.of( @@ -314,12 +327,16 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { .build()) .build()); + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), + any(String.class))).thenReturn(stampedDocument); + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); - assertEquals(TARGET_DOCUMENT_3, test1.getValue().getPsaDocument()); + assertEquals(stampedDocument, test1.getValue().getPsaDocument()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); - assertEquals(TARGET_DOCUMENT_4, test2.getValue().getPsaDocument()); + assertEquals(stampedDocument, test2.getValue().getPsaDocument()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); assertEquals(PROCESSED, test4.getValue().getOrderStatus()); } From 0de594d3ae4974a5dd42ba2cd0ca378aec04b433 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:31:56 +0000 Subject: [PATCH 325/336] improve tests --- .../DirectionUploadOrderAboutToSubmitHandlerTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 6c921181f4..dea417add7 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -222,7 +222,9 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); + verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), + any(CaseDocument.class), any(String.class)); + assertEquals(stampedDocument, test1.getValue().getDraftOrderDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); @@ -238,6 +240,7 @@ void shouldMarkPsaCollectionProcessed() { AgreedDraftOrderCollection test3 = null; AgreedDraftOrderCollection test4 = null; AgreedDraftOrderCollection test5 = null; + CaseDocument stampedDocument = CaseDocument.builder().build(); FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() @@ -276,8 +279,14 @@ void shouldMarkPsaCollectionProcessed() { .build()) .build()); + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), + any(String.class))).thenReturn(stampedDocument); + underTest.handle(finremCallbackRequest, AUTH_TOKEN); + verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), + any(CaseDocument.class), any(String.class)); + assertEquals(stampedDocument, test1.getValue().getPsaDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); From bcb3533c8ed02ae70177a3135a0763a1910cd89d Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:46:57 +0000 Subject: [PATCH 326/336] Add mocks --- ...ectionUploadOrderAboutToStartHandlerTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java index 73a055f3dc..1e26ee5585 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java @@ -3,10 +3,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; @@ -18,7 +20,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.time.LocalDateTime; import java.util.List; @@ -45,6 +49,18 @@ class DirectionUploadOrderAboutToStartHandlerTest { @InjectMocks private DirectionUploadOrderAboutToStartHandler underTest; + @Spy + private HasApprovableCollectionReader hasApprovableCollectionReader = new HasApprovableCollectionReader(); + + @Mock + private DocumentHelper documentHelper; + + @Mock + private GenericDocumentService genericDocumentService; + + @Spy + private ProcessOrderService processOrderService = new ProcessOrderService(hasApprovableCollectionReader, documentHelper, genericDocumentService); + @Test void testCanHandle() { assertCanHandle(underTest, ABOUT_TO_START, CONTESTED, DIRECTION_UPLOAD_ORDER); From 3d0075b9559d962585c14a58f1229e2c10381f48 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:51:48 +0000 Subject: [PATCH 327/336] Improve tests --- ...onUploadOrderAboutToSubmitHandlerTest.java | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index dea417add7..e858c054e0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -178,7 +178,8 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { AgreedDraftOrderCollection test4 = null; AgreedDraftOrderCollection test5 = null; AgreedDraftOrderCollection test6 = null; - CaseDocument stampedDocument = CaseDocument.builder().build(); + CaseDocument stampedDocumentA = CaseDocument.builder().documentFilename("stampedA.pdf").build(); + CaseDocument stampedDocumentB = CaseDocument.builder().documentFilename("stampedB.pdf").build(); FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() @@ -217,14 +218,18 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), - any(String.class))).thenReturn(stampedDocument); + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_1), + any(String.class))).thenReturn(stampedDocumentA); + + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_2), + any(String.class))).thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); - assertEquals(stampedDocument, test1.getValue().getDraftOrderDocument()); + assertEquals(stampedDocumentA, test1.getValue().getDraftOrderDocument()); + assertEquals(stampedDocumentB, test2.getValue().getDraftOrderDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); @@ -240,7 +245,8 @@ void shouldMarkPsaCollectionProcessed() { AgreedDraftOrderCollection test3 = null; AgreedDraftOrderCollection test4 = null; AgreedDraftOrderCollection test5 = null; - CaseDocument stampedDocument = CaseDocument.builder().build(); + CaseDocument stampedDocumentA = CaseDocument.builder().documentFilename("stampedA.pdf").build(); + CaseDocument stampedDocumentB = CaseDocument.builder().documentFilename("stampedB.pdf").build(); FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() @@ -279,14 +285,18 @@ void shouldMarkPsaCollectionProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), - any(String.class))).thenReturn(stampedDocument); + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_3), + any(String.class))).thenReturn(stampedDocumentA); + + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_4), + any(String.class))).thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); - assertEquals(stampedDocument, test1.getValue().getPsaDocument()); + assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); + assertEquals(stampedDocumentB, test2.getValue().getPsaDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); @@ -301,7 +311,8 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { AgreedDraftOrderCollection test3 = null; AgreedDraftOrderCollection test4 = null; - CaseDocument stampedDocument = CaseDocument.builder().build(); + CaseDocument stampedDocumentA = CaseDocument.builder().documentFilename("stampedA.pdf").build(); + CaseDocument stampedDocumentB = CaseDocument.builder().documentFilename("stampedB.pdf").build(); FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() @@ -336,16 +347,20 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), - any(String.class))).thenReturn(stampedDocument); + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_3), + any(String.class))).thenReturn(stampedDocumentA); + + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_4), + any(String.class))).thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); + verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), + any(CaseDocument.class), any(String.class)); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); - assertEquals(stampedDocument, test1.getValue().getPsaDocument()); + assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); - assertEquals(stampedDocument, test2.getValue().getPsaDocument()); + assertEquals(stampedDocumentB, test2.getValue().getPsaDocument()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); assertEquals(PROCESSED, test4.getValue().getOrderStatus()); } From fb271537fb85587fcab388a51b791e4ef4f4a054 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:58:41 +0000 Subject: [PATCH 328/336] Update AgreedDraftOrdersCollection and improve tests --- ...ectionUploadOrderAboutToSubmitHandler.java | 21 +++++++++---- ...onUploadOrderAboutToSubmitHandlerTest.java | 30 ++++++++++++++----- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index 4e958f868d..ac0b40de88 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -19,6 +19,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.model.document.DocumentCategory; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; @@ -83,7 +84,7 @@ public GenericAboutToStartOrSubmitCallbackResponse handle(Finrem handleDraftOrderDocuments(caseDetails, userAuthorisation); handlePsaDocuments(caseDetails, userAuthorisation); - handleAgreedDraftOrdersCollection(caseDetails); + handleAgreedDraftOrdersCollection(caseDetails, userAuthorisation); clearTemporaryFields(caseData); return GenericAboutToStartOrSubmitCallbackResponse.builder().data(caseData).errors(errors).build(); @@ -112,6 +113,9 @@ private void handleDraftOrderDocuments(FinremCaseDetails caseDetails, String aut collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); + stampedDoc.setCategoryId( + DocumentCategory.APPROVED_ORDERS.getDocumentCategoryId()); + toBeUpdated.getValue().setOrderStatus(PROCESSED); toBeUpdated.getValue().setDraftOrderDocument(stampedDoc); })); @@ -128,12 +132,15 @@ private void handlePsaDocuments(FinremCaseDetails caseDetails, String authorisat psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); + stampedDoc.setCategoryId( + DocumentCategory.APPROVED_ORDERS.getDocumentCategoryId()); + toBeUpdated.getValue().setOrderStatus(PROCESSED); toBeUpdated.getValue().setPsaDocument(stampedDoc); })); } - private void handleAgreedDraftOrdersCollection(FinremCaseDetails caseDetails) { + private void handleAgreedDraftOrdersCollection(FinremCaseDetails caseDetails, String authorisation) { FinremCaseData caseData = caseDetails.getData(); List agreedOrderCollector = new ArrayList<>(); hasApprovableCollectionReader.collectAgreedDraftOrders(caseData.getDraftOrdersWrapper().getAgreedDraftOrderCollection(), @@ -143,12 +150,16 @@ private void handleAgreedDraftOrdersCollection(FinremCaseDetails caseDetails) { .forEach(unprocessedApprovedOrder -> agreedOrderCollector.stream().filter(agreedDraftOrder -> doesDocumentMatch(agreedDraftOrder, unprocessedApprovedOrder)) .forEach(toBeUpdated -> { + CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, + unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); + stampedDoc.setCategoryId(unprocessedApprovedOrder.getValue().getUploadDraftDocument().getCategoryId()); + toBeUpdated.getValue().setOrderStatus(PROCESSED); - // replace the document by the new uploaded approved document + // replace the document by the new stamped document if (toBeUpdated.getValue().getPensionSharingAnnex() != null) { - toBeUpdated.getValue().setPensionSharingAnnex(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + toBeUpdated.getValue().setPensionSharingAnnex(stampedDoc); } else if (toBeUpdated.getValue().getDraftOrder() != null) { - toBeUpdated.getValue().setDraftOrder(unprocessedApprovedOrder.getValue().getUploadDraftDocument()); + toBeUpdated.getValue().setDraftOrder(stampedDoc); } })); } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index e858c054e0..94423c6d3e 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -226,14 +226,20 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), + verify(processOrderService, times(4)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); + //Check DraftOrderDocReviewCollection is updated assertEquals(stampedDocumentA, test1.getValue().getDraftOrderDocument()); - assertEquals(stampedDocumentB, test2.getValue().getDraftOrderDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(stampedDocumentB, test2.getValue().getDraftOrderDocument()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + + //Check AgreedDraftOrderCollection is updated + assertEquals(stampedDocumentA, test3.getValue().getDraftOrder()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(stampedDocumentB, test4.getValue().getDraftOrder()); assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); assertEquals(TO_BE_REVIEWED, test6.getValue().getOrderStatus()); } @@ -285,22 +291,28 @@ void shouldMarkPsaCollectionProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_3), + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_1), any(String.class))).thenReturn(stampedDocumentA); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_4), + when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_2), any(String.class))).thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), + verify(processOrderService, times(4)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); + //Check PsaDocReviewCollection is updated assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); - assertEquals(stampedDocumentB, test2.getValue().getPsaDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); + assertEquals(stampedDocumentB, test2.getValue().getPsaDocument()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); + + //Check AgreedDraftOrderCollection is updated + assertEquals(stampedDocumentA, test3.getValue().getPensionSharingAnnex()); assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(stampedDocumentB, test4.getValue().getPensionSharingAnnex()); assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(APPROVED_BY_JUDGE, test5.getValue().getOrderStatus()); } @@ -355,14 +367,18 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(2)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), + verify(processOrderService, times(4)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), any(CaseDocument.class), any(String.class)); + //Check PsaDocReviewCollection is updated assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); assertEquals(PROCESSED, test2.getValue().getOrderStatus()); assertEquals(stampedDocumentB, test2.getValue().getPsaDocument()); + assertEquals(PROCESSED, test3.getValue().getOrderStatus()); + assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); assertEquals(PROCESSED, test4.getValue().getOrderStatus()); + assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); } private DraftOrderDocReviewCollection buildDraftOrderDocReviewCollection(OrderStatus orderStatus) { From f2ae3fdf2c94200bf00d4791af62fc68d5e15059 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:08:33 +0000 Subject: [PATCH 329/336] remove categorisation from convertToPdfAndStampDocument --- .../service/processorder/ProcessOrderService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java index 45a2bb4be0..513f037a44 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java @@ -14,7 +14,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.model.document.DocumentCategory; import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; @@ -161,9 +160,6 @@ public CaseDocument convertToPdfAndStampDocument(FinremCaseDetails caseDetails, CaseDocument stampedDoc = genericDocumentService.stampDocument(document, authorisationToken, stampType, caseId); - stampedDoc.setCategoryId( - DocumentCategory.APPROVED_ORDERS.getDocumentCategoryId()); - return stampedDoc; } } From 9d9a706f8aa4bc15291b0a641661316838042ee8 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:09:09 +0000 Subject: [PATCH 330/336] return immediately --- .../service/processorder/ProcessOrderService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java index 513f037a44..6fed021aa4 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java @@ -157,9 +157,7 @@ public CaseDocument convertToPdfAndStampDocument(FinremCaseDetails caseDetails, FinremCaseData caseData = caseDetails.getData(); StampType stampType = documentHelper.getStampType(caseData); - CaseDocument stampedDoc = genericDocumentService.stampDocument(document, + return genericDocumentService.stampDocument(document, authorisationToken, stampType, caseId); - - return stampedDoc; } } From 86a1f4ad150af7899777b15da592bb597881ca3b Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:21:53 +0000 Subject: [PATCH 331/336] Add test for convertToPdfAndStampDocument --- .../ProcessOrderServiceTest.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java index 5ddeacca3c..cb60ef76db 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java @@ -6,12 +6,15 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; 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.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -20,6 +23,8 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; @@ -29,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; @@ -52,6 +58,12 @@ class ProcessOrderServiceTest { @InjectMocks private ProcessOrderService underTest; + @Mock + private DocumentHelper documentHelper; + + @Mock + private GenericDocumentService genericDocumentService; + @SuppressWarnings("unchecked") @Test void testPopulateUnprocessedApprovedDocuments() { @@ -284,6 +296,37 @@ void testAreAllModifyingUnprocessedOrdersWordDocuments(List Date: Fri, 17 Jan 2025 12:04:44 +0000 Subject: [PATCH 332/336] remove empty line --- .../handler/DirectionUploadOrderAboutToSubmitHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index ac0b40de88..2c30447765 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -45,7 +45,6 @@ public class DirectionUploadOrderAboutToSubmitHandler extends FinremCallbackHand private final ProcessOrderService processOrderService; - public DirectionUploadOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, AdditionalHearingDocumentService additionalHearingDocumentService, HasApprovableCollectionReader hasApprovableCollectionReader, From 13029a925890526d8d8486b780af4160c79bed35 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:05:08 +0000 Subject: [PATCH 333/336] remove assertNotNull --- .../service/processorders/ProcessOrderServiceTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java index cb60ef76db..3d2ff9a3cc 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java @@ -34,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; @@ -320,9 +319,7 @@ void shouldConvertToPdfAndStampDocument() { CaseDocument result = underTest.convertToPdfAndStampDocument(caseDetails, documentA, authorisationToken); - assertNotNull(result); assertEquals(stampedDocument, result); - verify(documentHelper).getStampType(caseDetails.getData()); verify(genericDocumentService).stampDocument(documentA, authorisationToken, stampType, String.valueOf(caseDetails.getId())); } From 74487e3bcf3d3c306ab0452dfb43e7705c8d9e4d Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Fri, 17 Jan 2025 15:20:20 +0000 Subject: [PATCH 334/336] refactor solution to use method directly in GenericDocumentService --- ...ectionUploadOrderAboutToSubmitHandler.java | 34 ++++++++---- .../processorder/ProcessOrderService.java | 18 ------- ...ionUploadOrderAboutToStartHandlerTest.java | 2 +- ...onUploadOrderAboutToSubmitHandlerTest.java | 52 ++++++++++++------- .../ProcessOrderServiceTest.java | 40 -------------- 5 files changed, 57 insertions(+), 89 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java index 2c30447765..6c655771e1 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandler.java @@ -6,6 +6,7 @@ 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.error.CourtDetailsParseException; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; @@ -21,8 +22,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.document.DocumentCategory; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.util.ArrayList; import java.util.List; @@ -43,16 +45,19 @@ public class DirectionUploadOrderAboutToSubmitHandler extends FinremCallbackHand private final HasApprovableCollectionReader hasApprovableCollectionReader; - private final ProcessOrderService processOrderService; + private final DocumentHelper documentHelper; + + private final GenericDocumentService genericDocumentService; public DirectionUploadOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, AdditionalHearingDocumentService additionalHearingDocumentService, HasApprovableCollectionReader hasApprovableCollectionReader, - ProcessOrderService processOrderService) { + DocumentHelper documentHelper, GenericDocumentService genericDocumentService) { super(finremCaseDetailsMapper); this.additionalHearingDocumentService = additionalHearingDocumentService; this.hasApprovableCollectionReader = hasApprovableCollectionReader; - this.processOrderService = processOrderService; + this.genericDocumentService = genericDocumentService; + this.documentHelper = documentHelper; } @Override @@ -110,8 +115,11 @@ private void handleDraftOrderDocuments(FinremCaseDetails caseDetails, String aut getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> collector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { - CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, - unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); + + StampType stampType = documentHelper.getStampType(caseData); + CaseDocument stampedDoc = genericDocumentService.stampDocument( + unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation, stampType, + String.valueOf(caseDetails.getId())); stampedDoc.setCategoryId( DocumentCategory.APPROVED_ORDERS.getDocumentCategoryId()); @@ -129,8 +137,11 @@ private void handlePsaDocuments(FinremCaseDetails caseDetails, String authorisat getApprovedDocumentsToProcess(caseData) .forEach(unprocessedApprovedOrder -> psaCollector.stream().filter(psa -> doesDocumentMatch(psa, unprocessedApprovedOrder)).forEach(toBeUpdated -> { - CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, - unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); + + StampType stampType = documentHelper.getStampType(caseData); + CaseDocument stampedDoc = genericDocumentService.stampDocument( + unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation, stampType, + String.valueOf(caseDetails.getId())); stampedDoc.setCategoryId( DocumentCategory.APPROVED_ORDERS.getDocumentCategoryId()); @@ -149,8 +160,11 @@ private void handleAgreedDraftOrdersCollection(FinremCaseDetails caseDetails, St .forEach(unprocessedApprovedOrder -> agreedOrderCollector.stream().filter(agreedDraftOrder -> doesDocumentMatch(agreedDraftOrder, unprocessedApprovedOrder)) .forEach(toBeUpdated -> { - CaseDocument stampedDoc = processOrderService.convertToPdfAndStampDocument(caseDetails, - unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation); + + StampType stampType = documentHelper.getStampType(caseData); + CaseDocument stampedDoc = genericDocumentService.stampDocument( + unprocessedApprovedOrder.getValue().getUploadDraftDocument(), authorisation, stampType, + String.valueOf(caseDetails.getId())); stampedDoc.setCategoryId(unprocessedApprovedOrder.getValue().getUploadDraftDocument().getCategoryId()); toBeUpdated.getValue().setOrderStatus(PROCESSED); diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java index 6fed021aa4..6f911eb992 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java @@ -3,19 +3,15 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; 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.draftorders.HasApprovable; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import java.util.ArrayList; @@ -32,8 +28,6 @@ public class ProcessOrderService { private final HasApprovableCollectionReader hasApprovableCollectionReader; - private final DocumentHelper documentHelper; - private final GenericDocumentService genericDocumentService; private static List nullSafeList(List t) { return ofNullable(t).orElse(List.of()); @@ -148,16 +142,4 @@ private boolean areAllNewDocumentsPdf(List afterList) private boolean isUploadHearingOrderEmpty(FinremCaseData caseData) { return nullSafeList(caseData.getUploadHearingOrder()).isEmpty(); } - - public CaseDocument convertToPdfAndStampDocument(FinremCaseDetails caseDetails, - CaseDocument document, - String authorisationToken) { - - String caseId = String.valueOf(caseDetails.getId()); - FinremCaseData caseData = caseDetails.getData(); - StampType stampType = documentHelper.getStampType(caseData); - - return genericDocumentService.stampDocument(document, - authorisationToken, stampType, caseId); - } } diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java index 1e26ee5585..7c6d0a92a6 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToStartHandlerTest.java @@ -59,7 +59,7 @@ class DirectionUploadOrderAboutToStartHandlerTest { private GenericDocumentService genericDocumentService; @Spy - private ProcessOrderService processOrderService = new ProcessOrderService(hasApprovableCollectionReader, documentHelper, genericDocumentService); + private ProcessOrderService processOrderService = new ProcessOrderService(hasApprovableCollectionReader); @Test void testCanHandle() { diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index 94423c6d3e..e1bdfe84e6 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -12,6 +12,7 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.FinremCallbackRequestFactory; import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse; import uk.gov.hmcts.reform.finrem.caseorchestration.error.CourtDetailsParseException; +import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; @@ -28,8 +29,9 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; import uk.gov.hmcts.reform.finrem.caseorchestration.service.AdditionalHearingDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; +import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; import java.util.ArrayList; import java.util.List; @@ -51,6 +53,7 @@ import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.APPROVED_BY_JUDGE; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.PROCESSED; import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.OrderStatus.TO_BE_REVIEWED; +import static uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType.FAMILY_COURT_STAMP; import static uk.gov.hmcts.reform.finrem.caseorchestration.test.Assertions.assertCanHandle; @ExtendWith(MockitoExtension.class) @@ -74,7 +77,10 @@ class DirectionUploadOrderAboutToSubmitHandlerTest { private AdditionalHearingDocumentService additionalHearingDocumentService; @Mock - private ProcessOrderService processOrderService; + private GenericDocumentService genericDocumentService; + + @Mock + private DocumentHelper documentHelper; @Test void testCanHandle() { @@ -218,16 +224,18 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_1), - any(String.class))).thenReturn(stampedDocumentA); + when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); + + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_1), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentA); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_2), - any(String.class))).thenReturn(stampedDocumentB); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_2), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(4)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), - any(CaseDocument.class), any(String.class)); + verify(genericDocumentService, times(4)).stampDocument(any(CaseDocument.class), eq(AUTH_TOKEN), + eq(StampType.FAMILY_COURT_STAMP), any(String.class)); //Check DraftOrderDocReviewCollection is updated assertEquals(stampedDocumentA, test1.getValue().getDraftOrderDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); @@ -291,16 +299,18 @@ void shouldMarkPsaCollectionProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_1), - any(String.class))).thenReturn(stampedDocumentA); + when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_2), - any(String.class))).thenReturn(stampedDocumentB); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_1), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentA); + + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_2), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(4)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), - any(CaseDocument.class), any(String.class)); + verify(genericDocumentService, times(4)).stampDocument(any(CaseDocument.class), eq(AUTH_TOKEN), + eq(StampType.FAMILY_COURT_STAMP), any(String.class)); //Check PsaDocReviewCollection is updated assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); assertEquals(PROCESSED, test1.getValue().getOrderStatus()); @@ -359,16 +369,18 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { .build()) .build()); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_3), - any(String.class))).thenReturn(stampedDocumentA); + when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); + + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_3), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentA); - when(processOrderService.convertToPdfAndStampDocument(any(FinremCaseDetails.class), eq(TARGET_DOCUMENT_4), - any(String.class))).thenReturn(stampedDocumentB); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_4), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentB); underTest.handle(finremCallbackRequest, AUTH_TOKEN); - verify(processOrderService, times(4)).convertToPdfAndStampDocument(any(FinremCaseDetails.class), - any(CaseDocument.class), any(String.class)); + verify(genericDocumentService, times(4)).stampDocument(any(CaseDocument.class), eq(AUTH_TOKEN), + eq(StampType.FAMILY_COURT_STAMP), any(String.class)); //Check PsaDocReviewCollection is updated assertEquals(PROCESSED, test1.getValue().getOrderStatus()); assertEquals(stampedDocumentA, test1.getValue().getPsaDocument()); diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java index 3d2ff9a3cc..5ddeacca3c 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorders/ProcessOrderServiceTest.java @@ -6,15 +6,12 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.hmcts.reform.finrem.caseorchestration.helper.DocumentHelper; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection; 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.draftorders.review.DraftOrderDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrderDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.DraftOrdersReview; @@ -23,8 +20,6 @@ import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocReviewCollection; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.draftorders.review.PsaDocumentReview; import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftOrdersWrapper; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService; -import uk.gov.hmcts.reform.finrem.caseorchestration.service.StampType; import uk.gov.hmcts.reform.finrem.caseorchestration.service.draftorders.HasApprovableCollectionReader; import uk.gov.hmcts.reform.finrem.caseorchestration.service.processorder.ProcessOrderService; @@ -57,12 +52,6 @@ class ProcessOrderServiceTest { @InjectMocks private ProcessOrderService underTest; - @Mock - private DocumentHelper documentHelper; - - @Mock - private GenericDocumentService genericDocumentService; - @SuppressWarnings("unchecked") @Test void testPopulateUnprocessedApprovedDocuments() { @@ -295,35 +284,6 @@ void testAreAllModifyingUnprocessedOrdersWordDocuments(List Date: Fri, 17 Jan 2025 15:33:12 +0000 Subject: [PATCH 335/336] checkstyle fix --- ...onUploadOrderAboutToSubmitHandlerTest.java | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java index e1bdfe84e6..290b7f4df0 100644 --- a/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/DirectionUploadOrderAboutToSubmitHandlerTest.java @@ -187,6 +187,12 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { CaseDocument stampedDocumentA = CaseDocument.builder().documentFilename("stampedA.pdf").build(); CaseDocument stampedDocumentB = CaseDocument.builder().documentFilename("stampedB.pdf").build(); + when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_1), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentA); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_2), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentB); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() .unprocessedApprovedDocuments(List.of( @@ -224,14 +230,6 @@ void shouldMarkDraftOrdersReviewCollectionProcessed() { .build()) .build()); - when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); - - when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_1), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) - .thenReturn(stampedDocumentA); - - when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_2), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) - .thenReturn(stampedDocumentB); - underTest.handle(finremCallbackRequest, AUTH_TOKEN); verify(genericDocumentService, times(4)).stampDocument(any(CaseDocument.class), eq(AUTH_TOKEN), @@ -262,6 +260,12 @@ void shouldMarkPsaCollectionProcessed() { CaseDocument stampedDocumentA = CaseDocument.builder().documentFilename("stampedA.pdf").build(); CaseDocument stampedDocumentB = CaseDocument.builder().documentFilename("stampedB.pdf").build(); + when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_1), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentA); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_2), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentB); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() .unprocessedApprovedDocuments(List.of( @@ -299,14 +303,6 @@ void shouldMarkPsaCollectionProcessed() { .build()) .build()); - when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); - - when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_1), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) - .thenReturn(stampedDocumentA); - - when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_2), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) - .thenReturn(stampedDocumentB); - underTest.handle(finremCallbackRequest, AUTH_TOKEN); verify(genericDocumentService, times(4)).stampDocument(any(CaseDocument.class), eq(AUTH_TOKEN), @@ -336,6 +332,12 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { CaseDocument stampedDocumentA = CaseDocument.builder().documentFilename("stampedA.pdf").build(); CaseDocument stampedDocumentB = CaseDocument.builder().documentFilename("stampedB.pdf").build(); + when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_3), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentA); + when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_4), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) + .thenReturn(stampedDocumentB); + FinremCallbackRequest finremCallbackRequest = FinremCallbackRequestFactory.from(FinremCaseData.builder() .draftOrdersWrapper(DraftOrdersWrapper.builder() .unprocessedApprovedDocuments(List.of( @@ -369,14 +371,6 @@ void shouldReplaceApprovedDocumentAndMarkAsProcessed() { .build()) .build()); - when(documentHelper.getStampType(any(FinremCaseData.class))).thenReturn(FAMILY_COURT_STAMP); - - when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_3), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) - .thenReturn(stampedDocumentA); - - when(genericDocumentService.stampDocument(eq(TARGET_DOCUMENT_4), eq(AUTH_TOKEN), eq(FAMILY_COURT_STAMP), any(String.class))) - .thenReturn(stampedDocumentB); - underTest.handle(finremCallbackRequest, AUTH_TOKEN); verify(genericDocumentService, times(4)).stampDocument(any(CaseDocument.class), eq(AUTH_TOKEN), From 9670210be9f0d6103ac76a8db84538ae8d398fd5 Mon Sep 17 00:00:00 2001 From: hamzahtahirhmcts <162336174+hamzahtahirhmcts@users.noreply.github.com> Date: Mon, 20 Jan 2025 09:13:40 +0000 Subject: [PATCH 336/336] revert empty line --- .../service/processorder/ProcessOrderService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java index 6f911eb992..464108e2f5 100644 --- a/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/processorder/ProcessOrderService.java @@ -142,4 +142,5 @@ private boolean areAllNewDocumentsPdf(List afterList) private boolean isUploadHearingOrderEmpty(FinremCaseData caseData) { return nullSafeList(caseData.getUploadHearingOrder()).isEmpty(); } + }