FINERACT-2421: fix loan accrual posts after loan close

budaidev · budaidev · commit efc265f9e4d8 · 2026-02-16T12:34:19.000+01:00
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractCumulativeLoanScheduleGenerator.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractCumulativeLoanScheduleGenerator.java
@@ -1462,7 +1462,7 @@ periodNumberTemp, mc, mergeVariationsToMap(loanApplicationTerms, params), params
                 }
             }
 
-            if (!outstanding.isZero()) {
+            if (!outstanding.isZero() || (params.getScheduleTillDate() != null && !params.getLatePaymentMap().isEmpty())) {
                 PrincipalInterest principalInterestForThisPeriod = calculatePrincipalInterestComponentsForPeriod(
                         getPaymentPeriodsInOneYearCalculator(), interestCalculationGraceOnRepaymentPeriodFraction, totalInterest.zero(),
                         totalInterest.zero(), totalInterest.zero(), totalInterest.zero(), outstanding, loanApplicationTerms,
@@ -1499,7 +1499,8 @@ periodNumberTemp, mc, mergeVariationsToMap(loanApplicationTerms, params), params
                 }
             }
             params.setPeriodStartDate(params.getActualRepaymentDate());
-        } while (DateUtils.isBefore(params.getActualRepaymentDate(), currentDate) && !outstanding.isZero());
+        } while (DateUtils.isBefore(params.getActualRepaymentDate(), currentDate)
+                && (!outstanding.isZero() || (params.getScheduleTillDate() != null && !params.getLatePaymentMap().isEmpty())));
 
         if (totalInterest.isGreaterThanZero()) {
             LoanScheduleModelRepaymentPeriod installment = LoanScheduleModelRepaymentPeriod.repayment(params.getInstalmentNumber(),
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualsProcessingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualsProcessingServiceImpl.java
@@ -487,14 +487,19 @@ private void addInterestAccrual(@NonNull final Loan loan, @NonNull final LocalDa
         final AccrualPeriodData period = accrualPeriods.getPeriodByInstallmentNumber(installment.getInstallmentNumber());
         final MonetaryCurrency currency = accrualPeriods.getCurrency();
         Money interest = null;
-        final boolean isPastPeriod = isAfterPeriod(tillDate, installment);
-        final boolean isInPeriod = isInPeriod(tillDate, installment, false);
+        LocalDate effectiveDate = tillDate;
+        if (loan.isClosed() && loan.getClosedOnDate() != null && DateUtils.isBefore(loan.getClosedOnDate(), tillDate)) {
+            effectiveDate = loan.getClosedOnDate();
+        } else if (loanBalanceService.isOverPaid(loan) && loan.getOverpaidOnDate() != null
+                && DateUtils.isBefore(loan.getOverpaidOnDate(), tillDate)) {
+            effectiveDate = loan.getOverpaidOnDate();
+        }
+        final boolean isPastPeriod = isAfterPeriod(effectiveDate, installment);
+        final boolean isInPeriod = isInPeriod(effectiveDate, installment, false);
         if (isPastPeriod || loan.isClosed() || loanBalanceService.isOverPaid(loan)) {
             interest = installment.getInterestCharged(currency).minus(installment.getCreditedInterest());
-        } else {
-            if (isInPeriod) { // first period first day is not accrued
-                interest = scheduleGenerator.getPeriodInterestTillDate(installment, tillDate);
-            }
+        } else if (isInPeriod) {
+            interest = scheduleGenerator.getPeriodInterestTillDate(installment, effectiveDate);
         }
         period.setInterestAmount(interest);
         Money accruable = null;
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/FeignLoanTestBase.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/FeignLoanTestBase.java
@@ -23,6 +23,7 @@
 import org.apache.fineract.client.feign.FineractFeignClient;
 import org.apache.fineract.client.models.GetLoansLoanIdResponse;
 import org.apache.fineract.client.models.GetLoansLoanIdStatus;
+import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTemplateResponse;
 import org.apache.fineract.client.models.PostLoanProductsRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
@@ -97,6 +98,10 @@ protected Long createClient() {
         return clientHelper.createClient();
     }
 
+    protected Long createClient(String activationDate) {
+        return clientHelper.createClient(activationDate);
+    }
+
     protected Long createLoanProduct(PostLoanProductsRequest request) {
         return loanHelper.createLoanProduct(request);
     }
@@ -219,4 +224,12 @@ protected PostLoansLoanIdTransactionsRequest waiveInterest(double amount, String
     protected PostLoansLoanIdTransactionsRequest chargeOff(String date) {
         return LoanRequestBuilders.chargeOff(date);
     }
+
+    protected void executeInlineCOB(Long loanId) {
+        transactionHelper.executeInlineCOB(loanId);
+    }
+
+    protected GetLoansLoanIdTransactionsTemplateResponse getPrepaymentAmount(Long loanId, String transactionDate, String dateFormat) {
+        return transactionHelper.getPrepaymentAmount(loanId, transactionDate, dateFormat);
+    }
 }
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignBusinessDateHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignBusinessDateHelper.java
@@ -28,10 +28,14 @@
 
 public class FeignBusinessDateHelper {
 
+    private static final String ENABLE_BUSINESS_DATE = "enable-business-date";
+
     private final FineractFeignClient fineractClient;
+    private final FeignGlobalConfigurationHelper configHelper;
 
     public FeignBusinessDateHelper(FineractFeignClient fineractClient) {
         this.fineractClient = fineractClient;
+        this.configHelper = new FeignGlobalConfigurationHelper(fineractClient);
     }
 
     public BusinessDateResponse getBusinessDate(String type) {
@@ -49,14 +53,12 @@ public void updateBusinessDate(String type, String date) {
     }
 
     public void runAt(String date, Runnable action) {
-        BusinessDateResponse originalDate = getBusinessDate("BUSINESS_DATE");
         try {
+            configHelper.updateConfigurationByName(ENABLE_BUSINESS_DATE, true);
             updateBusinessDate("BUSINESS_DATE", date);
             action.run();
         } finally {
-            if (originalDate != null && originalDate.getDate() != null) {
-                updateBusinessDate("BUSINESS_DATE", originalDate.getDate().toString());
-            }
+            configHelper.updateConfigurationByName(ENABLE_BUSINESS_DATE, false);
         }
     }
 }
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignClientHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignClientHelper.java
@@ -37,8 +37,11 @@ public FeignClientHelper(FineractFeignClient fineractClient) {
     }
 
     public Long createClient() {
+        return createClient(Utils.dateFormatter.format(Utils.getLocalDateOfTenant()));
+    }
+
+    public Long createClient(String activationDate) {
         String externalId = Utils.randomStringGenerator("EXT_", 7);
-        String activationDate = Utils.dateFormatter.format(Utils.getLocalDateOfTenant());
 
         PostClientsRequest request = new PostClientsRequest()//
                 .officeId(1L)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignTransactionHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignTransactionHelper.java
@@ -20,8 +20,11 @@
 
 import static org.apache.fineract.client.feign.util.FeignCalls.ok;
 
+import java.util.List;
 import java.util.Map;
 import org.apache.fineract.client.feign.FineractFeignClient;
+import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTemplateResponse;
+import org.apache.fineract.client.models.InlineJobRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsTransactionIdRequest;
@@ -34,6 +37,16 @@ public FeignTransactionHelper(FineractFeignClient fineractClient) {
         this.fineractClient = fineractClient;
     }
 
+    public void executeInlineCOB(Long loanId) {
+        InlineJobRequest request = new InlineJobRequest().loanIds(List.of(loanId));
+        ok(() -> fineractClient.inlineJob().executeInlineJob("LOAN_COB", request));
+    }
+
+    public GetLoansLoanIdTransactionsTemplateResponse getPrepaymentAmount(Long loanId, String transactionDate, String dateFormat) {
+        return ok(() -> fineractClient.loanTransactions().retrieveTransactionTemplate(loanId, "prepayLoan", dateFormat, transactionDate,
+                "en", null));
+    }
+
     public Long addRepayment(Long loanId, PostLoansLoanIdTransactionsRequest request) {
         PostLoansLoanIdTransactionsResponse response = ok(
                 () -> fineractClient.loanTransactions().executeLoanTransaction(loanId, request, Map.of("command", "repayment")));
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/LoanProductTemplates.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/LoanProductTemplates.java
@@ -233,6 +233,18 @@ default PostLoanProductsRequest fourInstallmentsCumulativeTemplate() {
                         LoanProductTestBuilder.DUE_PENALTY_FEE_INTEREST_PRINCIPAL_IN_ADVANCE_PRINCIPAL_PENALTY_FEE_INTEREST_STRATEGY);
     }
 
+    default PostLoanProductsRequest fourInstallmentsCumulativeWithInterestRecalculation() {
+        return fourInstallmentsCumulativeTemplate()//
+                .loanScheduleType(LoanScheduleType.CUMULATIVE.toString())//
+                .isInterestRecalculationEnabled(true)//
+                .interestRecalculationCompoundingMethod(0)//
+                .rescheduleStrategyMethod(RescheduleStrategyMethod.REDUCE_EMI_AMOUNT)//
+                .recalculationRestFrequencyType(1)//
+                .recalculationRestFrequencyInterval(0)//
+                .preClosureInterestCalculationStrategy(1)//
+                .enableAccrualActivityPosting(true);
+    }
+
     default PostLoanProductsRequest customizeProduct(PostLoanProductsRequest template,
             Function<PostLoanProductsRequest, PostLoanProductsRequest> customizer) {
         return customizer.apply(template);
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/LoanRequestBuilders.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/LoanRequestBuilders.java
@@ -67,7 +67,7 @@ public static PostLoansRequest applyCumulativeLoan(Long clientId, Long productId
                 .amortizationType(LoanTestData.AmortizationType.EQUAL_INSTALLMENTS)//
                 .interestType(LoanTestData.InterestType.DECLINING_BALANCE)//
                 .interestCalculationPeriodType(LoanTestData.InterestCalculationPeriodType.DAILY)//
-                .transactionProcessingStrategyCode("DUE_PENALTY_FEE_INTEREST_PRINCIPAL_IN_ADVANCE_PRINCIPAL_PENALTY_FEE_INTEREST_STRATEGY")//
+                .transactionProcessingStrategyCode("due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy")//
                 .loanType("individual")//
                 .locale(LoanTestData.LOCALE)//
                 .dateFormat(LoanTestData.DATETIME_PATTERN);
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/LoanTestData.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/LoanTestData.java
@@ -111,6 +111,7 @@ public static class OutstandingAmounts {
 
     public static final class AmortizationType {
 
+        public static final Integer EQUAL_PRINCIPAL = 0;
         public static final Integer EQUAL_INSTALLMENTS = 1;
 
         private AmortizationType() {}
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignLoanAccrualOnClosedLoanTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignLoanAccrualOnClosedLoanTest.java
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTestLifecycleExtension.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTestLifecycleExtension.java

Original file line number	Diff line number	Diff line change
`@@ -1462,7 +1462,7 @@ periodNumberTemp, mc, mergeVariationsToMap(loanApplicationTerms, params), params`
`1462`	`1462`	`}`
`1463`	`1463`	`}`
`1464`	`1464`
`1465`		`- if (!outstanding.isZero()) {`
	`1465`	`+ if (!outstanding.isZero() \|\| (params.getScheduleTillDate() != null && !params.getLatePaymentMap().isEmpty())) {`
`1466`	`1466`	`PrincipalInterest principalInterestForThisPeriod = calculatePrincipalInterestComponentsForPeriod(`
`1467`	`1467`	`getPaymentPeriodsInOneYearCalculator(), interestCalculationGraceOnRepaymentPeriodFraction, totalInterest.zero(),`
`1468`	`1468`	`totalInterest.zero(), totalInterest.zero(), totalInterest.zero(), outstanding, loanApplicationTerms,`
`@@ -1499,7 +1499,8 @@ periodNumberTemp, mc, mergeVariationsToMap(loanApplicationTerms, params), params`
`1499`	`1499`	`}`
`1500`	`1500`	`}`
`1501`	`1501`	`params.setPeriodStartDate(params.getActualRepaymentDate());`
`1502`		`- } while (DateUtils.isBefore(params.getActualRepaymentDate(), currentDate) && !outstanding.isZero());`
	`1502`	`+ } while (DateUtils.isBefore(params.getActualRepaymentDate(), currentDate)`
	`1503`	`+ && (!outstanding.isZero() \|\| (params.getScheduleTillDate() != null && !params.getLatePaymentMap().isEmpty())));`
`1503`	`1504`
`1504`	`1505`	`if (totalInterest.isGreaterThanZero()) {`
`1505`	`1506`	`LoanScheduleModelRepaymentPeriod installment = LoanScheduleModelRepaymentPeriod.repayment(params.getInstalmentNumber(),`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,14 @@`
`28`	`28`
`29`	`29`	`public class FeignBusinessDateHelper {`
`30`	`30`
	`31`	`+ private static final String ENABLE_BUSINESS_DATE = "enable-business-date";`
	`32`	`+`
`31`	`33`	`private final FineractFeignClient fineractClient;`
	`34`	`+ private final FeignGlobalConfigurationHelper configHelper;`
`32`	`35`
`33`	`36`	`public FeignBusinessDateHelper(FineractFeignClient fineractClient) {`
`34`	`37`	`this.fineractClient = fineractClient;`
	`38`	`+ this.configHelper = new FeignGlobalConfigurationHelper(fineractClient);`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`public BusinessDateResponse getBusinessDate(String type) {`
`@@ -49,14 +53,12 @@ public void updateBusinessDate(String type, String date) {`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`public void runAt(String date, Runnable action) {`
`52`		`- BusinessDateResponse originalDate = getBusinessDate("BUSINESS_DATE");`
`53`	`56`	`try {`
	`57`	`+ configHelper.updateConfigurationByName(ENABLE_BUSINESS_DATE, true);`
`54`	`58`	`updateBusinessDate("BUSINESS_DATE", date);`
`55`	`59`	`action.run();`
`56`	`60`	`} finally {`
`57`		`- if (originalDate != null && originalDate.getDate() != null) {`
`58`		`- updateBusinessDate("BUSINESS_DATE", originalDate.getDate().toString());`
`59`		`- }`
	`61`	`+ configHelper.updateConfigurationByName(ENABLE_BUSINESS_DATE, false);`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`}`