FINERACT-2354: Re-aging Interest Handling Option: Equal Amortization #5102

somasorosdpc · 2025-10-14T08:38:36Z

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.

.../test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java

...rc/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransactionRepository.java

.../src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanTransactionService.java

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java

...neract/portfolio/loanaccount/domain/transactionprocessor/impl/ProgressiveTransactionCtx.java

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

adamsaghy · 2025-11-04T11:34:35Z

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

+        if (isEqualInstallmentForInterest) {
+            target.setInterestCharged(MathUtil.add(reAgedInstallment.getInterestCharged(), target.getInterestPaid()));
+            target.setInterestAccrued(MathUtil.add(target.getInterestAccrued(), reAgedInstallment.getInterestAccrued()));
+        }
+        if (isEqualInstallmentForFeesAndPenalties) {
+            target.setFeeChargesCharged(MathUtil.add(reAgedInstallment.getFeeChargesCharged(), target.getFeeChargesPaid()));
+            target.setFeeAccrued(MathUtil.add(target.getInterestAccrued(), reAgedInstallment.getFeeAccrued()));
+            target.setPenaltyCharges(MathUtil.add(reAgedInstallment.getPenaltyCharges(), target.getPenaltyChargesPaid()));
+            target.setPenaltyAccrued(MathUtil.add(target.getInterestAccrued(), reAgedInstallment.getPenaltyAccrued()));
+        }


Lets keep the logic where we calculate the model and simply update the balance from there. I dont want to have N+1 logic

...apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java

.../apache/fineract/portfolio/loanaccount/service/ProgressiveLoanInterestRefundServiceImpl.java

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

.../org/apache/fineract/portfolio/loanaccount/service/LoanTransactionProcessingServiceImpl.java

…interest handling options

somasorosdpc changed the title ~~FINERACT-2354: Re-aging Interest Handling Option: Equal Amortization~~ WIP: FINERACT-2354: Re-aging Interest Handling Option: Equal Amortization Oct 14, 2025

somasorosdpc force-pushed the FINERACT-2354/Re-aging--InterestHandlingOption-EqualAmortization branch 3 times, most recently from 57ebadc to acc6f6e Compare October 15, 2025 11:02

somasorosdpc changed the title ~~WIP: FINERACT-2354: Re-aging Interest Handling Option: Equal Amortization~~ FINERACT-2354: Re-aging Interest Handling Option: Equal Amortization Oct 28, 2025

somasorosdpc force-pushed the FINERACT-2354/Re-aging--InterestHandlingOption-EqualAmortization branch 2 times, most recently from 162e543 to 90f37e7 Compare November 3, 2025 09:28

adamsaghy reviewed Nov 3, 2025

View reviewed changes

.../test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java Outdated Show resolved Hide resolved

adamsaghy reviewed Nov 3, 2025

View reviewed changes

...rc/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransactionRepository.java Outdated Show resolved Hide resolved

adamsaghy reviewed Nov 3, 2025

View reviewed changes

.../src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanTransactionService.java Outdated Show resolved Hide resolved

somasorosdpc force-pushed the FINERACT-2354/Re-aging--InterestHandlingOption-EqualAmortization branch from 90f37e7 to 0667f0e Compare November 4, 2025 09:30

adamsaghy marked this pull request as ready for review November 4, 2025 09:31

somasorosdpc force-pushed the FINERACT-2354/Re-aging--InterestHandlingOption-EqualAmortization branch from 0667f0e to df85c1d Compare November 4, 2025 10:46