Skip to content

Commit

Permalink
DTSCCI-1362: rename method
Browse files Browse the repository at this point in the history
  • Loading branch information
anirudha-deshpande committed Mar 1, 2025
1 parent dfcd856 commit fa29fae
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -123,7 +123,7 @@ public SealedClaimFormForSpec getTemplateData(CaseData caseData) {
Optional<SolicitorReferences> 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
Expand Down Expand Up @@ -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(""))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public static List<String> 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
}

Expand All @@ -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);
}
Expand Down

0 comments on commit fa29fae

Please sign in to comment.