From dd43110d9b310af98fbff758d8483d296230579c Mon Sep 17 00:00:00 2001 From: paul-pearson Date: Fri, 28 Feb 2025 16:49:25 +0000 Subject: [PATCH 1/2] CIV-16009 New text for docs being translated --- .../citizenui/CcdDashboardClaimMatcher.java | 17 +++++++++++++++++ .../CcdDashboardClaimantClaimMatcher.java | 5 ----- .../CcdDashboardDefendantClaimMatcher.java | 7 ------- .../reform/civil/model/citizenui/Claim.java | 4 +++- .../model/citizenui/DashboardClaimStatus.java | 7 +++++-- .../uk/gov/hmcts/reform/cmc/model/CmcClaim.java | 7 ++++++- 6 files changed, 31 insertions(+), 16 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 index 0cd4edb8372..f8e700ff06b 100644 --- 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 @@ -268,4 +268,21 @@ && isHearingLessThanDaysAway(3 * 7) && (lastOrderDate.isEmpty() || lastOrderDate.get().isBefore(bundleDate.get())); } + + @Override + public boolean isWaitingForClaimantIntentDocUploadPreDefendantNocOnline() { + return isWaitingForClaimantIntentDocUpload() + && !featureToggleService.isDefendantNoCOnlineForCase(caseData); + } + + @Override + public boolean isWaitingForClaimantIntentDocUploadPostDefendantNocOnline() { + return isWaitingForClaimantIntentDocUpload() + && featureToggleService.isDefendantNoCOnlineForCase(caseData); + } + + private boolean isWaitingForClaimantIntentDocUpload() { + return caseData.isRespondentResponseFullDefence() && caseData.getApplicant1ResponseDate() != null + && caseData.getCcdState() == CaseState.AWAITING_APPLICANT_INTENTION && caseData.isClaimantBilingual(); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java index e2d861460b2..d17b237ba79 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java @@ -420,11 +420,6 @@ public boolean defendantRespondedWithPreferredLanguageWelsh() { && caseData.getCcdState() == CaseState.AWAITING_RESPONDENT_ACKNOWLEDGEMENT; } - public boolean isWaitingForClaimantIntentDocUpload() { - return caseData.isRespondentResponseFullDefence() && caseData.getApplicant1ResponseDate() != null - && caseData.getCcdState() == CaseState.AWAITING_APPLICANT_INTENTION && caseData.isClaimantBilingual(); - } - public boolean isNocForDefendant() { return isPaperResponse() && (caseData.getBusinessProcess() != null && CaseEvent.APPLY_NOC_DECISION_DEFENDANT_LIP.name() diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java index e005abb0846..b312a2e2118 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java @@ -389,13 +389,6 @@ public boolean defendantRespondedWithPreferredLanguageWelsh() { return caseData.isRespondentResponseBilingual() && caseData.getCcdState() == CaseState.AWAITING_RESPONDENT_ACKNOWLEDGEMENT; } - public boolean isWaitingForClaimantIntentDocUpload() { - return caseData.isRespondentResponseFullDefence() - && caseData.getApplicant1ResponseDate() != null - && caseData.getCcdState() == CaseState.AWAITING_APPLICANT_INTENTION - && caseData.isClaimantBilingual(); - } - @Override public boolean isClaimSubmittedNotPaidOrFailedNotHwF() { return false; diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java index 3f41c68ca03..e3b3905a65a 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java @@ -120,7 +120,9 @@ public interface Claim { boolean defendantRespondedWithPreferredLanguageWelsh(); - boolean isWaitingForClaimantIntentDocUpload(); + boolean isWaitingForClaimantIntentDocUploadPreDefendantNocOnline(); + + boolean isWaitingForClaimantIntentDocUploadPostDefendantNocOnline(); boolean isClaimSubmittedNotPaidOrFailedNotHwF(); diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java index c83870f6206..2f8107db61d 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java @@ -100,8 +100,11 @@ public enum DashboardClaimStatus { IN_MEDIATION( Claim::isMediationPending ), - WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD( - Claim::isWaitingForClaimantIntentDocUpload + WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD_PRE_DEF_NOC_ONLINE( + Claim::isWaitingForClaimantIntentDocUploadPreDefendantNocOnline + ), + WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD_POST_DEF_NOC_ONLINE( + Claim::isWaitingForClaimantIntentDocUploadPostDefendantNocOnline ), CLAIM_ENDED( Claim::hasClaimEnded diff --git a/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java b/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java index 81f7d837739..c754f586981 100644 --- a/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java +++ b/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java @@ -512,7 +512,12 @@ public boolean defendantRespondedWithPreferredLanguageWelsh() { } @Override - public boolean isWaitingForClaimantIntentDocUpload() { + public boolean isWaitingForClaimantIntentDocUploadPreDefendantNocOnline() { + return false; + } + + @Override + public boolean isWaitingForClaimantIntentDocUploadPostDefendantNocOnline() { return false; } From 4762a74b338cc20317ab4c0b7541c6b9c03a8eaa Mon Sep 17 00:00:00 2001 From: paul-pearson Date: Fri, 28 Feb 2025 17:01:36 +0000 Subject: [PATCH 2/2] CIV-16009 Fix test compilation --- .../model/citizenui/CcdClaimStatusDashboardFactoryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java b/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java index 29eea16a1f6..e0fbea24344 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java @@ -733,7 +733,7 @@ void givenBilingualLanguageIsWelsh_ClaimantIntentDocUploadPending_thenReturnDocU DashboardClaimStatus status = ccdClaimStatusDashboardFactory.getDashboardClaimStatus(new CcdDashboardClaimantClaimMatcher( caseData, featureToggleService, Collections.emptyList())); - assertThat(status).isEqualTo(DashboardClaimStatus.WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD); + assertThat(status).isEqualTo(DashboardClaimStatus.WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD_PRE_DEF_NOC_ONLINE); } @Test