From fa29fae2654259dc1ef8c9a615e4d2e23fd31427 Mon Sep 17 00:00:00 2001 From: Anirudha <67697720+anirudha-deshpande@users.noreply.github.com> Date: Tue, 25 Feb 2025 11:44:55 +0000 Subject: [PATCH] DTSCCI-1362: rename method --- .../civil/model/docmosis/claimform/ClaimFormMapper.java | 4 ++-- .../docmosis/sealedclaim/SealedClaimLipResponseForm.java | 4 ++-- .../docmosis/sealedclaim/LitigantInPersonFormGenerator.java | 4 ++-- .../docmosis/sealedclaim/SealedClaimFormGenerator.java | 4 ++-- .../sealedclaim/SealedClaimFormGeneratorForSpec.java | 6 +++--- .../hmcts/reform/civil/utils/DocmosisTemplateDataUtils.java | 2 +- .../reform/civil/utils/DocmosisTemplateDataUtilsTest.java | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/claimform/ClaimFormMapper.java b/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/claimform/ClaimFormMapper.java index aabc22f58ef..2580b3500ea 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/claimform/ClaimFormMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/claimform/ClaimFormMapper.java @@ -28,7 +28,7 @@ import java.util.Optional; import static uk.gov.hmcts.reform.civil.model.interestcalc.InterestClaimFromType.FROM_CLAIM_SUBMIT_DATE; -import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.getFormattedCaseReference; +import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.formatCcdCaseReference; @Component @RequiredArgsConstructor @@ -85,7 +85,7 @@ public ClaimForm toClaimForm(CaseData caseData) { )) .generationDate(LocalDateTime.now()) .claimIssuedDate(caseData.getIssueDate()) - .ccdCaseReference(getFormattedCaseReference(caseData)) + .ccdCaseReference(formatCcdCaseReference(caseData)) .claimNumber(caseData.getLegacyCaseReference()) .flightDelayDetails(getFlightDelayDetails(caseData)) .evidenceList(Optional.ofNullable(caseData.getSpeclistYourEvidenceList()) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/sealedclaim/SealedClaimLipResponseForm.java b/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/sealedclaim/SealedClaimLipResponseForm.java index cafc30b9fc9..0a9c342981f 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/sealedclaim/SealedClaimLipResponseForm.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/sealedclaim/SealedClaimLipResponseForm.java @@ -40,7 +40,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.getFormattedCaseReference; +import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.formatCcdCaseReference; @Getter @Builder(toBuilder = true) @@ -92,7 +92,7 @@ public int getNumberOfChildren() { public static SealedClaimLipResponseForm toTemplate(final CaseData caseData) { SealedClaimLipResponseForm.SealedClaimLipResponseFormBuilder builder = SealedClaimLipResponseForm.builder() .generationDate(LocalDate.now()) - .ccdCaseReference(getFormattedCaseReference(caseData)) + .ccdCaseReference(formatCcdCaseReference(caseData)) .claimReferenceNumber(caseData.getLegacyCaseReference()) .claimant1(LipFormPartyDefence.toLipDefenceParty(caseData.getApplicant1())) .defendant1(LipFormPartyDefence.toLipDefenceParty( diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/LitigantInPersonFormGenerator.java b/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/LitigantInPersonFormGenerator.java index c1c2f220f2f..f801cf595b2 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/LitigantInPersonFormGenerator.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/LitigantInPersonFormGenerator.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.reform.civil.documentmanagement.DocumentManagementService; import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.LIP_CLAIM_FORM; -import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.getFormattedCaseReference; +import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.formatCcdCaseReference; @Service @RequiredArgsConstructor @@ -40,7 +40,7 @@ public CaseDocument generate(CaseData caseData, String authorisation) { @Override public LitigantInPersonForm getTemplateData(CaseData caseData) { return LitigantInPersonForm.builder() - .ccdCaseReference(getFormattedCaseReference(caseData)) + .ccdCaseReference(formatCcdCaseReference(caseData)) .referenceNumber(caseData.getLegacyCaseReference()) .build(); } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGenerator.java b/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGenerator.java index 425036cae88..273e91390af 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGenerator.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGenerator.java @@ -30,7 +30,7 @@ import static uk.gov.hmcts.reform.civil.enums.MultiPartyScenario.getMultiPartyScenario; import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.N1; import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.N1_MULTIPARTY_SAME_SOL; -import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.getFormattedCaseReference; +import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.formatCcdCaseReference; @Service @RequiredArgsConstructor @@ -77,7 +77,7 @@ public SealedClaimForm getTemplateData(CaseData caseData, String authorisation) .claimDetails(caseData.getDetailsOfClaim()) .hearingCourtLocation(hearingCourtLocation) .referenceNumber(caseData.getLegacyCaseReference()) - .ccdCaseReference(getFormattedCaseReference(caseData)) + .ccdCaseReference(formatCcdCaseReference(caseData)) .issueDate(caseData.getIssueDate()) .submittedOn(caseData.getSubmittedDate().toLocalDate()) .applicantExternalReference(solicitorReferences diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGeneratorForSpec.java b/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGeneratorForSpec.java index d7f95f083c4..43171a6c771 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGeneratorForSpec.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/sealedclaim/SealedClaimFormGeneratorForSpec.java @@ -55,7 +55,7 @@ import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.N2_2V1; import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.N2_2V1_LIP; import static uk.gov.hmcts.reform.civil.utils.DateUtils.isAfterFourPM; -import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.getFormattedCaseReference; +import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.formatCcdCaseReference; @Service @RequiredArgsConstructor @@ -123,7 +123,7 @@ public SealedClaimFormForSpec getTemplateData(CaseData caseData) { Optional solicitorReferences = ofNullable(caseData.getSolicitorReferences()); BigDecimal interest = interestCalculator.calculateInterest(caseData); return SealedClaimFormForSpec.builder() - .ccdCaseReference(getFormattedCaseReference(caseData)) + .ccdCaseReference(formatCcdCaseReference(caseData)) .referenceNumber(caseData.getLegacyCaseReference()) .caseName(DocmosisTemplateDataUtils.toCaseName.apply(caseData)) .applicantExternalReference(solicitorReferences @@ -218,7 +218,7 @@ public SealedClaimFormForSpec getTemplateDataBulkClaim(CaseData caseData) { interest = interestCalculator.calculateBulkInterest(caseData); } return SealedClaimFormForSpec.builder() - .ccdCaseReference(getFormattedCaseReference(caseData)) + .ccdCaseReference(formatCcdCaseReference(caseData)) .referenceNumber(caseData.getLegacyCaseReference()) .caseName(DocmosisTemplateDataUtils.toCaseName.apply(caseData)) .applicantExternalReference(solicitorReferences.map(SolicitorReferences::getApplicantSolicitor1Reference).orElse("")) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtils.java b/src/main/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtils.java index f9d8cbd8ffd..572d5485ecf 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtils.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtils.java @@ -253,7 +253,7 @@ public static List fetchResponseIntentionsDocmosisTemplate(CaseData case return responseIntentions; } - public static String getFormattedCaseReference(CaseData caseData) { + public static String formatCcdCaseReference(CaseData caseData) { return Optional.ofNullable(caseData.getCcdCaseReference()) .map(val -> String.join( DELIMITER, diff --git a/src/test/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtilsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtilsTest.java index b9f839dd8d8..b0116ca753a 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtilsTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/utils/DocmosisTemplateDataUtilsTest.java @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.fetchApplicantName; import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.fetchSolicitorReferences; -import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.getFormattedCaseReference; +import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.formatCcdCaseReference; import static uk.gov.hmcts.reform.civil.utils.DocmosisTemplateDataUtils.toCaseName; class DocmosisTemplateDataUtilsTest { @@ -504,7 +504,7 @@ void shouldPopulateNotProvided_whenOneReferencesNotAvailable() { void shouldReturnEmptyForMissingCaseReference() { CaseData caseData = CaseData.builder() .build(); - String formattedCaseReference = getFormattedCaseReference(caseData); + String formattedCaseReference = formatCcdCaseReference(caseData); assertThat(formattedCaseReference).isEmpty(); } @@ -524,7 +524,7 @@ void shouldReturnFormattedReference(Long inputCaseReference, String expectedCase CaseData caseData = CaseData.builder() .ccdCaseReference(inputCaseReference) .build(); - String formattedCaseReference = getFormattedCaseReference(caseData); + String formattedCaseReference = formatCcdCaseReference(caseData); assertThat(formattedCaseReference).isNotEmpty(); assertThat(formattedCaseReference).isEqualTo(expectedCaseReference); }