FINERACT-2114: Reschedule validations enhancement

alberto-art3ch · Aug 26, 2024 · 6ca0268 · 6ca0268
1 parent 5384236
commit 6ca0268
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...tfolio/loanaccount/rescheduleloan/data/ProgressiveLoanRescheduleRequestDataValidator.java b/...tfolio/loanaccount/rescheduleloan/data/ProgressiveLoanRescheduleRequestDataValidator.java
@@ -94,9 +94,11 @@ public void validateForCreateAction(JsonCommand jsonCommand, Loan loan) {
         final LocalDate businessDate = DateUtils.getBusinessLocalDate();
         if (rescheduleFromDate != null) {
             if (hasInterestRateChange && !rescheduleFromDate.isAfter(businessDate)) {
-                dataValidatorBuilder.reset().parameter(RescheduleLoansApiConstants.rescheduleFromDateParamName).failWithCode(
+                throw new GeneralPlatformDomainRuleException(
                         "loan.reschedule.interest.rate.change.reschedule.from.date.should.be.in.future",
-                        "Loan Reschedule From date should be in the future.");
+                        String.format("Loan Reschedule From date (%s) for Loan: %s should be in the future.", rescheduleFromDate,
+                                loan.getId()),
+                        loan.getId(), rescheduleFromDate);
             }
             if (hasInterestRateChange) {
                 validateInterestRateChangeRescheduleFromDate(loan, rescheduleFromDate);
@@ -154,7 +156,9 @@ public void validateForApproveAction(JsonCommand jsonCommand, LoanRescheduleRequ
             if (!rescheduleFromDate.isAfter(DateUtils.getBusinessLocalDate())) {
                 throw new GeneralPlatformDomainRuleException(
                         "loan.reschedule.interest.rate.change.reschedule.from.date.should.be.in.future",
-                        "Loan Reschedule From date should be in the future.", rescheduleFromDate);
+                        String.format("Loan Reschedule From date (%s) for Loan: %s should be in the future.", rescheduleFromDate,
+                                loan.getId()),
+                        loan.getId(), rescheduleFromDate);
             }
         } else {
             installment = loan.getRepaymentScheduleInstallment(rescheduleFromDate);

diff --git a/...n-tests/src/test/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java b/...n-tests/src/test/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
@@ -282,6 +282,14 @@ public void testInterestRateChangeForProgressiveLoan() {
                     new PostLoansLoanIdRequest().actualDisbursementDate("15 February 2023").dateFormat(DATETIME_PATTERN)
                             .transactionAmount(BigDecimal.valueOf(500.00)).locale("en"));
 
+            exception = assertThrows(CallFailedRuntimeException.class,
+                    () -> loanRescheduleRequestHelper
+                            .createLoanRescheduleRequest(new PostCreateRescheduleLoansRequest().loanId(loanResponse.get().getLoanId())
+                                    .dateFormat(DATETIME_PATTERN).locale("en").submittedOnDate("15 February 2023")
+                                    .newInterestRate(BigDecimal.ONE).rescheduleReasonId(1L).rescheduleFromDate("15 February 2023")));
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("loan.reschedule.interest.rate.change.reschedule.from.date.should.be.in.future"));
+
             rescheduleResponse.set(loanRescheduleRequestHelper.createLoanRescheduleRequest(new PostCreateRescheduleLoansRequest()
                     .loanId(loanResponse.get().getLoanId()).dateFormat(DATETIME_PATTERN).locale("en").submittedOnDate("15 February 2023")
                     .newInterestRate(BigDecimal.ONE).rescheduleReasonId(1L).rescheduleFromDate("16 February 2023")));