CIV-10045 Claim missing on the Dashboard (#3163)

* CIV-10045: Adding Checking for Case Settled * CIV-10045: Code Smell * CIV-10045: Code Smell * CIV-10045: Code Smell * CIV-10045: Rollback * CIV-10045: Rollback * CIV-10045: Code Smell * CIV-10045: Add back changes * CIV-10045: Code Smell --------- Co-authored-by: Kadir Egilmez <[email protected]> Co-authored-by: neeta-hmcts <[email protected]> Co-authored-by: Pablo Ortiz <[email protected]>
hmcts · Aug 30, 2023 · 65a1e9f · 65a1e9f
1 parent 1e33501
commit 65a1e9f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java
@@ -89,7 +89,8 @@ public boolean isSettled() {
             && (caseData.respondent1PaidInFull()
             || caseData.isResponseAcceptedByClaimant())
             && Objects.isNull(caseData.getCcjPaymentDetails())
-            && !caseData.hasApplicantRejectedRepaymentPlan();
+            && !caseData.hasApplicantRejectedRepaymentPlan()
+            || caseData.isPartAdmitClaimSettled();
     }
 
     @Override
@@ -184,7 +185,7 @@ public boolean hasSdoBeenDrawn() {
 
     @Override
     public boolean isBeforeHearing() {
-        return (isBeforeSmallClaimHearing() || isBeforeFastTrackHearing()) || noHearingScheduled();
+        return isBeforeSmallClaimHearing() || (isBeforeFastTrackHearing() || noHearingScheduled());
     }
 
     private boolean noHearingScheduled() {