FINERACT-2326: Loan contract termination same disbursement date - E2E tests

peter-kovacs-dpc · adamsaghy · commit fb90c0107d86 · 2025-10-29T10:23:17.000+01:00
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java
@@ -146,6 +146,7 @@ public enum DefaultLoanProduct implements LoanProduct {
     LP2_ADV_PYMNT_ZERO_INTEREST_CHARGE_OFF_DELINQUENT_REASON_INTEREST_RECALC_CAPITALIZED_INCOME, //
     LP2_ADV_PYMNT_360_30_INTEREST_RECALCULATION_ZERO_INTEREST_CHARGE_OFF_ACCRUAL_ACTIVITY, //
     LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_CONTRACT_TERMINATION, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_CONTRACT_TERMINATION_INT_RECOGNITION, //
     LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_OVER_APPLIED_PERCENTAGE_CAPITALIZED_INCOME, //
     LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_OVER_APPLIED_FLAT_CAPITALIZED_INCOME, //
     LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_APPROVED_OVER_APPLIED_PERCENTAGE_CAPITALIZED_INCOME, //
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
@@ -257,6 +257,7 @@ public abstract class TestContextKey {
     public static final String LOAN_CAPITALIZED_INCOME_ADJUSTMENT_RESPONSE = "loanCapitalizedIncomeAdjustmentResponse";
     public static final String LOAN_INTEREST_REFUND_RESPONSE = "loanInterestRefundResponse";
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_CONTRACT_TERMINATION = "loanProductCreateResponseLP2AdvancedPaymentInterestDailyInterestRecalculationContractTermination";
+    public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_CONTRACT_TERMINATION_INT_RECOGNITION = "loanProductCreateResponseLP2AdvancedPaymentInterestDailyInterestRecalculationContractTerminationIntRecognition";
     public static final String LOAN_CONTRACT_TERMINATION_RESPONSE = "loanContractTerminationResponse";
     public static final String LOAN_UNDO_CONTRACT_TERMINATION_RESPONSE = "loanUndoContractTerminationResponse";
     public static final String LOAN_BUY_DOWN_FEE_RESPONSE = "loanBuyDownFeeResponse";
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanContractTermination.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanContractTermination.feature
@@ -1317,3 +1317,53 @@ Feature: Contract Termination
       | 31 March 2024    | Accrual Adjustment   | 0.15   | 0.0       | 0.15     | 0.0  | 0.0       | 0.0          | false    | false    |
       | 31 March 2024    | Contract Termination | 57.37  | 57.05     | 0.32     | 0.0  | 0.0       | 0.0          | true     | true     |
     And Global configuration "is-principal-compounding-disabled-for-overdue-loans" is disabled
+
+  @TestRailId:C4133
+  Scenario: Contract termination on disbursement date
+    When Admin sets the business date to "01 January 2025"
+    And Admin creates a client with random data
+    And Admin creates a fully customized loan with the following data:
+      | LoanProduct                                                              | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            |
+      | LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_CONTRACT_TERMINATION | 01 January 2025   | 100            | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 4                 | MONTHS                | 1              | MONTHS                 | 4                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
+    And Admin successfully approves the loan on "01 January 2025" with "100" amount and expected disbursement date on "01 January 2025"
+    And Admin successfully disburse the loan on "01 January 2025" with "100" EUR transaction amount
+    And Admin successfully terminates loan contract
+    Then Loan Repayment schedule has 4 periods, with the following data for periods:
+      | Nr | Days | Date             | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due   | Paid | In advance | Late | Outstanding |
+      |    |      | 01 January 2025  |           | 100.0           |               |          | 0.0  |           | 0.0   | 0.0  |            |      |             |
+      | 1  | 31   | 01 February 2025 |           | 75.21           | 24.79         | 0.58     | 0.0  | 0.0       | 25.37 | 0.0  | 0.0        | 0.0  | 25.37       |
+      | 2  | 28   | 01 March 2025    |           | 50.28           | 24.93         | 0.44     | 0.0  | 0.0       | 25.37 | 0.0  | 0.0        | 0.0  | 25.37       |
+      | 3  | 31   | 01 April 2025    |           | 25.2            | 25.08         | 0.29     | 0.0  | 0.0       | 25.37 | 0.0  | 0.0        | 0.0  | 25.37       |
+      | 4  | 30   | 01 May 2025      |           | 0.0             | 25.2          | 0.15     | 0.0  | 0.0       | 25.35 | 0.0  | 0.0        | 0.0  | 25.35       |
+    And Loan Repayment schedule has the following data in Total row:
+      | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
+      | 100.0         | 1.46     | 0.0  | 0.0       | 101.46 | 0.0  | 0.0        | 0.0  | 101.46      |
+    And Loan Transactions tab has the following data:
+      | Transaction date | Transaction Type     | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
+      | 01 January 2025  | Disbursement         | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    | false    |
+      | 01 January 2025  | Contract Termination | 101.46 | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    | false    |
+
+  @TestRailId:C4134
+  Scenario: Contract termination on disbursement date with interest recognition
+    When Admin sets the business date to "01 January 2025"
+    And Admin creates a client with random data
+    And Admin creates a fully customized loan with the following data:
+      | LoanProduct                                                                              | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            |
+      | LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_CONTRACT_TERMINATION_INT_RECOGNITION | 01 January 2025   | 100            | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 4                 | MONTHS                | 1              | MONTHS                 | 4                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
+    And Admin successfully approves the loan on "01 January 2025" with "100" amount and expected disbursement date on "01 January 2025"
+    And Admin successfully disburse the loan on "01 January 2025" with "100" EUR transaction amount
+    And Admin successfully terminates loan contract
+    Then Loan Repayment schedule has 4 periods, with the following data for periods:
+      | Nr | Days | Date             | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due   | Paid | In advance | Late | Outstanding |
+      |    |      | 01 January 2025  |           | 100.0           |               |          | 0.0  |           | 0.0   | 0.0  |            |      |             |
+      | 1  | 31   | 01 February 2025 |           | 75.21           | 24.79         | 0.58     | 0.0  | 0.0       | 25.37 | 0.0  | 0.0        | 0.0  | 25.37       |
+      | 2  | 28   | 01 March 2025    |           | 50.28           | 24.93         | 0.44     | 0.0  | 0.0       | 25.37 | 0.0  | 0.0        | 0.0  | 25.37       |
+      | 3  | 31   | 01 April 2025    |           | 25.2            | 25.08         | 0.29     | 0.0  | 0.0       | 25.37 | 0.0  | 0.0        | 0.0  | 25.37       |
+      | 4  | 30   | 01 May 2025      |           | 0.0             | 25.2          | 0.15     | 0.0  | 0.0       | 25.35 | 0.0  | 0.0        | 0.0  | 25.35       |
+    And Loan Repayment schedule has the following data in Total row:
+      | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
+      | 100.0         | 1.46     | 0.0  | 0.0       | 101.46 | 0.0  | 0.0        | 0.0  | 101.46      |
+    And Loan Transactions tab has the following data:
+      | Transaction date | Transaction Type     | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
+      | 01 January 2025  | Disbursement         | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    | false    |
+      | 01 January 2025  | Contract Termination | 101.46 | 100.0     | 1.46     | 0.0  | 0.0       | 0.0          | false    | false    |
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -1411,13 +1411,14 @@ public void addLoanRepaymentScheduleInstallment(final LoanRepaymentScheduleInsta
      * @return a schedule installment is related to the provided date
      **/
     public LoanRepaymentScheduleInstallment getRelatedRepaymentScheduleInstallment(final LocalDate date) {
-        return getRepaymentScheduleInstallment(e -> (DateUtils.isDateInRangeFromExclusiveToInclusive(date, e.getFromDate(), e.getDueDate())
-                || (e.isFirstNormalInstallment(getRepaymentScheduleInstallments()) && DateUtils.isDateInRangeInclusive(date, e.getFromDate(), e.getDueDate()))));
+        return getRepaymentScheduleInstallment(e -> DateUtils.isDateInRangeFromExclusiveToInclusive(date, e.getFromDate(), e.getDueDate())
+                || (e.isFirstNormalInstallment(getRepaymentScheduleInstallments()) && e.getFromDate().isEqual(date)));
     }
 
     public List<LoanRepaymentScheduleInstallment> getInstallmentsUpToTransactionDate(final LocalDate transactionDate) {
-        return getRepaymentScheduleInstallments().stream().filter(i -> (transactionDate.isAfter(i.getFromDate())
-                        || (i.isFirstNormalInstallment(getRepaymentScheduleInstallments())) && !transactionDate.isBefore(i.getFromDate())))
+        return getRepaymentScheduleInstallments().stream()
+                .filter(i -> transactionDate.isAfter(i.getFromDate())
+                        || (i.isFirstNormalInstallment(getRepaymentScheduleInstallments()) && i.getFromDate().isEqual(transactionDate)))
                 .collect(Collectors.toCollection(ArrayList::new));
     }
 
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepaymentScheduleInstallment.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepaymentScheduleInstallment.java
@@ -1217,7 +1217,6 @@ private BigDecimal setScaleAndDefaultToNullIfZero(final BigDecimal value) {
     }
 
     public boolean isFirstNormalInstallment(List<LoanRepaymentScheduleInstallment> installments) {
-        return installments.stream().filter(rp -> !rp.isDownPayment())
-            .findFirst().stream().anyMatch(rp -> rp.equals(this));
+        return installments.stream().filter(rp -> !rp.isDownPayment()).findFirst().stream().anyMatch(rp -> rp.equals(this));
     }
 }
diff --git a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java
@@ -1902,7 +1902,8 @@ private void handleAccelerateMaturityDate(final LoanTransaction loanTransaction,
                         MathUtil.nullToZero(currentInstallment.getTotalPaidInAdvance()).add(futureTotalPaidInAdvance));
             }
 
-            final List<LoanRepaymentScheduleInstallment> installmentsUpToTransactionDate = loan.getInstallmentsUpToTransactionDate(transactionDate);
+            final List<LoanRepaymentScheduleInstallment> installmentsUpToTransactionDate = loan
+                    .getInstallmentsUpToTransactionDate(transactionDate);
 
             final List<LoanTransaction> transactionsToBeReprocessed = loan.getLoanTransactions().stream()
                     .filter(transaction -> transaction.getTransactionDate().isBefore(transactionDate))
diff --git a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/data/InterestPeriod.java b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/data/InterestPeriod.java
@@ -144,7 +144,8 @@ public BigDecimal getCalculatedDueInterest() {
         long lengthTillPeriodDueDate = getLengthTillPeriodDueDate();
         final BigDecimal interestDueTillRepaymentDueDate = getCalculatedDueInterest(
                 getRepaymentPeriod().getLoanProductRelatedDetail().getInterestMethod(), lengthTillPeriodDueDate); //
-        BigDecimal calculatedDueInterest = MathUtil.negativeToZero(MathUtil.add(getMc(), getCreditedInterest().getAmount(), interestDueTillRepaymentDueDate));
+        BigDecimal calculatedDueInterest = MathUtil
+                .negativeToZero(MathUtil.add(getMc(), getCreditedInterest().getAmount(), interestDueTillRepaymentDueDate));
         return calculatedDueInterest;
     }
 
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanContractTerminationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanContractTerminationTest.java
@@ -130,30 +130,32 @@ public void testLoanContractTerminationSameDisbursementDate() {
         final GlobalConfigurationHelper globalConfigurationHelper = new GlobalConfigurationHelper();
 
         runAt("1 January 2024", () -> {
-/* 
-            PostLoanProductsResponse loanProductsResponse = loanProductHelper.createLoanProduct(create4IProgressive().interestRecognitionOnDisbursementDate(false));
-            Long loanId = applyAndApproveProgressiveLoan(client.getClientId(), loanProductsResponse.getResourceId(), "1 January 2024",
-                    500.0, 7.0, 6, (request) -> request.interestRecognitionOnDisbursementDate(false));
-
-            disburseLoan(loanId, BigDecimal.valueOf(100), "1 January 2024");
-
-            loanTransactionHelper.moveLoanState(loanId,
-                    new PostLoansLoanIdRequest().note("Contract Termination Test").externalId(Utils.randomStringGenerator("", 20)),
-                    "contractTermination");
-
-            verifyTransactions(loanId, //
-                    transaction(100.0, "Disbursement", "01 January 2024"), //
-                    transaction(100.0, "Contract Termination", "01 January 2024"));
-
-            GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
-            assertEquals(BigDecimal.ZERO.stripTrailingZeros(),
-                    loanDetails.getSummary().getInterestCharged().stripTrailingZeros());
-*/
-
-            globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.INTEREST_CHARGED_FROM_DATE_SAME_AS_DISBURSAL_DATE,
-                new PutGlobalConfigurationsRequest().enabled(true));
-
-            PostLoanProductsResponse loanProductsResponse = loanProductHelper.createLoanProduct(create4IProgressive().interestRecognitionOnDisbursementDate(true));
+            /*
+             * PostLoanProductsResponse loanProductsResponse =
+             * loanProductHelper.createLoanProduct(create4IProgressive().interestRecognitionOnDisbursementDate(false));
+             * Long loanId = applyAndApproveProgressiveLoan(client.getClientId(), loanProductsResponse.getResourceId(),
+             * "1 January 2024", 500.0, 7.0, 6, (request) -> request.interestRecognitionOnDisbursementDate(false));
+             *
+             * disburseLoan(loanId, BigDecimal.valueOf(100), "1 January 2024");
+             *
+             * loanTransactionHelper.moveLoanState(loanId, new
+             * PostLoansLoanIdRequest().note("Contract Termination Test").externalId(Utils.randomStringGenerator("",
+             * 20)), "contractTermination");
+             *
+             * verifyTransactions(loanId, // transaction(100.0, "Disbursement", "01 January 2024"), //
+             * transaction(100.0, "Contract Termination", "01 January 2024"));
+             *
+             * GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
+             * assertEquals(BigDecimal.ZERO.stripTrailingZeros(),
+             * loanDetails.getSummary().getInterestCharged().stripTrailingZeros());
+             */
+
+            globalConfigurationHelper.updateGlobalConfiguration(
+                    GlobalConfigurationConstants.INTEREST_CHARGED_FROM_DATE_SAME_AS_DISBURSAL_DATE,
+                    new PutGlobalConfigurationsRequest().enabled(true));
+
+            PostLoanProductsResponse loanProductsResponse = loanProductHelper
+                    .createLoanProduct(create4IProgressive().interestRecognitionOnDisbursementDate(true));
             Long loanId = applyAndApproveProgressiveLoan(client.getClientId(), loanProductsResponse.getResourceId(), "1 January 2024",
                     500.0, 7.0, 6, (request) -> request.interestRecognitionOnDisbursementDate(true));
 
@@ -168,11 +170,11 @@ public void testLoanContractTerminationSameDisbursementDate() {
                     transaction(204.11, "Contract Termination", "01 January 2024"));
 
             GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
-            assertEquals(BigDecimal.valueOf(4.11).stripTrailingZeros(),
-                    loanDetails.getSummary().getInterestCharged().stripTrailingZeros());
+            assertEquals(BigDecimal.valueOf(4.11).stripTrailingZeros(), loanDetails.getSummary().getInterestCharged().stripTrailingZeros());
 
-            globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.INTEREST_CHARGED_FROM_DATE_SAME_AS_DISBURSAL_DATE,
-                new PutGlobalConfigurationsRequest().enabled(false));
+            globalConfigurationHelper.updateGlobalConfiguration(
+                    GlobalConfigurationConstants.INTEREST_CHARGED_FROM_DATE_SAME_AS_DISBURSAL_DATE,
+                    new PutGlobalConfigurationsRequest().enabled(false));
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1217,7 +1217,6 @@ private BigDecimal setScaleAndDefaultToNullIfZero(final BigDecimal value) {`
`1217`	`1217`	`}`
`1218`	`1218`
`1219`	`1219`	`public boolean isFirstNormalInstallment(List<LoanRepaymentScheduleInstallment> installments) {`
`1220`		`- return installments.stream().filter(rp -> !rp.isDownPayment())`
`1221`		`- .findFirst().stream().anyMatch(rp -> rp.equals(this));`
	`1220`	`+ return installments.stream().filter(rp -> !rp.isDownPayment()).findFirst().stream().anyMatch(rp -> rp.equals(this));`
`1222`	`1221`	`}`
`1223`	`1222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1902,7 +1902,8 @@ private void handleAccelerateMaturityDate(final LoanTransaction loanTransaction,`
`1902`	`1902`	`MathUtil.nullToZero(currentInstallment.getTotalPaidInAdvance()).add(futureTotalPaidInAdvance));`
`1903`	`1903`	`}`
`1904`	`1904`
`1905`		`- final List<LoanRepaymentScheduleInstallment> installmentsUpToTransactionDate = loan.getInstallmentsUpToTransactionDate(transactionDate);`
	`1905`	`+ final List<LoanRepaymentScheduleInstallment> installmentsUpToTransactionDate = loan`
	`1906`	`+ .getInstallmentsUpToTransactionDate(transactionDate);`
`1906`	`1907`
`1907`	`1908`	`final List<LoanTransaction> transactionsToBeReprocessed = loan.getLoanTransactions().stream()`
`1908`	`1909`	`.filter(transaction -> transaction.getTransactionDate().isBefore(transactionDate))`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ public BigDecimal getCalculatedDueInterest() {`
`144`	`144`	`long lengthTillPeriodDueDate = getLengthTillPeriodDueDate();`
`145`	`145`	`final BigDecimal interestDueTillRepaymentDueDate = getCalculatedDueInterest(`
`146`	`146`	`getRepaymentPeriod().getLoanProductRelatedDetail().getInterestMethod(), lengthTillPeriodDueDate); //`
`147`		`- BigDecimal calculatedDueInterest = MathUtil.negativeToZero(MathUtil.add(getMc(), getCreditedInterest().getAmount(), interestDueTillRepaymentDueDate));`
	`147`	`+ BigDecimal calculatedDueInterest = MathUtil`
	`148`	`+ .negativeToZero(MathUtil.add(getMc(), getCreditedInterest().getAmount(), interestDueTillRepaymentDueDate));`
`148`	`149`	`return calculatedDueInterest;`
`149`	`150`	`}`
`150`	`151`