FINERACT-1971: update installment accrued portions on charge accrual

apache · Dec 9, 2024 · 3e375b6 · 3e375b6
1 parent bc2ef08
commit 3e375b6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
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
@@ -768,7 +768,11 @@ public LoanTransaction handleChargeAppliedTransaction(final LoanCharge loanCharg
         final LoanTransaction applyLoanChargeTransaction = LoanTransaction.accrueLoanCharge(this, getOffice(), chargeAmount,
                 transactionDate, feeCharges, penaltyCharges, externalId);
 
-        Integer installmentNumber = null;
+        final LoanRepaymentScheduleInstallment installmentForCharge = this.getRelatedRepaymentScheduleInstallment(loanCharge.getDueDate());
+        installmentForCharge.updateAccrualPortion(installmentForCharge.getInterestAccrued(this.getCurrency()),
+                installmentForCharge.getFeeAccrued(this.getCurrency()).add(feeCharges),
+                installmentForCharge.getPenaltyAccrued(this.getCurrency()).add(penaltyCharges));
+        Integer installmentNumber = installmentForCharge.getInstallmentNumber();
         final LoanChargePaidBy loanChargePaidBy = new LoanChargePaidBy(applyLoanChargeTransaction, loanCharge,
                 loanCharge.getAmount(getCurrency()).getAmount(), installmentNumber);
         applyLoanChargeTransaction.getLoanChargesPaid().add(loanChargePaidBy);

diff --git a/...n-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargeProgressiveTest.java b/...n-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargeProgressiveTest.java
@@ -25,7 +25,9 @@
 import org.apache.fineract.client.models.PostChargesResponse;
 import org.apache.fineract.client.models.PostLoanProductsResponse;
 import org.apache.fineract.client.models.PostLoansResponse;
+import org.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants;
 import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -65,4 +67,26 @@ public void loanChargeAfterMaturityTest() {
             validateRepaymentPeriod(loanDetails2, 5, LocalDate.of(2024, 10, 2), 0, 20, 0, 0);
         });
     }
+
+    @Test
+    public void immediateChargeAccrualPostMaturityTest() {
+        runAt("03 October 2024", () -> {
+            executeInlineCOB(loanId);
+            globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_IMMEDIATE_CHARGE_ACCRUAL_POST_MATURITY,
+                    true);
+            final PostChargesResponse chargeResponse = createCharge(20.0d, "EUR");
+            addLoanCharge(loanId, chargeResponse.getResourceId(), "03 October 2024", 20.0d);
+            final GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
+            Assertions.assertTrue(
+                    loanDetails.getTransactions().stream().anyMatch(t -> t.getType().getAccrual() && t.getAmount().equals(20.0d)));
+        });
+        runAt("04 October 2024", () -> {
+            globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_IMMEDIATE_CHARGE_ACCRUAL_POST_MATURITY,
+                    false);
+            executeInlineCOB(loanId);
+            final GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
+            Assertions.assertTrue(
+                    loanDetails.getTransactions().stream().anyMatch(t -> t.getType().getAccrual() && t.getAmount().equals(20.0d)));
+        });
+    }
 }