FINERACT-2354: Re-aging for Interest bearing products- Interest calculation: Default Behavior #5053

ruzeynalov · 2025-09-24T11:57:03Z

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.

…t bearing products with interest calculation: default behavior

adamsaghy · 2025-10-15T09:48:44Z

...java/org/apache/fineract/portfolio/loanaccount/service/reaging/LoanReAgingValidatorTest.java

                .isEqualTo("validation.msg.loan.reAge.numberOfInstallments.not.greater.than.zero");
    }

+    @Disabled


If this test is not valid anymore, remove it.

adamsaghy · 2025-10-15T09:48:49Z

...java/org/apache/fineract/portfolio/loanaccount/service/reaging/LoanReAgingValidatorTest.java

                .isEqualTo("error.msg.loan.reage.supported.only.for.progressive.loan.schedule.type");
    }

+    @Disabled


If this test is not valid anymore, remove it.

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

adamsaghy · 2025-10-15T09:57:46Z

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

+        final LoanApplicationTerms loanApplicationTerms = new LoanApplicationTerms.Builder().submittedOnDate(expectedDisbursementDate)
+                .currency(currency.getCurrencyData()).repaymentsStartingFromDate(reAgingStartDate)
+                .expectedDisbursementDate(expectedDisbursementDate).principal(outstandingPrincipalBalance.get())
+                .loanTermFrequency(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments())
+                .loanTermPeriodFrequencyType(loanTransaction.getLoanReAgeParameter().getFrequencyType())
+                .numberOfRepayments(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments())
+                .repaymentEvery(loanTransaction.getLoanReAgeParameter().getFrequencyNumber())
+                .repaymentPeriodFrequencyType(loanTransaction.getLoanReAgeParameter().getFrequencyType())
+                .interestRatePerPeriod(interestRate)
+                .interestRatePeriodFrequencyType(loan.getLoanRepaymentScheduleDetail().getRepaymentPeriodFrequencyType())
+                .annualNominalInterestRate(interestRate).daysInMonthType(loan.getLoanProduct().fetchDaysInMonthType())
+                .daysInYearType(loan.getLoanProduct().fetchDaysInYearType()).inArrearsTolerance(Money.zero(currency, mc))
+                .disbursementDatas(disbursementData).isDownPaymentEnabled(false).downPaymentPercentage(ZERO).seedDate(reAgingStartDate)
+                .interestRecognitionOnDisbursementDate(
+                        loan.getLoanProduct().getLoanProductRelatedDetail().isInterestRecognitionOnDisbursementDate())
+                .daysInYearCustomStrategy(loan.getLoanProduct().getLoanProductRelatedDetail().getDaysInYearCustomStrategy())
+                .interestMethod(loan.getLoanProductRelatedDetail().getInterestMethod()).allowPartialPeriodInterestCalculation(
+                        loan.getLoanProduct().getLoanProductRelatedDetail().isAllowPartialPeriodInterestCalculation())
+                .mc(mc).build();
+        final LoanScheduleModel loanScheduleModelForReAging = scheduleGenerator.generate(mc, loanApplicationTerms, null, null);
+
+        // Now merge the temporary schedule with existing installments
+        mergeTemporaryScheduleWithExistingInstallments(loanScheduleModelForReAging, installments, repaymentPeriods, currency,
+                transactionDate, ctx, loan);


@mariiaKraievska Do we need this? I mean ProgressiveEMICalculator and existing ProgressiveLoanInterestScheduleModel + reage parameters would be enough to generate and update the existing ProgressiveLoanInterestScheduleModel and once its done, just update the LoanRepaymentScheduleInstallment based on the model. what do you think?

Done, please check

what changed here?

adamsaghy · 2025-10-15T10:01:24Z

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

+        if (chargeOffTransaction.isPresent()) {
+            repaymentPeriods.stream().filter(rp -> !rp.getDueDate().isBefore(reAgingStartDate) && !rp.isFullyPaid())
+                    .forEach(repaymentPeriod -> {
+                        repaymentPeriod.getInterestPeriods().forEach(interestPeriod -> {


why to set 0 rate factor and mark them as paused?

You're right, it's enough to pause them.

why to pause them? :D

…ult Behavior, interestRecalculation = true, without dueDate change

mariiaKraievska · 2025-10-15T12:05:17Z

PTAL

adamsaghy · 2025-10-15T12:24:39Z

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

+        final Optional<LoanTransaction> chargeOffTransaction = ctx.getAlreadyProcessedTransactions().stream()
+                .filter(t -> ((t.isChargeOff() && (loan.hasAccelerateChargeOffStrategy() || loan.hasZeroInterestChargeOffStrategy()))
+                        || t.isContractTermination()) && !t.isReversed() && t.getTransactionDate().isBefore(reAgingStartDate))
+                .findFirst();


Its 2 types of transactions: chargeoff and contract termination

adamsaghy · 2025-10-15T12:24:54Z

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

+        final Optional<LoanTransaction> chargeOffTransaction = ctx.getAlreadyProcessedTransactions().stream()
+                .filter(t -> ((t.isChargeOff() && (loan.hasAccelerateChargeOffStrategy() || loan.hasZeroInterestChargeOffStrategy()))
+                        || t.isContractTermination()) && !t.isReversed() && t.getTransactionDate().isBefore(reAgingStartDate))
+                .findFirst();


what if txn date and reage start date are matching?

adamsaghy · 2025-10-15T12:37:46Z

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

+                        loan.getLoanProduct().getLoanProductRelatedDetail().isAllowPartialPeriodInterestCalculation())
+                .mc(mc).build();
+        final LoanScheduleModel loanScheduleModelForReAging = scheduleGenerator.generate(mc, loanApplicationTerms, null, null);


I dont think we need this. scheduleGenerator we should use the existing model + the EmiCalculator and introduce a new action: "reage" and provide its parameters. THe EmiCalculator can calculate interim models and update existing one based on that. After the model is updated we can use to update the existing repayment installments based on the model alone.

ruzeynalov marked this pull request as draft September 24, 2025 11:58

ruzeynalov force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch 4 times, most recently from 2ca485f to f9b159c Compare October 2, 2025 11:22

ruzeynalov force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch from f9b159c to 966268f Compare October 7, 2025 12:51

mariiaKraievska force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch 2 times, most recently from 913e0a7 to a68ea39 Compare October 13, 2025 08:23

galovics approved these changes Oct 13, 2025

View reviewed changes

ruzeynalov force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch from e6d847a to 391fbda Compare October 15, 2025 08:00

ruzeynalov marked this pull request as ready for review October 15, 2025 08:01

mariiaKraievska force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch from 391fbda to c70e3c5 Compare October 15, 2025 08:07

FINERACT-2354: added e2e tests for validation of re-aging for interes…

b86f51b

…t bearing products with interest calculation: default behavior

adamsaghy force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch from c70e3c5 to c354140 Compare October 15, 2025 09:45

adamsaghy reviewed Oct 15, 2025

View reviewed changes

...oanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java Outdated Show resolved Hide resolved

adamsaghy reviewed Oct 15, 2025

View reviewed changes

FINERACT-2354: Implemented re-aging for Interest bearing loans - Defa…

3329a93

…ult Behavior, interestRecalculation = true, without dueDate change

mariiaKraievska force-pushed the FINERACT-2354/reaging-for-interest-bearing-products-interest-calculation-default-behaviour branch from c354140 to 3329a93 Compare October 15, 2025 12:00

adamsaghy reviewed Oct 15, 2025

View reviewed changes

FINERACT-2354: Re-aging for Interest bearing products- Interest calculation: Default Behavior #5053

Are you sure you want to change the base?

FINERACT-2354: Re-aging for Interest bearing products- Interest calculation: Default Behavior #5053

Uh oh!

Conversation

ruzeynalov commented Sep 24, 2025

Description

Checklist

Uh oh!

adamsaghy Oct 15, 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!

adamsaghy Oct 15, 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!

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!

mariiaKraievska commented Oct 15, 2025

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

adamsaghy Oct 15, 2025 •

edited

Loading

adamsaghy Oct 15, 2025 •

edited

Loading