CIV-14664 Test Service PR to update Judgments Tab in ExUI

Jenkinsfile_CNP

@@ -8,7 +8,7 @@ import uk.gov.hmcts.contino.GithubAPI
 def type = "java"
 def product = "civil"
 def component = "service"
-def ccdBranch = "master"
+def ccdBranch = "feat/CIV-14664_CCD"
 def camundaBranch = "master"
 def yarnBuilder = new uk.gov.hmcts.contino.YarnBuilder(this)
 

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/DefaultJudgementSpecHandler.java

@@ -23,6 +23,7 @@
 import uk.gov.hmcts.reform.civil.model.RegistrationInformation;
 import uk.gov.hmcts.reform.civil.model.common.DynamicList;
 import uk.gov.hmcts.reform.civil.model.common.Element;
+import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentDetails;
 import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
 import uk.gov.hmcts.reform.civil.service.FeesService;
 import uk.gov.hmcts.reform.civil.service.Time;
@@ -426,6 +427,13 @@ private CallbackResponse repaymentValidate(CallbackParams callbackParams) {
 
     private CallbackResponse generateClaimForm(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
+        if (featureToggleService.isJudgmentOnlineLive()) {
+            JudgmentDetails activeJudgment = djOnlineMapper.addUpdateActiveJudgment(caseData);
+            caseData.setActiveJudgment(activeJudgment);
+            caseData.setJoRepaymentSummaryObject(JudgmentsOnlineHelper.calculateRepaymentBreakdownSummary(activeJudgment));
+            caseData.setJoIsLiveJudgmentExists(YesOrNo.YES);
+        }
+
         CaseData.CaseDataBuilder caseDataBuilder = caseData.toBuilder();
         String nextState;
 

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/EditJudgmentCallbackHandler.java

@@ -97,16 +97,20 @@ private CallbackResponse buildConfirmation(CallbackParams callbackParams) {
 
     private CallbackResponse saveJudgmentDetails(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
+        CaseData.CaseDataBuilder<?, ?> caseDataBuilder = caseData.toBuilder();
         List<String> errors = new ArrayList<>();
+
         if (caseData.getJoIsRegisteredWithRTL() == YesOrNo.YES) {
-            caseData.setJoIssuedDate(caseData.getJoOrderMadeDate());
+            caseDataBuilder.joIssuedDate(caseData.getJoOrderMadeDate());
         }
+
         if (caseData.getActiveJudgment() != null) {
-            caseData.setActiveJudgment(editJudgmentOnlineMapper.addUpdateActiveJudgment(caseData));
+            JudgmentDetails activeJudgment = editJudgmentOnlineMapper.addUpdateActiveJudgment(caseData);
+            caseDataBuilder.activeJudgment(activeJudgment);
+            caseDataBuilder.joRepaymentSummaryObject(JudgmentsOnlineHelper.calculateRepaymentBreakdownSummary(activeJudgment));
         } else {
             errors.add("There is no active judgment to edit");
         }
-        CaseData.CaseDataBuilder<?, ?> caseDataBuilder = caseData.toBuilder();
 
         if (caseData.getJoJudgmentRecordReason() == JudgmentRecordedReason.DETERMINATION_OF_MEANS) {
             caseDataBuilder.businessProcess(BusinessProcess.ready(NOTIFY_JUDGMENT_VARIED_DETERMINATION_OF_MEANS));

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/JudgmentPaidInFullCallbackHandler.java

@@ -68,8 +68,9 @@ private String getBody() {
 
     private CallbackResponse saveJudgmentPaidInFullDetails(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
-        caseData.setJoIsLiveJudgmentExists(YesOrNo.NO);
-        paidInFullJudgmentOnlineMapper.moveToHistoricJudgment(caseData);
+        caseData.setJoIsLiveJudgmentExists(YesOrNo.YES);
+        caseData.setActiveJudgment(paidInFullJudgmentOnlineMapper.addUpdateActiveJudgment(caseData));
+        caseData.setJoRepaymentSummaryObject(JudgmentsOnlineHelper.calculateRepaymentBreakdownSummary(caseData.getActiveJudgment()));
         CaseData.CaseDataBuilder<?, ?> caseDataBuilder = caseData.toBuilder();
         return AboutToStartOrSubmitCallbackResponse.builder()
             .data(caseDataBuilder.build().toMap(objectMapper))

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/RecordJudgmentCallbackHandler.java

@@ -97,6 +97,8 @@ private CallbackResponse saveJudgmentDetails(CallbackParams callbackParams) {
             caseData.setJoIssuedDate(caseData.getJoOrderMadeDate());
         }
         caseData.setActiveJudgment(recordJudgmentOnlineMapper.addUpdateActiveJudgment(caseData));
+        caseData.setJoRepaymentSummaryObject(JudgmentsOnlineHelper.calculateRepaymentBreakdownSummary(caseData.getActiveJudgment()));
+
         CaseData.CaseDataBuilder<?, ?> caseDataBuilder = caseData.toBuilder();
         if (caseData.getJoJudgmentRecordReason() == JudgmentRecordedReason.DETERMINATION_OF_MEANS) {
             caseDataBuilder.businessProcess(BusinessProcess.ready(RECORD_JUDGMENT_NOTIFICATION));
@@ -110,4 +112,5 @@ private CallbackResponse saveJudgmentDetails(CallbackParams callbackParams) {
     public List<CaseEvent> handledEvents() {
         return EVENTS;
     }
+
 }

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/RequestJudgementByAdmissionForSpecCuiCallbackHandler.java

@@ -15,6 +15,7 @@
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.helpers.judgmentsonline.JudgmentByAdmissionOnlineMapper;
+import uk.gov.hmcts.reform.civil.helpers.judgmentsonline.JudgmentsOnlineHelper;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CCJPaymentDetails;
 import uk.gov.hmcts.reform.civil.model.CaseData;
@@ -117,6 +118,7 @@ private CallbackResponse updateBusinessProcessToReady(CallbackParams callbackPar
         if (featureToggleService.isJudgmentOnlineLive()) {
             data.setActiveJudgment(judgmentByAdmissionOnlineMapper.addUpdateActiveJudgment(data));
             data.setJoIsLiveJudgmentExists(YesOrNo.YES);
+            data.setJoRepaymentSummaryObject(JudgmentsOnlineHelper.calculateRepaymentBreakdownSummary(data.getActiveJudgment()));
         }
 
         CaseData.CaseDataBuilder caseDataBuilder = data.toBuilder()

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/RespondToDefenceSpecCallbackHandler.java

@@ -27,6 +27,7 @@
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.helpers.LocationHelper;
 import uk.gov.hmcts.reform.civil.helpers.judgmentsonline.JudgmentByAdmissionOnlineMapper;
+import uk.gov.hmcts.reform.civil.helpers.judgmentsonline.JudgmentsOnlineHelper;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.RespondToClaim;
@@ -37,6 +38,7 @@
 import uk.gov.hmcts.reform.civil.model.dq.Hearing;
 import uk.gov.hmcts.reform.civil.model.dq.RequestedCourt;
 import uk.gov.hmcts.reform.civil.model.dq.SmallClaimHearing;
+import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentDetails;
 import uk.gov.hmcts.reform.civil.referencedata.model.LocationRefData;
 import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
 import uk.gov.hmcts.reform.civil.service.JudgementService;
@@ -428,8 +430,10 @@ && isOneVOne(caseData)) {
                     nextState = CaseState.PROCEEDS_IN_HERITAGE_SYSTEM.name();
                 }
                 if (featureToggleService.isJudgmentOnlineLive()) {
-                    builder.activeJudgment(judgmentByAdmissionOnlineMapper.addUpdateActiveJudgment(caseData));
+                    JudgmentDetails activeJudgment = judgmentByAdmissionOnlineMapper.addUpdateActiveJudgment(caseData);
+                    builder.activeJudgment(activeJudgment);
                     builder.joIsLiveJudgmentExists(YesOrNo.YES);
+                    builder.joRepaymentSummaryObject(JudgmentsOnlineHelper.calculateRepaymentBreakdownSummary(activeJudgment));
                 }
             } else if (caseData.hasApplicantRejectedRepaymentPlan()) {
                 nextState = CaseState.PROCEEDS_IN_HERITAGE_SYSTEM.name();

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/SetAsideJudgmentCallbackHandler.java

@@ -80,6 +80,7 @@ private CallbackResponse saveJudgmentDetails(CallbackParams callbackParams) {
 
         CaseData caseData = callbackParams.getCaseData();
         caseData.setJoIsLiveJudgmentExists(YesOrNo.NO);
+        caseData.setJoIsDisplayInJudgmentTab(YesOrNo.NO);
         setAsideJudgmentOnlineMapper.moveToHistoricJudgment(caseData);
 
         CaseData.CaseDataBuilder<?, ?> caseDataBuilder = caseData.toBuilder();

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

@@ -15,7 +15,6 @@
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentType;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.PaymentFrequency;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.PaymentPlanSelection;
-import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentRTLStatus;
 import uk.gov.hmcts.reform.civil.utils.InterestCalculator;
 import uk.gov.hmcts.reform.civil.utils.MonetaryConversions;
 
@@ -39,7 +38,7 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
         isNonDivergent =  JudgmentsOnlineHelper.isNonDivergentForDJ(caseData);
         JudgmentDetails activeJudgment = super.addUpdateActiveJudgment(caseData);
         activeJudgment = super.updateDefendantDetails(activeJudgment, caseData);
-        return activeJudgment.toBuilder()
+        JudgmentDetails judgmentDetails = activeJudgment.toBuilder()
             .createdTimestamp(LocalDateTime.now())
             .state(getJudgmentState(caseData))
             .type(JudgmentType.DEFAULT_JUDGMENT)
@@ -53,6 +52,9 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
             .costs(costs.toString())
             .totalAmount(orderAmount.add(costs).toString())
             .build();
+        super.updateJudgmentTabDataWithActiveJudgment(judgmentDetails, caseData);
+
+        return judgmentDetails;
     }
 
     @Override
@@ -103,4 +105,5 @@ private PaymentPlanSelection getPaymentPlanSeletion(DJPaymentTypeSelection payme
     private LocalDate getPaymentDeadLineDate(CaseData caseData) {
         return DJPaymentTypeSelection.SET_DATE.equals(caseData.getPaymentTypeSelection()) ? caseData.getPaymentSetDate() : null;
     }
+
 }

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

@@ -2,13 +2,15 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentDetails;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentRTLStatus;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentState;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentType;
+import uk.gov.hmcts.reform.civil.utils.MonetaryConversions;
 
 import java.math.BigDecimal;
 
@@ -21,6 +23,9 @@ public class EditJudgmentOnlineMapper extends JudgmentOnlineMapper {
     public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
         BigDecimal orderAmount = JudgmentsOnlineHelper.getMoneyValue(caseData.getJoAmountOrdered());
         BigDecimal costs = JudgmentsOnlineHelper.getMoneyValue(caseData.getJoAmountCostOrdered());
+        BigDecimal claimFeeAmount = JudgmentsOnlineHelper.getMoneyValue(
+            MonetaryConversions.poundsToPennies(getClaimFeeAmount(caseData)).toString()
+        );
         JudgmentDetails activeJudgment = caseData.getActiveJudgment();
         if (activeJudgment != null) {
             activeJudgment = activeJudgment.toBuilder()
@@ -32,12 +37,24 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
                 .issueDate(caseData.getJoOrderMadeDate())
                 .orderedAmount(orderAmount.toString())
                 .costs(costs.toString())
-                .totalAmount(orderAmount.add(costs).toString())
+                .totalAmount(orderAmount.add(costs).add(claimFeeAmount).toString())
                 .build();
+            super.updateJudgmentTabDataWithActiveJudgment(activeJudgment, caseData);
         }
+
         return activeJudgment;
     }
 
+    @NotNull
+    private BigDecimal getClaimFeeAmount(CaseData caseData) {
+        return caseData.getCcjPaymentDetails() != null
+            ? getValue(caseData.getCcjPaymentDetails().getCcjJudgmentAmountClaimFee()) : BigDecimal.ZERO;
+    }
+
+    private BigDecimal getValue(BigDecimal value) {
+        return value != null ? value : BigDecimal.ZERO;
+    }
+
     @Override
     protected JudgmentState getJudgmentState(CaseData caseData) {
         return JudgmentState.MODIFIED;

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

@@ -36,13 +36,16 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
 
         BigDecimal costsInPounds = getCosts(caseData);
         BigInteger costs = MonetaryConversions.poundsToPennies(costsInPounds);
-        BigInteger orderAmount = MonetaryConversions.poundsToPennies(getOrderAmount(caseData, costsInPounds));
+        BigInteger orderAmount = MonetaryConversions.poundsToPennies(getOrderAmount(caseData));
+        BigInteger claimFeeAmount = MonetaryConversions.poundsToPennies(getClaimFeeAmount(caseData));
+        BigInteger totalStillOwed = MonetaryConversions.poundsToPennies(getTotalStillOwed(caseData));
+        BigInteger amountAlreadyPaid = MonetaryConversions.poundsToPennies(getAmountAlreadyPaid(caseData));
         isNonDivergent = JudgmentsOnlineHelper.isNonDivergentForJBA(caseData);
         PaymentPlanSelection paymentPlan = getPaymentPlan(caseData);
 
         JudgmentDetails activeJudgment = super.addUpdateActiveJudgment(caseData);
         activeJudgment = super.updateDefendantDetails(activeJudgment, caseData);
-        return activeJudgment.toBuilder()
+        JudgmentDetails activeJudgmentDetails = activeJudgment.toBuilder()
             .createdTimestamp(LocalDateTime.now())
             .state(getJudgmentState(caseData))
             .type(JudgmentType.JUDGMENT_BY_ADMISSION)
@@ -57,14 +60,38 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
             .issueDate(LocalDate.now())
             .orderedAmount(orderAmount.toString())
             .costs(costs.toString())
-            .totalAmount(orderAmount.add(costs).toString())
+            .claimFeeAmount(claimFeeAmount.toString())
+            .amountAlreadyPaid(amountAlreadyPaid.toString())
+            .totalAmount(orderAmount.add(costs).add(claimFeeAmount).toString())
             .build();
+
+        super.updateJudgmentTabDataWithActiveJudgment(activeJudgmentDetails, caseData);
+
+        return activeJudgmentDetails;
+    }
+
+    @NotNull
+    private BigDecimal getOrderAmount(CaseData caseData) {
+        return caseData.getCcjPaymentDetails() != null
+            ? getValue(caseData.getCcjPaymentDetails().getCcjJudgmentAmountClaimAmount()) : BigDecimal.ZERO;
+    }
+
+    @NotNull
+    private BigDecimal getClaimFeeAmount(CaseData caseData) {
+        return caseData.getCcjPaymentDetails() != null
+            ? getValue(caseData.getCcjPaymentDetails().getCcjJudgmentAmountClaimFee()) : BigDecimal.ZERO;
+    }
+
+    @NotNull
+    private BigDecimal getTotalStillOwed(CaseData caseData) {
+        return caseData.getCcjPaymentDetails() != null
+            ? getValue(caseData.getCcjPaymentDetails().getCcjJudgmentTotalStillOwed()) : BigDecimal.ZERO;
     }
 
     @NotNull
-    private BigDecimal getOrderAmount(CaseData caseData, BigDecimal costs) {
+    private BigDecimal getAmountAlreadyPaid(CaseData caseData) {
         return caseData.getCcjPaymentDetails() != null
-            ? getValue(caseData.getCcjPaymentDetails().getCcjJudgmentTotalStillOwed()).subtract(costs) : BigDecimal.ZERO;
+            ? getValue(caseData.getCcjPaymentDetails().getCcjPaymentPaidSomeAmountInPounds()) : BigDecimal.ZERO;
     }
 
     @NotNull

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

@@ -8,6 +8,7 @@
 import uk.gov.hmcts.reform.civil.model.common.Element;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentDetails;
 import uk.gov.hmcts.reform.civil.model.judgmentonline.JudgmentState;
+import uk.gov.hmcts.reform.civil.model.judgmentonline.PaymentPlanSelection;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -61,6 +62,31 @@ public JudgmentDetails updateDefendantDetails(JudgmentDetails activeJudgment, Ca
         return activeJudgment;
     }
 
+    public void updateJudgmentTabDataWithActiveJudgment(JudgmentDetails activeJudgment, CaseData caseData) {
+        caseData.setJoIsDisplayInJudgmentTab(YesOrNo.YES);
+        caseData.setJoDefendantName1(activeJudgment.getDefendant1Name());
+        caseData.setJoDefendantName2(activeJudgment.getDefendant2Name());
+        caseData.setJoPaymentPlanSelected(activeJudgment.getPaymentPlan().getType());
+
+        if (null != activeJudgment.getPaymentPlan()
+            && PaymentPlanSelection.PAY_IN_INSTALMENTS.equals(activeJudgment.getPaymentPlan().getType())) {
+            caseData.setJoRepaymentAmount(activeJudgment.getInstalmentDetails().getAmount());
+            caseData.setJoRepaymentStartDate(activeJudgment.getInstalmentDetails().getStartDate());
+            caseData.setJoRepaymentFrequency(activeJudgment.getInstalmentDetails().getPaymentFrequency());
+        } else {
+            caseData.setJoRepaymentAmount(null);
+            caseData.setJoRepaymentStartDate(null);
+            caseData.setJoRepaymentFrequency(null);
+        }
+
+        if (JudgmentState.CANCELLED.equals(activeJudgment.getState())
+            || JudgmentState.SATISFIED.equals(activeJudgment.getState())) {
+            caseData.setJoIssueDate(activeJudgment.getIssueDate());
+            caseData.setJoState(activeJudgment.getState());
+            caseData.setJoFullyPaymentMadeDate(activeJudgment.getFullyPaymentMadeDate());
+        }
+    }
+
     protected abstract JudgmentState getJudgmentState(CaseData caseData);
 
     private Integer getNextJudgmentId(CaseData caseData) {
@@ -69,8 +95,7 @@ private Integer getNextJudgmentId(CaseData caseData) {
     }
 
     private boolean isHistoricJudgment(JudgmentDetails activeJudgment) {
-        return JudgmentState.CANCELLED.equals(activeJudgment.getState())
-            || JudgmentState.SET_ASIDE_ERROR.equals(activeJudgment.getState())
+        return JudgmentState.SET_ASIDE_ERROR.equals(activeJudgment.getState())
             || JudgmentState.SET_ASIDE.equals(activeJudgment.getState());
     }
 }

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

@@ -20,13 +20,17 @@ public JudgmentDetails addUpdateActiveJudgment(CaseData caseData) {
 
         JudgmentDetails activeJudgment = caseData.getActiveJudgment();
         JudgmentState state = getJudgmentState(caseData);
-        return activeJudgment.toBuilder()
+        JudgmentDetails activeJudgmentDetails = activeJudgment.toBuilder()
             .state(state)
             .fullyPaymentMadeDate(caseData.getJoJudgmentPaidInFull().getDateOfFullPaymentMade())
             .lastUpdateTimeStamp(LocalDateTime.now())
             .cancelledTimeStamp(JudgmentState.CANCELLED.equals(state) ? LocalDateTime.now() : null)
             .cancelDate(JudgmentState.CANCELLED.equals(state) ? LocalDate.now() : null)
             .build();
+
+        super.updateJudgmentTabDataWithActiveJudgment(activeJudgmentDetails, caseData);
+
+        return activeJudgmentDetails;
     }
 
     protected JudgmentState getJudgmentState(CaseData caseData) {