FINERACT-2312: full term calculation #5219

budaidev · 2025-12-11T13:53:30Z

Description

Describe the changes made and why they were made.

Ignore if these details are present on the associated Apache Fineract JIRA ticket.

Checklist

Please make sure these boxes are checked before submitting your pull request - thanks!

Write the commit message as per https://github.com/apache/fineract/#pull-requests
Acknowledge that we will not review PRs that are not passing the build ("green") - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
Create/update unit or integration tests for verifying the changes made.
Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)

FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.

adamsaghy · 2025-12-17T11:19:29Z

> Task :fineract-progressive-loan-embeddable-schedule-generator:test

org.apache.fineract.portfolio.loanaccount.loanschedule.domain.EmbeddableProgressiveLoanScheduleGeneratorTest

  Test testGenerate() PASSED

SUCCESS: Executed 1 tests in 2.6s

gradle/actions: Writing build results to /home/runner/work/_temp/.gradle-actions/build-results/__run_2-1765970062079.json

[Incubating] Problems report is available at: file:///home/runner/work/fineract/fineract/build/reports/problems/problems-report.html

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

For more on this, please refer to https://docs.gradle.org/8.14.3/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation.

BUILD SUCCESSFUL in 29s
49 actionable tasks: 1 executed, 48 up-to-date
Error: Exception in thread "main" java.lang.NoClassDefFoundError: org/slf4j/LoggerFactory
	at org.apache.fineract.portfolio.loanaccount.loanschedule.domain.ProgressiveLoanScheduleGenerator.<clinit>(ProgressiveLoanScheduleGenerator.java:62)
	at org.apache.fineract.portfolio.loanaccount.loanschedule.domain.EmbeddableProgressiveLoanScheduleGenerator.<init>(EmbeddableProgressiveLoanScheduleGenerator.java:41)
	at Main.main(Main.java:43)
Caused by: java.lang.ClassNotFoundException: org.slf4j.LoggerFactory
	at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:641)
	at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188)
	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:526)
	... 3 more
Error: Process completed with exit code 1.

adamsaghy · 2025-12-19T14:01:26Z

    (see https://errorprone.info/bugpattern/NonApiType)
/home/runner/work/fineract/fineract/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java:1672: error: [UnusedMethod] Method 'calculateFnResultFromDate' is never used.
    private BigDecimal calculateFnResultFromDate(final List<RepaymentPeriod> periods, final LocalDate fromDate, final MathContext mc) {
                       ^
    (see https://errorprone.info/bugpattern/UnusedMethod)
  Did you mean to remove this line?

Aman-Mittal · 2025-12-20T16:22:19Z

...-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/data/RepaymentPeriod.java

+    public BigDecimal getRateFactorPlus1FromDate(LocalDate fromDate) {
+        return interestPeriods.stream().filter(ip -> !ip.getFromDate().isBefore(fromDate)).map(InterestPeriod::getRateFactor)
+                .reduce(BigDecimal.ONE, BigDecimal::add);
+    }


getRateFactorPlus1FromDate
has implementation .reduce(BigDecimal.ONE, BigDecimal::add);

1 + rate1 + rate2 + rate3 ...

But the Javadoc says:

sum of (Rate Factor + 1) from interest periods
similar to.
(rate1 + 1) + (rate2 + 1) + ...

Needs some more clarification in this javadoc, it is ambiguous

Aman-Mittal · 2025-12-20T16:28:41Z

...-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/data/RepaymentPeriod.java

+     *            the date from which to include interest periods
+     * @return rate factor plus 1 for filtered interest periods
+     */
+    public BigDecimal getRateFactorPlus1FromDate(LocalDate fromDate) {


Are we sure that interestPeriods never be null?

adamsaghy · 2026-01-05T11:18:25Z

...oanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java

        final Integer installmentAmountInMultiplesOf = loan.getLoanProductRelatedDetail().getInstallmentAmountInMultiplesOf();
        ProgressiveLoanInterestScheduleModel scheduleModel = emiCalculator.generateInstallmentInterestScheduleModel(installments,
                LoanConfigurationDetailsMapper.map(loan), installmentAmountInMultiplesOf, overpaymentHolder.getMoneyObject().getMc());
+


This whole thing can be handled as part of emiCalculator.generateInstallmentInterestScheduleModel

adamsaghy · 2026-01-05T11:19:57Z

...che/fineract/portfolio/loanaccount/loanschedule/domain/ProgressiveLoanScheduleGenerator.java

                expectedRepaymentPeriods, loanApplicationTerms.toLoanConfigurationDetails(),
                loanApplicationTerms.getInstallmentAmountInMultiplesOf(), mc);
+
+        interestScheduleModel.allowFullTermForTranche(loanApplicationTerms.isAllowFullTermForTranche());


Same as above

allowFullTermForTranche can be stored on the model as part of loanProductRelatedDetail.
originalNumberOfRepayments we don t need this. Its already there on the loanProductRelatedDetail

adamsaghy · 2026-01-05T11:25:21Z

...che/fineract/portfolio/loanaccount/loanschedule/domain/ProgressiveLoanScheduleGenerator.java

+                emiCalculator.addRepaymentPeriods(interestScheduleModel, extensionResult.disbursementDate,
+                        extensionResult.additionalPeriods, List.of());
+            }
+        }


I dont think we need this at all. When a new disbursement added to the loan, we can handle the additional periods to be added.

adamsaghy · 2026-01-05T11:29:10Z

...che/fineract/portfolio/loanaccount/loanschedule/domain/ProgressiveLoanScheduleGenerator.java

            final List<LoanScheduleModelPeriod> periods, final BigDecimal chargesDueAtTimeOfDisbursement,
            final boolean includeDisbursementsAfterMaturityDate, final MathContext mc) {

+        // Check if any disbursement has actually occurred (only relevant for Full Term Tranche)


Why do we need this?

adamsaghy · 2026-01-05T11:31:12Z

...che/fineract/portfolio/loanaccount/loanschedule/domain/ProgressiveLoanScheduleGenerator.java

+
+    private ScheduleExtensionResult calculateAdditionalPeriodsForFullTermTranches(final List<DisbursementData> disbursementDataList,
+            final List<LoanScheduleModelRepaymentPeriod> existingPeriods, final LoanApplicationTerms loanApplicationTerms) {
+        if (disbursementDataList.size() <= 1) {
+            return new ScheduleExtensionResult(0, null);
+        }
+
+        int maxAdditionalPeriods = 0;
+        LocalDate maxDisbursementDate = null;
+        final int numberOfRepayments = loanApplicationTerms.getNumberOfRepayments();
+        final int currentPeriodCount = existingPeriods.size();
+
+        // For each subsequent tranche, calculate how many additional periods are needed
+        // Each tranche needs 'numberOfRepayments' periods starting from its disbursement period
+        for (int i = 1; i < disbursementDataList.size(); i++) {
+            DisbursementData disbursementData = disbursementDataList.get(i);
+            // Skip expected disbursements that haven't actually been disbursed yet
+            if (!disbursementData.isDisbursed()) {
+                continue;
+            }
+            LocalDate disbursementDate = disbursementData.disbursementDate();
+            int periodIndex = findPeriodIndexForDate(disbursementDate, existingPeriods);
+            int lastRequiredPeriodIndex = periodIndex + numberOfRepayments - 1;
+            int additionalPeriodsForThisTranche = Math.max(0, lastRequiredPeriodIndex - currentPeriodCount + 1);
+            if (additionalPeriodsForThisTranche > maxAdditionalPeriods) {
+                maxAdditionalPeriods = additionalPeriodsForThisTranche;
+                maxDisbursementDate = disbursementDate;
+            }
+        }
+
+        return new ScheduleExtensionResult(maxAdditionalPeriods, maxDisbursementDate);
+    }
+
+    private record ScheduleExtensionResult(int additionalPeriods, LocalDate disbursementDate) {
+    }
+
+    private int findPeriodIndexForDate(final LocalDate date, final List<LoanScheduleModelRepaymentPeriod> periods) {
+        for (int i = 0; i < periods.size(); i++) {
+            LoanScheduleModelRepaymentPeriod period = periods.get(i);
+            if (!date.isBefore(period.getFromDate()) && date.isBefore(period.getDueDate())) {
+                return i;
+            }
+        }
+        return periods.size() - 1;
+    }
+
+    private List<LoanScheduleModelRepaymentPeriod> generateAdditionalPeriods(final MathContext mc, final int additionalPeriods,
+            final List<LoanScheduleModelRepaymentPeriod> existingPeriods, final LoanApplicationTerms loanApplicationTerms,
+            final HolidayDetailDTO holidayDetailDTO) {
+        final Money zeroAmount = Money.zero(loanApplicationTerms.getCurrency(), mc);
+        final List<LoanScheduleModelRepaymentPeriod> extensionPeriods = new ArrayList<>(additionalPeriods);
+
+        LoanScheduleModelRepaymentPeriod lastPeriod = existingPeriods.get(existingPeriods.size() - 1);
+        LocalDate lastRepaymentDate = lastPeriod.getDueDate();
+        int startingPeriodNumber = existingPeriods.size() + 1;
+
+        for (int i = 0; i < additionalPeriods; i++) {
+            LocalDate nextRepaymentDate = generateNextRepaymentDate(lastRepaymentDate, loanApplicationTerms, false);
+
+            if (i == additionalPeriods - 1) {
+                nextRepaymentDate = adjustRepaymentDate(nextRepaymentDate, loanApplicationTerms, holidayDetailDTO).getChangedScheduleDate();
+            }
+
+            extensionPeriods.add(LoanScheduleModelRepaymentPeriod.repayment(startingPeriodNumber + i, lastRepaymentDate, nextRepaymentDate,
+                    zeroAmount, zeroAmount, zeroAmount, zeroAmount, zeroAmount, zeroAmount, false, mc));
+            lastRepaymentDate = nextRepaymentDate;
+        }
+
+        return extensionPeriods;
+    }
+
+    private LocalDate generateNextRepaymentDate(final LocalDate lastRepaymentDate, final LoanApplicationTerms loanApplicationTerms,
+            final boolean isFirstRepayment) {
+        return scheduledDateGenerator.generateNextRepaymentDate(lastRepaymentDate, loanApplicationTerms, isFirstRepayment);
+    }
+
+    private AdjustedDateDetailsDTO adjustRepaymentDate(final LocalDate repaymentDate, final LoanApplicationTerms loanApplicationTerms,
+            final HolidayDetailDTO holidayDetailDTO) {
+        return scheduledDateGenerator.adjustRepaymentDate(repaymentDate, loanApplicationTerms, holidayDetailDTO);
+    }


I dont think we need any of these... its not part of the generator to handle it, but the EmiCalculator "addDisbursement". ProgressiveLoanScheduleGenerator should NOT modifiy directly the ProgressiveLoanScheduleModel. Its not its responsibility!

adamsaghy · 2026-01-05T11:32:21Z

...rg/apache/fineract/portfolio/loanproduct/calc/data/ProgressiveLoanInterestScheduleModel.java

    private LocalDate lastOverdueBalanceChange;

+    @Setter
+    private boolean allowFullTermForTranche = false;


This should be part of loanProductRelatedDetail

adamsaghy · 2026-01-05T11:32:35Z

...rg/apache/fineract/portfolio/loanproduct/calc/data/ProgressiveLoanInterestScheduleModel.java

+    private boolean allowFullTermForTranche = false;
+
+    @Setter
+    private int originalNumberOfRepayments;


This already available on the loanProductRelatedDetail

adamsaghy · 2026-01-05T11:36:21Z

...-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/data/RepaymentPeriod.java

+     *            the date from which to include interest periods
+     * @return rate factor plus 1 for filtered interest periods
+     */
+    public BigDecimal getRateFactorPlus1FromDate(LocalDate fromDate) {


We dont need this. We are already supporting mid period disbursements.

adamsaghy · 2026-01-05T11:39:13Z

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

+        }
+    }
+
+    private void addFullTermTrancheDisbursement(final ProgressiveLoanInterestScheduleModel scheduleModel,


I dont think we need this. When we are disbursing, we are simply checking the "on the fly" period should use how many periods. If the allowFullTermForTranche is true, we should just simply provide to the on-the-fly" model the number of installments from the loan product related details.

adamsaghy · 2026-01-05T11:49:58Z

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

+     * Term Tranche calculations where a disbursement occurs mid-period, this ensures only interest periods from the
+     * disbursement date are included.
+     */
+    private BigDecimal calculateRateFactorPlus1NFromDate(final List<RepaymentPeriod> periods, final LocalDate fromDate,


I dont think we need this either. The "addDisbursement" action should handle all.

adamsaghy · 2026-01-05T11:50:36Z

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

-                .ifPresent((repaymentPeriod) -> calculateEMIValueAndRateFactors(
-                        getEffectiveRepaymentDueDate(scheduleModel, repaymentPeriod, operation.getSubmittedOnDate()), scheduleModel,
-                        operation));
+        if (scheduleModel.allowFullTermForTranche() && scheduleModel.originalNumberOfRepayments() > 0) {


We dont need a separate logic for this.

Add

//TODO: If the allow full tranche is TRUE, we should generate and the new repayment periods to the `relatedRepaymentPeriods`

to the org.apache.fineract.portfolio.loanproduct.calc.ProgressiveEMICalculator#calculateEMIValueAndRateFactorsForDecliningBalanceInterestMethod

adamsaghy · 2026-01-05T11:54:28Z

...ain/java/org/apache/fineract/portfolio/loanaccount/service/LoanRepaymentScheduleService.java

                // Process disbursement data
                DisbursementData data = (DisbursementData) dataItem.getData();
-                periodData = createLoanSchedulePeriodData(data, disbursementChargeAmount, waivedChargeAmount);
+                // For FTT: only add disbursed tranches to cumulative balance


why do we need this?

budaidev force-pushed the FINERACT-2412/schedule-handling-and-calculation branch 2 times, most recently from c7d8a3b to ed3c0ea Compare December 17, 2025 06:47

budaidev marked this pull request as ready for review December 17, 2025 06:48

budaidev force-pushed the FINERACT-2412/schedule-handling-and-calculation branch 2 times, most recently from 8503394 to b677187 Compare December 17, 2025 11:10

budaidev force-pushed the FINERACT-2412/schedule-handling-and-calculation branch 5 times, most recently from 4327678 to a05daaa Compare December 19, 2025 05:42

budaidev marked this pull request as draft December 19, 2025 06:07

budaidev marked this pull request as ready for review December 19, 2025 08:49

budaidev force-pushed the FINERACT-2412/schedule-handling-and-calculation branch from a05daaa to 65e7bac Compare December 19, 2025 11:26

budaidev and others added 2 commits December 19, 2025 12:32

FINERACT-2312: full term calculation

37797f6

FINERACT-2412: added e2e tests for full term calculation

8d1e9d5

budaidev force-pushed the FINERACT-2412/schedule-handling-and-calculation branch from 65e7bac to 5a2503b Compare December 19, 2025 12:05

FINERACT-2412: add full term tranche calculations

b4ad7ae

budaidev force-pushed the FINERACT-2412/schedule-handling-and-calculation branch from 5a2503b to b4ad7ae Compare December 19, 2025 14:12

Aman-Mittal reviewed Dec 20, 2025

View reviewed changes

adamsaghy self-requested a review December 23, 2025 11:43

adamsaghy reviewed Jan 5, 2026

View reviewed changes

budaidev closed this Jan 9, 2026

FINERACT-2312: full term calculation #5219

FINERACT-2312: full term calculation #5219

Uh oh!

Conversation

budaidev commented Dec 11, 2025

Description

Checklist

Uh oh!

adamsaghy commented Dec 17, 2025

Uh oh!

adamsaghy commented Dec 19, 2025

Uh oh!

Aman-Mittal Dec 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adamsaghy Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Aman-Mittal Dec 20, 2025 •

edited

Loading

adamsaghy Jan 5, 2026 •

edited

Loading