DTSCCI-3902: Update COSC Generation Rules to use a Calendar Month

src/main/java/uk/gov/hmcts/reform/civil/callback/CaseEvent.java

@@ -642,7 +642,8 @@ public enum CaseEvent {
     UPLOAD_TRANSLATED_DOCUMENT_HEARING_SCHEDULED(CAMUNDA),
     ADD_APPLICATION_TO_TRANSLATION_COLLECTION(CAMUNDA),
     UPLOAD_TRANSLATED_DOCUMENT_FOR_FREE_FEE_APPLICATION(CAMUNDA),
-    UPLOAD_TRANSLATED_DOCUMENT_FINAL_ORDER(CAMUNDA);
+    UPLOAD_TRANSLATED_DOCUMENT_FINAL_ORDER(CAMUNDA),
+    UPDATE_COSC_VARIABLE(CAMUNDA);
 
     private final UserType userType;
 

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/DashboardScenarios.java

@@ -258,6 +258,9 @@ public enum DashboardScenarios {
     SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_DEFENDANT("Scenario.AAA6.ProofOfDebtPayment.Confirmation.Defendant"),
     SCENARIO_AAA6_DEFENDANT_NOTICE_OF_CHANGE_JBA_CLAIM_MOVES_OFFLINE_CLAIMANT("Scenario.AAA6.DefendantNoticeOfChange.JudgmentByAdmissionClaimMovesOffline.Claimant"),
 
+    SCENARIO_AAA6_MARK_PAID_IN_FULL_CLAIMANT("Scenario.AAA6.MarkPaidInFull.Confirmation.Claimant"),
+    SCENARIO_AAA6_MARK_PAID_IN_FULL_DEFENDANT("Scenario.AAA6.MarkPaidInFull.Confirmation.Defendant"),
+
     //General Application
     SCENARIO_AAA6_GENERAL_APPLICATION_SUBMITTED_NONURGENT_RESPONDENT("Scenario.AAA6.GeneralApps.NonUrgentApplicationMade.Respondent"),
     SCENARIO_AAA6_GENERAL_APPLICATION_SUBMITTED_URGENT_RESPONDENT("Scenario.AAA6.GeneralApps.UrgentApplicationMade.Respondent"),

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/claimant/JudgmentPaidClaimantNotificationHandler.java

@@ -14,6 +14,8 @@
 
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.UPDATE_DASHBOARD_NOTIFICATIONS_JUDGMENT_PAID_CLAIMANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_MARK_PAID_IN_FULL_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.utils.MarkPaidInFullUtil.checkMarkPaidInFull;
 
 @Service
 public class JudgmentPaidClaimantNotificationHandler extends DashboardCallbackHandler {
@@ -39,6 +41,9 @@ public List<CaseEvent> handledEvents() {
 
     @Override
     public String getScenario(CaseData caseData) {
+        if (checkMarkPaidInFull(caseData)) {
+            return SCENARIO_AAA6_MARK_PAID_IN_FULL_CLAIMANT.getScenario();
+        }
         return SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_CLAIMANT.getScenario();
     }
 

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/defendant/JudgmentPaidDefendantNotificationHandler.java

@@ -14,6 +14,8 @@
 
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.UPDATE_DASHBOARD_NOTIFICATIONS_JUDGMENT_PAID_DEFENDANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_DEFENDANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_MARK_PAID_IN_FULL_DEFENDANT;
+import static uk.gov.hmcts.reform.civil.utils.MarkPaidInFullUtil.checkMarkPaidInFull;
 
 @Service
 public class JudgmentPaidDefendantNotificationHandler extends DashboardCallbackHandler {
@@ -39,6 +41,9 @@ public List<CaseEvent> handledEvents() {
 
     @Override
     public String getScenario(CaseData caseData) {
+        if (checkMarkPaidInFull(caseData)) {
+            return SCENARIO_AAA6_MARK_PAID_IN_FULL_DEFENDANT.getScenario();
+        }
         return SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_DEFENDANT.getScenario();
     }
 

src/main/java/uk/gov/hmcts/reform/civil/handler/tasks/CaseEventTaskHandler.java

@@ -1,8 +1,5 @@
 package uk.gov.hmcts.reform.civil.handler.tasks;
 
-import java.util.Map;
-import java.util.Objects;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -17,16 +14,19 @@
 import uk.gov.hmcts.reform.civil.callback.CaseEvent;
 import uk.gov.hmcts.reform.civil.exceptions.InvalidCaseDataException;
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
-import uk.gov.hmcts.reform.civil.model.ExternalTaskData;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
+import uk.gov.hmcts.reform.civil.model.ExternalTaskData;
 import uk.gov.hmcts.reform.civil.service.CoreCaseDataService;
 import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
 import uk.gov.hmcts.reform.civil.service.data.ExternalTaskInput;
 import uk.gov.hmcts.reform.civil.service.flowstate.FlowState;
 import uk.gov.hmcts.reform.civil.service.flowstate.IStateFlowEngine;
 import uk.gov.hmcts.reform.civil.service.robotics.support.RoboticsEventTextFormatter;
 
+import java.util.Map;
+import java.util.Objects;
+
 import static java.lang.String.format;
 import static java.util.Optional.ofNullable;
 import static uk.gov.hmcts.reform.civil.enums.CaseCategory.SPEC_CLAIM;
@@ -40,6 +40,7 @@
 import static uk.gov.hmcts.reform.civil.enums.UnrepresentedOrUnregisteredScenario.UNREPRESENTED;
 import static uk.gov.hmcts.reform.civil.enums.UnrepresentedOrUnregisteredScenario.getDefendantNames;
 import static uk.gov.hmcts.reform.civil.enums.YesOrNo.YES;
+import static uk.gov.hmcts.reform.civil.utils.MarkPaidInFullUtil.checkMarkPaidInFull;
 
 @RequiredArgsConstructor
 @Component
@@ -91,6 +92,7 @@ public VariableMap getVariableMap(ExternalTaskData externalTaskData) {
         var stateFlow = stateFlowEngine.getStateFlow(data);
         variables.putValue(FLOW_STATE, stateFlow.getState().getName());
         variables.putValue(FLOW_FLAGS, stateFlow.getFlags());
+        variables.putValue("isJudgmentMarkedPaidInFull", checkMarkPaidInFull(data));
         return variables;
     }
 

src/main/java/uk/gov/hmcts/reform/civil/helpers/judgmentsonline/JudgmentPaidInFullOnlineMapper.java

@@ -48,11 +48,13 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
     }
 
     protected JudgmentState getJudgmentState(CaseData caseData, LocalDate paymentDate) {
-        boolean paidAfter31Days = JudgmentsOnlineHelper.checkIfDateDifferenceIsGreaterThan31Days(
-            caseData.getActiveJudgment().getIssueDate(),
+        LocalDate issueDate = caseData.getActiveJudgment().getIssueDate();
+        log.info("Getting Judgment State based on issueDate date: {}, eligible days: {}", issueDate, issueDate.lengthOfMonth());
+        boolean paidAfterEligibleDays = JudgmentsOnlineHelper.checkIfDateDifferenceIsGreaterThanDaysInMonth(
+            issueDate,
             nonNull(paymentDate) ? paymentDate : caseData.getJoJudgmentPaidInFull().getDateOfFullPaymentMade()
         );
-        return paidAfter31Days ? JudgmentState.SATISFIED : JudgmentState.CANCELLED;
+        return paidAfterEligibleDays ? JudgmentState.SATISFIED : JudgmentState.CANCELLED;
     }
 
     protected JudgmentState getJudgmentState(CaseData caseData) {

src/main/java/uk/gov/hmcts/reform/civil/helpers/judgmentsonline/JudgmentsOnlineHelper.java

@@ -29,7 +29,7 @@ public class JudgmentsOnlineHelper {
     private static final String ERROR_MESSAGE_DATE_FIRST_INSTALMENT_MUST_BE_IN_FUTURE = "Date of first instalment must be in the future";
     private static final String ERROR_MESSAGE_DATE_ORDER_MUST_BE_IN_PAST = "Date judge made the order must be in the past";
 
-    private static final String regex = "[ˆ`´¨]";
+    private static final String REGEX = "[ˆ`´¨]";
 
     private JudgmentsOnlineHelper() {
     }
@@ -39,8 +39,8 @@ public static boolean validateIfFutureDate(LocalDate date) {
         return date.isAfter(today);
     }
 
-    public static boolean checkIfDateDifferenceIsGreaterThan31Days(LocalDate firstDate, LocalDate secondDate) {
-        return ChronoUnit.DAYS.between(firstDate, secondDate) > 31;
+    public static boolean checkIfDateDifferenceIsGreaterThanDaysInMonth(LocalDate firstDate, LocalDate secondDate) {
+        return ChronoUnit.DAYS.between(firstDate, secondDate) > firstDate.lengthOfMonth();
     }
 
     public static List<String> validateMidCallbackData(CaseData caseData) {
@@ -295,7 +295,7 @@ public static JudgmentAddress getJudgmentAddress(Address address, RoboticsAddres
     }
 
     public static String removeWelshCharacters(String input) {
-        return input != null ? input.replaceAll(regex, "") : input;
+        return input != null ? input.replaceAll(REGEX, "") : input;
     }
 
     private static String trimDownTo35(String input) {

src/main/java/uk/gov/hmcts/reform/civil/utils/MarkPaidInFullUtil.java

@@ -0,0 +1,19 @@
+package uk.gov.hmcts.reform.civil.utils;
+
+import uk.gov.hmcts.reform.civil.model.CaseData;
+
+import java.util.Objects;
+
+public class MarkPaidInFullUtil {
+
+    private MarkPaidInFullUtil() {
+        //no op
+    }
+
+    public static boolean checkMarkPaidInFull(CaseData data) {
+        return (Objects.nonNull(data.getActiveJudgment())
+            && data.getActiveJudgment().getFullyPaymentMadeDate() != null
+            && Objects.nonNull(data.getCertOfSC())
+            && data.getCertOfSC().getDefendantFinalPaymentDate() != null);
+    }
+}

src/main/resources/db/migration/V2026_03_26_0921__create_new_clamant_and_defendant_mark_paid_in_full_notifications.sql

@@ -0,0 +1,26 @@
+/**
+ * Add scenario to delete claimant notification
+ */
+INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
+VALUES ('Scenario.AAA6.MarkPaidInFull.Confirmation.Claimant',
+        '{
+                              "Notice.AAA6.ProofofDebtPayment.Application.Claimant",
+                              "Notice.AAA6.JudgmentsOnline.DefaultJudgmentIssued.Claimant",
+                              "Notice.AAA6.JudgmentsOnline.IssuedCCJ.Claimant"
+                            }',
+        '{"Notice.AAA6.JudgmentsOnline.PaidInFull.Claimant": []}');
+
+/**
+ * Add scenario to delete defendant notification
+ */
+
+INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
+VALUES ('Scenario.AAA6.MarkPaidInFull.Confirmation.Defendant',
+        '{
+                              "Notice.AAA6.ProofofDebtPayment.Application.Defendant",
+                              "Notice.AAA6.JudgmentsOnline.IssuedCCJ.Defendant",
+                              "Notice.AAA6.JudgmentsOnline.DefaultJudgmentIssued.Defendant"
+                            }',
+        '{"Notice.AAA6.ProofofDebtPayment.ApplicationProcessed.Defendant": []}');
+
+

src/test/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/claimant/JudgmentPaidClaimantNotificationHandlerTest.java

@@ -12,6 +12,8 @@
 import uk.gov.hmcts.reform.civil.handler.callback.BaseCallbackHandlerTest;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.citizenui.CaseDataLiP;
+import uk.gov.hmcts.reform.civil.model.citizenui.CertOfSC;
+import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentDetails;
 import uk.gov.hmcts.reform.civil.sampledata.CallbackParamsBuilder;
 import uk.gov.hmcts.reform.civil.sampledata.CaseDataBuilder;
 import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
@@ -31,6 +33,7 @@
 import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.UPDATE_DASHBOARD_NOTIFICATIONS_JUDGMENT_PAID_CLAIMANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_MARK_PAID_IN_FULL_CLAIMANT;
 
 @ExtendWith(MockitoExtension.class)
 public class JudgmentPaidClaimantNotificationHandlerTest extends BaseCallbackHandlerTest {
@@ -114,5 +117,37 @@ void shouldRecordScenario_whenInvoked_whenClaimantRepresented() {
                 new ScenarioRequestParams(scenarioParams)
             );
         }
+
+        @Test
+        void shouldRecordScenario_whenInvoked_whenClaimantRepresented_And_MarkedPaid_And_Def_Mark_Paid_In_Full() {
+            CaseDataLiP caseDataLiP = new CaseDataLiP();
+            caseDataLiP.setApplicant1SettleClaim(YesOrNo.YES);
+            caseDataLiP.setApplicant1ClaimSettledDate(LocalDate.now());
+            CaseData caseData = CaseDataBuilder.builder().atStateClaimSubmittedSmallClaim()
+                .caseDataLip(caseDataLiP)
+                .applicant1Represented(YesOrNo.NO).build();
+            caseData.setCaseDocumentUploadDate(LocalDateTime.now());
+
+            CaseData.CaseDataBuilder<?, ?> caseData2 = caseData.toBuilder();
+            caseData2.activeJudgment(new JudgmentDetails().setFullyPaymentMadeDate(LocalDate.now()));
+            caseData2.certOfSC(new CertOfSC().setDefendantFinalPaymentDate(LocalDate.now()));
+
+            HashMap<String, Object> scenarioParams = new HashMap<>();
+            when(mapper.mapCaseDataToParams(any())).thenReturn(scenarioParams);
+
+            CallbackParams params = CallbackParamsBuilder.builder().of(ABOUT_TO_SUBMIT, caseData2.build()).request(
+                CallbackRequest.builder().eventId(UPDATE_DASHBOARD_NOTIFICATIONS_JUDGMENT_PAID_CLAIMANT.name()).build()
+            ).build();
+
+            when(featureToggleService.isLipVLipEnabled()).thenReturn(true);
+
+            handler.handle(params);
+            verify(dashboardScenariosService).recordScenarios(
+                "BEARER_TOKEN",
+                SCENARIO_AAA6_MARK_PAID_IN_FULL_CLAIMANT.getScenario(),
+                caseData.getCcdCaseReference().toString(),
+                new ScenarioRequestParams(scenarioParams)
+            );
+        }
     }
 }

src/test/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/defendant/JudgmentPaidDefendantNotificationHandlerTest.java

@@ -12,6 +12,8 @@
 import uk.gov.hmcts.reform.civil.handler.callback.BaseCallbackHandlerTest;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.citizenui.CaseDataLiP;
+import uk.gov.hmcts.reform.civil.model.citizenui.CertOfSC;
+import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentDetails;
 import uk.gov.hmcts.reform.civil.sampledata.CallbackParamsBuilder;
 import uk.gov.hmcts.reform.civil.sampledata.CaseDataBuilder;
 import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
@@ -31,6 +33,7 @@
 import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.UPDATE_DASHBOARD_NOTIFICATIONS_JUDGMENT_PAID_DEFENDANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CLAIMANT_CONFIRMATION_JUDGMENT_PAID_IN_FULL_DEFENDANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_MARK_PAID_IN_FULL_DEFENDANT;
 
 @ExtendWith(MockitoExtension.class)
 public class JudgmentPaidDefendantNotificationHandlerTest extends BaseCallbackHandlerTest {
@@ -116,5 +119,38 @@ void shouldRecordScenario_whenInvoked_whenDefendantRepresented() {
                 new ScenarioRequestParams(scenarioParams)
             );
         }
+
+        @Test
+        void shouldRecordScenario_whenInvoked_whenDefendantRepresented_And_MarkedPaid_And_Def_Mark_Paid_In_Full() {
+            CaseDataLiP caseDataLiP = new CaseDataLiP();
+            caseDataLiP.setApplicant1SettleClaim(YesOrNo.YES);
+            caseDataLiP.setApplicant1ClaimSettledDate(LocalDate.now());
+
+            CaseData caseData = CaseDataBuilder.builder().atStateClaimSubmittedSmallClaim()
+                .caseDataLip(caseDataLiP)
+                .respondent1Represented(YesOrNo.NO).build();
+            caseData.setCaseDocumentUploadDate(LocalDateTime.now());
+
+            CaseData.CaseDataBuilder<?, ?> caseData2 = caseData.toBuilder();
+            caseData2.activeJudgment(new JudgmentDetails().setFullyPaymentMadeDate(LocalDate.now()));
+            caseData2.certOfSC(new CertOfSC().setDefendantFinalPaymentDate(LocalDate.now()));
+
+            HashMap<String, Object> scenarioParams = new HashMap<>();
+            when(mapper.mapCaseDataToParams(any())).thenReturn(scenarioParams);
+
+            CallbackParams params = CallbackParamsBuilder.builder().of(ABOUT_TO_SUBMIT, caseData2.build()).request(
+                CallbackRequest.builder().eventId(UPDATE_DASHBOARD_NOTIFICATIONS_JUDGMENT_PAID_DEFENDANT.name()).build()
+            ).build();
+
+            when(featureToggleService.isLipVLipEnabled()).thenReturn(true);
+
+            handler.handle(params);
+            verify(dashboardScenariosService).recordScenarios(
+                "BEARER_TOKEN",
+                SCENARIO_AAA6_MARK_PAID_IN_FULL_DEFENDANT.getScenario(),
+                caseData.getCcdCaseReference().toString(),
+                new ScenarioRequestParams(scenarioParams)
+            );
+        }
     }
 }