diff --git a/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandler.java b/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandler.java index c2ff9bbd7..4c89f3c1d 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandler.java @@ -13,15 +13,12 @@ import uk.gov.hmcts.reform.civil.callback.Callback; import uk.gov.hmcts.reform.civil.callback.CallbackParams; import uk.gov.hmcts.reform.civil.callback.CaseEvent; -import uk.gov.hmcts.reform.civil.enums.CaseState; -import uk.gov.hmcts.reform.civil.enums.FeeType; import uk.gov.hmcts.reform.civil.enums.YesOrNo; import uk.gov.hmcts.reform.civil.enums.dq.GeneralApplicationTypes; import uk.gov.hmcts.reform.civil.launchdarkly.FeatureToggleService; import uk.gov.hmcts.reform.civil.model.BusinessProcess; import uk.gov.hmcts.reform.civil.model.CaseData; import uk.gov.hmcts.reform.civil.model.genapplication.FeePaymentOutcomeDetails; -import uk.gov.hmcts.reform.civil.model.genapplication.HelpWithFeesDetails; import uk.gov.hmcts.reform.civil.service.HwfNotificationService; import uk.gov.hmcts.reform.civil.service.PaymentRequestUpdateCallbackService; import uk.gov.hmcts.reform.civil.utils.HwFFeeTypeService; @@ -68,31 +65,10 @@ private CallbackResponse setData(CallbackParams callbackParams) { CaseData.CaseDataBuilder caseDataBuilder = caseData.toBuilder(); FeePaymentOutcomeDetails.FeePaymentOutcomeDetailsBuilder feeDetailBuilder = FeePaymentOutcomeDetails.builder(); feeDetailBuilder.hwfNumberAvailable(YesOrNo.NO); - if (caseData.getCcdState().equals(CaseState.APPLICATION_ADD_PAYMENT)) { - caseDataBuilder.hwfFeeType(FeeType.ADDITIONAL); - if (Objects.isNull(caseData.getAdditionalHwfDetails())) { - caseDataBuilder.additionalHwfDetails(HelpWithFeesDetails.builder() - .hwfFeeType(FeeType.ADDITIONAL).build()); - } - if (Objects.nonNull(caseData.getGaAdditionalHelpWithFees()) - && Objects.nonNull(caseData.getGaAdditionalHelpWithFees().getHelpWithFeesReferenceNumber())) { - feeDetailBuilder.hwfNumberAvailable(YesOrNo.YES) - .hwfNumberForFeePaymentOutcome(caseData.getGaAdditionalHelpWithFees() - .getHelpWithFeesReferenceNumber()); - } - } else { - caseDataBuilder.hwfFeeType(FeeType.APPLICATION); - if (Objects.isNull(caseData.getGaHwfDetails())) { - caseDataBuilder.gaHwfDetails(HelpWithFeesDetails.builder() - .hwfFeeType(FeeType.APPLICATION).build()); - - } - if (Objects.nonNull(caseData.getGeneralAppHelpWithFees()) - && Objects.nonNull(caseData.getGeneralAppHelpWithFees().getHelpWithFeesReferenceNumber())) { - feeDetailBuilder.hwfNumberAvailable(YesOrNo.YES) - .hwfNumberForFeePaymentOutcome(caseData.getGeneralAppHelpWithFees() - .getHelpWithFeesReferenceNumber()); - } + if (Objects.nonNull(caseData.getGeneralAppHelpWithFees()) + && Objects.nonNull(caseData.getGeneralAppHelpWithFees().getHelpWithFeesReferenceNumber())) { + feeDetailBuilder.hwfNumberAvailable(YesOrNo.YES) + .hwfNumberForFeePaymentOutcome(caseData.getGeneralAppHelpWithFees().getHelpWithFeesReferenceNumber()); } caseDataBuilder.feePaymentOutcomeDetails(feeDetailBuilder.build()); return AboutToStartOrSubmitCallbackResponse.builder() @@ -107,13 +83,13 @@ private CallbackResponse validateSelectedRemissionType(CallbackParams callbackPa if ((caseData.isHWFTypeApplication() && caseData.getFeePaymentOutcomeDetails().getHwfFullRemissionGrantedForGa() == YesOrNo.YES && Objects.nonNull(caseData.getGaHwfDetails()) - && Objects.nonNull(caseData.getGaHwfDetails().getOutstandingFeeInPounds()) - && !Objects.equals(caseData.getGaHwfDetails().getOutstandingFeeInPounds(), BigDecimal.ZERO)) + && Objects.nonNull(caseData.getGaHwfDetails().getOutstandingFee()) + && !Objects.equals(caseData.getGaHwfDetails().getOutstandingFee(), BigDecimal.ZERO)) || (caseData.isHWFTypeAdditional() && caseData.getFeePaymentOutcomeDetails().getHwfFullRemissionGrantedForAdditionalFee() == YesOrNo.YES && Objects.nonNull(caseData.getAdditionalHwfDetails()) - && Objects.nonNull(caseData.getAdditionalHwfDetails().getOutstandingFeeInPounds()) - && !Objects.equals(caseData.getAdditionalHwfDetails().getOutstandingFeeInPounds(), BigDecimal.ZERO))) { + && Objects.nonNull(caseData.getAdditionalHwfDetails().getOutstandingFee()) + && !Objects.equals(caseData.getAdditionalHwfDetails().getOutstandingFee(), BigDecimal.ZERO))) { errors.add(WRONG_REMISSION_TYPE_SELECTED); } return AboutToStartOrSubmitCallbackResponse.builder() @@ -154,7 +130,8 @@ private CallbackResponse submitFeePaymentOutcome(CallbackParams callbackParams) .fee(caseData.getGeneralAppPBADetails().getFee()) .hwfReferenceNumber(caseData .getGeneralAppHelpWithFees() - .getHelpWithFeesReferenceNumber()).build()) + .getHelpWithFeesReferenceNumber()) + .outstandingFee(BigDecimal.ZERO).build()) .businessProcess(BusinessProcess.ready(caseEvent)).build(); } else if (processedCaseData.isHWFTypeAdditional()) { caseData = processedCaseData.toBuilder() @@ -162,7 +139,8 @@ private CallbackResponse submitFeePaymentOutcome(CallbackParams callbackParams) .fee(caseData.getGeneralAppPBADetails().getFee()) .hwfReferenceNumber(caseData .getGeneralAppHelpWithFees() - .getHelpWithFeesReferenceNumber()).build()) + .getHelpWithFeesReferenceNumber()) + .outstandingFee(BigDecimal.ZERO).build()) .businessProcess(BusinessProcess.ready(UPDATE_GA_ADD_HWF)) .build(); log.info("Start business process UPDATE_GA_ADD_HWF for caseId: {}", callbackParams.getCaseData().getCcdCaseReference()); diff --git a/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FullRemissionHWFCallbackHandler.java b/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FullRemissionHWFCallbackHandler.java index cddfd1785..757e1c832 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FullRemissionHWFCallbackHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/FullRemissionHWFCallbackHandler.java @@ -61,14 +61,14 @@ private CallbackResponse fullRemissionHWF(CallbackParams callbackParams) { .ifPresentOrElse( gaHwfDetails -> updatedData.gaHwfDetails( gaHwfDetails.toBuilder().remissionAmount(feeAmount) - .outstandingFeeInPounds(BigDecimal.ZERO) + .outstandingFee(BigDecimal.ZERO) .hwfFeeType(FeeType.APPLICATION) .hwfCaseEvent(FULL_REMISSION_HWF_GA) .build() ), () -> updatedData.gaHwfDetails( HelpWithFeesDetails.builder().remissionAmount(feeAmount) - .outstandingFeeInPounds(BigDecimal.ZERO) + .outstandingFee(BigDecimal.ZERO) .hwfFeeType(FeeType.APPLICATION) .hwfCaseEvent(FULL_REMISSION_HWF_GA) .build() @@ -79,15 +79,16 @@ private CallbackResponse fullRemissionHWF(CallbackParams callbackParams) { log.info("HWF fee type is additional for caseId: {}", callbackParams.getCaseData().getCcdCaseReference()); Optional.ofNullable(caseData.getAdditionalHwfDetails()) .ifPresentOrElse( - hearingHwfDetails -> updatedData.additionalHwfDetails( - HelpWithFeesDetails.builder().remissionAmount(feeAmount) - .outstandingFeeInPounds(BigDecimal.ZERO) + additionalHwfDetails -> updatedData.additionalHwfDetails( + additionalHwfDetails.toBuilder().remissionAmount(feeAmount) + .outstandingFee(BigDecimal.ZERO) .hwfCaseEvent(FULL_REMISSION_HWF_GA) .hwfFeeType(FeeType.ADDITIONAL) .build() ), () -> updatedData.additionalHwfDetails( HelpWithFeesDetails.builder().remissionAmount(feeAmount) + .outstandingFee(BigDecimal.ZERO) .hwfCaseEvent(FULL_REMISSION_HWF_GA) .hwfFeeType(FeeType.ADDITIONAL) .build() diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/genapplication/HelpWithFeesDetails.java b/src/main/java/uk/gov/hmcts/reform/civil/model/genapplication/HelpWithFeesDetails.java index 579ff90fb..8382d3e40 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/genapplication/HelpWithFeesDetails.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/genapplication/HelpWithFeesDetails.java @@ -22,7 +22,7 @@ public class HelpWithFeesDetails { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal remissionAmount; @JsonFormat(shape = JsonFormat.Shape.STRING) - private BigDecimal outstandingFeeInPounds; + private BigDecimal outstandingFee; private String noRemissionDetails; private NoRemissionDetailsSummary noRemissionDetailsSummary; private String hwfReferenceNumber; diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapper.java b/src/main/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapper.java index 11fdd6937..570130e1d 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapper.java @@ -60,7 +60,8 @@ public HashMap mapCaseDataToParams(CaseData caseData) { if (caseData.getGaHwfDetails().getHwfCaseEvent() != null && caseData.getGaHwfDetails().getHwfCaseEvent().equals(CaseEvent.PARTIAL_REMISSION_HWF_GA)) { params.put("remissionAmount", "£" + MonetaryConversions.penniesToPounds(caseData.getGaHwfDetails().getRemissionAmount())); - params.put("outstandingFeeInPounds", "£" + caseData.getGaHwfDetails().getOutstandingFeeInPounds()); + params.put("outstandingFeeInPounds", "£" + MonetaryConversions + .penniesToPounds(caseData.getGaHwfDetails().getOutstandingFee())); } } else if (caseData.getAdditionalHwfDetails() != null && (caseData.getHwfFeeType() != null && FeeType.ADDITIONAL == caseData.getHwfFeeType())) { @@ -68,7 +69,8 @@ public HashMap mapCaseDataToParams(CaseData caseData) { && caseData.getAdditionalHwfDetails().getHwfCaseEvent().equals(CaseEvent.PARTIAL_REMISSION_HWF_GA)) { params.put("remissionAmount", "£" + MonetaryConversions.penniesToPounds(caseData.getAdditionalHwfDetails() .getRemissionAmount())); - params.put("outstandingFeeInPounds", "£" + caseData.getAdditionalHwfDetails().getOutstandingFeeInPounds()); + params.put("outstandingFeeInPounds", "£" + MonetaryConversions + .penniesToPounds(caseData.getAdditionalHwfDetails().getOutstandingFee())); } } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/HwfNotificationService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/HwfNotificationService.java index f40f8d4c1..0ab9f0f82 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/HwfNotificationService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/HwfNotificationService.java @@ -97,11 +97,13 @@ private Map getPartialRemissionProperties(CaseData caseData) { if (caseData.isHWFTypeApplication()) { remission = MonetaryConversions .penniesToPounds(HwFFeeTypeService.getGaRemissionAmount(caseData)); - outstanding = caseData.getGaHwfDetails().getOutstandingFeeInPounds(); + outstanding = MonetaryConversions + .penniesToPounds(caseData.getGaHwfDetails().getOutstandingFee()); } else { remission = MonetaryConversions .penniesToPounds(HwFFeeTypeService.getAdditionalRemissionAmount(caseData)); - outstanding = caseData.getAdditionalHwfDetails().getOutstandingFeeInPounds(); + outstanding = MonetaryConversions + .penniesToPounds(caseData.getAdditionalHwfDetails().getOutstandingFee()); } return Map.of( PART_AMOUNT, remission.toString(), @@ -125,10 +127,12 @@ private Map getNoRemissionProperties(CaseData caseData) { BigDecimal outstanding; if (caseData.isHWFTypeApplication()) { remission = caseData.getGaHwfDetails().getNoRemissionDetailsSummary().getLabel(); - outstanding = caseData.getGaHwfDetails().getOutstandingFeeInPounds(); + outstanding = MonetaryConversions + .penniesToPounds(caseData.getGaHwfDetails().getOutstandingFee()); } else { remission = caseData.getAdditionalHwfDetails().getNoRemissionDetailsSummary().getLabel(); - outstanding = caseData.getAdditionalHwfDetails().getOutstandingFeeInPounds(); + outstanding = MonetaryConversions + .penniesToPounds(caseData.getAdditionalHwfDetails().getOutstandingFee()); } return Map.of( FEE_AMOUNT, outstanding.toString(), diff --git a/src/main/java/uk/gov/hmcts/reform/civil/utils/HwFFeeTypeService.java b/src/main/java/uk/gov/hmcts/reform/civil/utils/HwFFeeTypeService.java index 197f17452..a25342400 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/utils/HwFFeeTypeService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/utils/HwFFeeTypeService.java @@ -87,7 +87,7 @@ public static CaseData updateOutstandingFee(CaseData caseData, String caseEventI updatedData.gaHwfDetails( caseData.getGaHwfDetails().toBuilder() .remissionAmount(gaRemissionAmount) - .outstandingFeeInPounds(MonetaryConversions.penniesToPounds(outstandingFeeAmount)) + .outstandingFee(outstandingFeeAmount) .build() ); } else if (caseData.isHWFTypeAdditional() && BigDecimal.ZERO.compareTo(feeAmount) != 0) { @@ -95,7 +95,7 @@ public static CaseData updateOutstandingFee(CaseData caseData, String caseEventI updatedData.additionalHwfDetails( caseData.getAdditionalHwfDetails().toBuilder() .remissionAmount(hearingRemissionAmount) - .outstandingFeeInPounds(MonetaryConversions.penniesToPounds(outstandingFeeAmount)) + .outstandingFee(outstandingFeeAmount) .build() ); } diff --git a/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandlerTest.java index dffdf5eaa..52b4a789b 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/FeePaymentOutcomeHWFCallBackHandlerTest.java @@ -83,6 +83,7 @@ void updateFeeType_shouldSetAdditionalFeeTypeWithEmptyRef_whenCaseStateIsApplica CaseData caseData = CaseData.builder() .ccdState(CaseState.APPLICATION_ADD_PAYMENT) .generalAppHelpWithFees(HelpWithFees.builder().build()) + .hwfFeeType(FeeType.ADDITIONAL) .generalAppPBADetails(GAPbaDetails.builder().fee( Fee.builder() .calculatedAmountInPence(BigDecimal.valueOf(180)) @@ -103,7 +104,8 @@ void updateFeeType_shouldSetAdditionalFeeTypeWithRef_whenCaseStateIsApplicationA // Arrange CaseData caseData = CaseData.builder() .ccdState(CaseState.APPLICATION_ADD_PAYMENT) - .gaAdditionalHelpWithFees(HelpWithFees.builder().helpWithFeesReferenceNumber("123").build()) + .hwfFeeType(FeeType.ADDITIONAL) + .generalAppHelpWithFees(HelpWithFees.builder().helpWithFeesReferenceNumber("123").build()) .build(); // Act @@ -121,6 +123,7 @@ void updateFeeType_shouldSetApplicationFeeTypeWithEmptyRef_whenCaseStateIsNotApp // Arrange CaseData caseData = CaseData.builder() .ccdState(CaseState.AWAITING_RESPONDENT_RESPONSE) + .hwfFeeType(FeeType.APPLICATION) .generalAppHelpWithFees(HelpWithFees.builder().build()) .generalAppPBADetails(GAPbaDetails.builder().fee( Fee.builder() @@ -143,6 +146,7 @@ void updateFeeType_shouldSetApplicationFeeTypeWithRef_whenCaseStateIsNotApplicat // Arrange CaseData caseData = CaseData.builder() .ccdState(CaseState.AWAITING_RESPONDENT_RESPONSE) + .hwfFeeType(FeeType.APPLICATION) .generalAppHelpWithFees(HelpWithFees.builder().helpWithFeesReferenceNumber("123").build()) .build(); @@ -170,7 +174,7 @@ void shouldValidationFeePaymentOutcomeGa_withInvalidOutstandingFee() { .hwfFullRemissionGrantedForGa(YesOrNo.YES).build()) .hwfFeeType(FeeType.APPLICATION) .gaHwfDetails(HelpWithFeesDetails.builder() - .outstandingFeeInPounds(BigDecimal.valueOf(100.00)) + .outstandingFee(BigDecimal.valueOf(100.00)) .build()) .build(); //When @@ -189,7 +193,7 @@ void shouldValidationFeePaymentOutcomeAdditional_withInvalidOutstandingFee() { .hwfFullRemissionGrantedForAdditionalFee(YesOrNo.YES).build()) .hwfFeeType(FeeType.ADDITIONAL) .additionalHwfDetails(HelpWithFeesDetails.builder() - .outstandingFeeInPounds(BigDecimal.valueOf(100.00)) + .outstandingFee(BigDecimal.valueOf(100.00)) .build()) .build(); //When diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapperTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapperTest.java index 360c5a801..82e12a3e8 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/DashboardNotificationsParamsMapperTest.java @@ -180,7 +180,7 @@ void shouldMapParametersWhenHwfApplicationFeeIsRequestedAndMoreInfoRequired() { .generalAppHelpWithFees(HelpWithFees.builder().helpWithFee(YesOrNo.YES).helpWithFeesReferenceNumber("HWF-A1B-23C").build()) .gaHwfDetails(HelpWithFeesDetails.builder().hwfCaseEvent(CaseEvent.MORE_INFORMATION_HWF_GA) .remissionAmount(BigDecimal.valueOf(7500)) - .outstandingFeeInPounds(new BigDecimal(200.00)).build()) + .outstandingFee(new BigDecimal(200.00)).build()) .build(); Map result = mapper.mapCaseDataToParams(caseData); @@ -202,7 +202,7 @@ void shouldMapParametersWhenHwfAdditionalApplicationFeeIsRequestedAndMoreInfoReq .additionalHwfDetails(HelpWithFeesDetails.builder() .hwfCaseEvent(CaseEvent.MORE_INFORMATION_HWF_GA) .remissionAmount(BigDecimal.valueOf(7500)) - .outstandingFeeInPounds(new BigDecimal(200.00)).build()) + .outstandingFee(new BigDecimal(200.00)).build()) .build(); Map result = mapper.mapCaseDataToParams(caseData); @@ -223,7 +223,7 @@ void shouldMapParametersWhenHwfApplicationFeeIsRequestedAndIsPartAdmitted_PartRe .generalAppHelpWithFees(HelpWithFees.builder().helpWithFee(YesOrNo.YES).helpWithFeesReferenceNumber("HWF-A1B-23C").build()) .gaHwfDetails(HelpWithFeesDetails.builder().hwfCaseEvent(CaseEvent.PARTIAL_REMISSION_HWF_GA) .remissionAmount(BigDecimal.valueOf(7500)) - .outstandingFeeInPounds(new BigDecimal(200.00)).build()) + .outstandingFee(new BigDecimal(200.00)).build()) .build(); Map result = mapper.mapCaseDataToParams(caseData); @@ -231,7 +231,7 @@ void shouldMapParametersWhenHwfApplicationFeeIsRequestedAndIsPartAdmitted_PartRe assertThat(result).extracting("applicationFeeTypeEn").isEqualTo("application"); assertThat(result).extracting("applicationFeeTypeCy").isEqualTo("cais"); assertThat(result).extracting("remissionAmount").isEqualTo("£75.00"); - assertThat(result).extracting("outstandingFeeInPounds").isEqualTo("£200"); + assertThat(result).extracting("outstandingFeeInPounds").isEqualTo("£2.00"); } @Test @@ -246,7 +246,7 @@ void shouldMapParametersWhenHwfAdditionalApplicationFeeIsRequestedAndIsPartAdmit .generalAppHelpWithFees(HelpWithFees.builder().helpWithFee(YesOrNo.YES).helpWithFeesReferenceNumber("HWF-A1B-23C").build()) .additionalHwfDetails(HelpWithFeesDetails.builder() .hwfCaseEvent(CaseEvent.PARTIAL_REMISSION_HWF_GA).remissionAmount(BigDecimal.valueOf(7500)) - .outstandingFeeInPounds(new BigDecimal(200.00)).build()) + .outstandingFee(new BigDecimal(200.00)).build()) .build(); Map result = mapper.mapCaseDataToParams(caseData); @@ -254,7 +254,7 @@ void shouldMapParametersWhenHwfAdditionalApplicationFeeIsRequestedAndIsPartAdmit assertThat(result).extracting("applicationFeeTypeEn").isEqualTo("additional application"); assertThat(result).extracting("applicationFeeTypeCy").isEqualTo("ffi ychwanegol i wneud cais"); assertThat(result).extracting("remissionAmount").isEqualTo("£75.00"); - assertThat(result).extracting("outstandingFeeInPounds").isEqualTo("£200"); + assertThat(result).extracting("outstandingFeeInPounds").isEqualTo("£2.00"); } @Test diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/HwfNotificationServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/HwfNotificationServiceTest.java index d391ddb22..d3e04e83a 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/HwfNotificationServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/HwfNotificationServiceTest.java @@ -562,7 +562,7 @@ void shouldNotifyApplicant_HwfOutcome_PartialRemission_Ga() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(PARTIAL_REMISSION_HWF_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = GA_CASE_DATA.toBuilder().gaHwfDetails(hwfeeDetails) @@ -588,7 +588,7 @@ void shouldNotifyApplicant_HwfOutcome_PartialRemission_Ga_Bilingual() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(PARTIAL_REMISSION_HWF_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = GA_CASE_DATA.toBuilder() @@ -614,7 +614,7 @@ void shouldNotifyApplicant_HwfOutcome_PartialRemission_Additional() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(PARTIAL_REMISSION_HWF_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = ADDITIONAL_CASE_DATA.toBuilder().additionalHwfDetails(hwfeeDetails) @@ -640,7 +640,7 @@ void shouldNotifyApplicant_HwfOutcome_PartialRemission_Additional_Bilingual_Def( HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(PARTIAL_REMISSION_HWF_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = ADDITIONAL_CASE_DATA.toBuilder() @@ -668,7 +668,7 @@ void shouldNotifyApplicant_HwfNoRemission_ClaimIssued() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(NO_REMISSION_HWF_GA) .noRemissionDetailsSummary(NoRemissionDetailsSummary.INCORRECT_EVIDENCE) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = GA_CASE_DATA.toBuilder().gaHwfDetails(hwfeeDetails) .parentCaseReference(GA_REFERENCE).build(); @@ -692,7 +692,7 @@ void shouldNotifyApplicant_HwfNoRemission_ClaimIssued_Bilingual() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(NO_REMISSION_HWF_GA) .noRemissionDetailsSummary(NoRemissionDetailsSummary.INCORRECT_EVIDENCE) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = GA_CASE_DATA.toBuilder() .parentCaseReference(GA_REFERENCE).applicantBilingualLanguagePreference(YesOrNo.YES) @@ -716,7 +716,7 @@ void shouldNotifyApplicant_HwfNoRemission_AdditionalFee() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(NO_REMISSION_HWF_GA) .noRemissionDetailsSummary(NoRemissionDetailsSummary.INCORRECT_EVIDENCE) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = ADDITIONAL_CASE_DATA.toBuilder().additionalHwfDetails(hwfeeDetails) .parentCaseReference(GA_REFERENCE).build(); @@ -740,7 +740,7 @@ void shouldNotifyApplicant_HwfNoRemission_AdditionalFee_Bilingual_Def() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(NO_REMISSION_HWF_GA) .noRemissionDetailsSummary(NoRemissionDetailsSummary.INCORRECT_EVIDENCE) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = ADDITIONAL_CASE_DATA.toBuilder() .parentCaseReference(GA_REFERENCE) @@ -767,7 +767,7 @@ private Map getNotificationDataMapNoRemissionApplication() { TYPE_OF_FEE, FeeType.APPLICATION.getLabel(), TYPE_OF_FEE_WELSH, FeeType.APPLICATION.getLabelInWelsh(), HWF_REFERENCE_NUMBER, HWF_REFERENCE, - FEE_AMOUNT, OUTSTANDING_AMOUNT_IN_POUNDS, + FEE_AMOUNT, "5.00", NO_REMISSION_REASONS, NoRemissionDetailsSummary.INCORRECT_EVIDENCE.getLabel(), NO_REMISSION_REASONS_WELSH, NoRemissionDetailsSummary.INCORRECT_EVIDENCE.getLabelWelsh() ); @@ -780,7 +780,7 @@ private Map getNotificationDataMapNoRemissionAdditional() { TYPE_OF_FEE, FeeType.ADDITIONAL.getLabel(), TYPE_OF_FEE_WELSH, FeeType.ADDITIONAL.getLabelInWelsh(), HWF_REFERENCE_NUMBER, HWF_REFERENCE, - FEE_AMOUNT, OUTSTANDING_AMOUNT_IN_POUNDS, + FEE_AMOUNT, "5.00", NO_REMISSION_REASONS, NoRemissionDetailsSummary.INCORRECT_EVIDENCE.getLabel(), NO_REMISSION_REASONS_WELSH, NoRemissionDetailsSummary.INCORRECT_EVIDENCE.getLabelWelsh() ); @@ -794,7 +794,7 @@ private Map getNotificationDataMapPartialRemissionGa() { TYPE_OF_FEE_WELSH, FeeType.APPLICATION.getLabelInWelsh(), HWF_REFERENCE_NUMBER, HWF_REFERENCE, PART_AMOUNT, "1000.00", - REMAINING_AMOUNT, OUTSTANDING_AMOUNT_IN_POUNDS + REMAINING_AMOUNT, "5.00" ); } @@ -806,7 +806,7 @@ private Map getNotificationDataMapPartialRemissionAdditional() { TYPE_OF_FEE_WELSH, FeeType.ADDITIONAL.getLabelInWelsh(), HWF_REFERENCE_NUMBER, HWF_REFERENCE, PART_AMOUNT, "1000.00", - REMAINING_AMOUNT, OUTSTANDING_AMOUNT_IN_POUNDS + REMAINING_AMOUNT, "5.00" ); } @@ -816,7 +816,7 @@ void shouldNotifyApplicant_HwfOutcome_PaymentOut_Ga() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(FEE_PAYMENT_OUTCOME_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = GA_CASE_DATA.toBuilder().gaHwfDetails(hwfeeDetails) @@ -842,7 +842,7 @@ void shouldNotifyApplicant_HwfOutcome_PaymentOut_Ga_inWelsh() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(FEE_PAYMENT_OUTCOME_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = GA_CASE_DATA.toBuilder().gaHwfDetails(hwfeeDetails) @@ -870,7 +870,7 @@ void shouldNotifyApplicant_HwfOutcome_PaymentOut_Additional() { HelpWithFeesDetails hwfeeDetails = HelpWithFeesDetails.builder() .hwfCaseEvent(FEE_PAYMENT_OUTCOME_GA) .remissionAmount(new BigDecimal(REMISSION_AMOUNT)) - .outstandingFeeInPounds(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) + .outstandingFee(new BigDecimal(OUTSTANDING_AMOUNT_IN_POUNDS)) .build(); CaseData caseData = ADDITIONAL_CASE_DATA.toBuilder().additionalHwfDetails(hwfeeDetails)