FINERACT-2455: WorkingCapital - % repayment modification options by budaidev · Pull Request #5771 · apache/fineract

budaidev · 2026-04-15T09:40:21Z

WorkingCapital - % repayment modification options in the middle of the loan life cycle

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 our guidelines
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 our 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
This PR must not be a "code dump". Large changes can be made in a branch, with assistance. Ask for help on the developer mailing list.

Your assigned reviewer(s) will follow our guidelines for code reviews.

adamsaghy · 2026-04-22T14:07:07Z

@budaidev Please rebase

adamsaghy · 2026-04-24T13:07:43Z

@budaidev Please rebase

Aman-Mittal

Please address my comments, reviewed based on code changes only. Currently no usecase doc in ticket or in code so i will not able to review based on Use Case implementation

adamsaghy · 2026-04-29T14:24:00Z

@budaidev Please rebase.

adamsaghy · 2026-04-30T19:34:34Z

    }
+
+    @PUT
+    @Path("{loanId}/rate")


"rate" as endpoint is not descriptive, lets rename: payment-rate

adamsaghy · 2026-04-30T19:36:05Z

+        public String locale;
+
+        @Schema(example = "dd MMMM yyyy")
+        public String dateFormat;


No dates involved. Having dateFormat seems useless, no?

adamsaghy · 2026-04-30T19:39:01Z

    private final List<AppliedPayment> appliedPayments;

+    @Getter(AccessLevel.NONE)
+    private final List<RateSegment> rateSegments;


I was wondering whether we should rename this to reflect better the involved logic:

We are changing the projected payment amount

I dont think the model need to know the payment percentage rate, but rather what is the expected payment amount only, no?

adamsaghy · 2026-04-30T19:40:00Z

+        final BigDecimal newNetDisb = balanceAtSplit;
+        final BigDecimal newDiscount = origDiscount.add(origNet, mc).subtract(balanceAtSplit, mc).subtract(paymentsReceived, mc);
+        final BigDecimal newDailyPayment = tpv.multiply(newPeriodPaymentRate, mc).divide(BigDecimal.valueOf(npvDayCount), mc).setScale(2,
+                RoundingMode.HALF_UP);


Is it wise to hardcode rounding? I think we should rather rely on the configured rounding rules instead!

adamsaghy · 2026-04-30T19:41:39Z

    private String jsonModelVersion;
+
+    @Column(name = "previous_json_model", columnDefinition = "text")
+    private String previousJsonModel;


Do we need to know it?

adamsaghy · 2026-04-30T19:43:20Z


+    @Override
+    @Transactional
+    public CommandProcessingResult updateRate(final Long loanId, final JsonCommand command) {


Lets use more descriptive method name... update rate could mean many thing and maybe other similar, but not same operations might be implemented.

adamsaghy · 2026-04-30T19:43:51Z

+        if (loan.getLoanStatus() != LoanStatus.ACTIVE) {
+            throw new PlatformApiDataValidationException("validation.msg.wc.loan.rate.change.not.allowed",
+                    "Period payment rate change is allowed only for active loans", "loanStatus");
+        }
+
+        final BigDecimal newRate = this.fromApiJsonHelper.extractBigDecimalNamed(WorkingCapitalLoanConstants.periodPaymentRateParamName,
+                command.parsedJson(), new HashSet<>());
+        final BigDecimal previousRate = loan.getLoanProductRelatedDetails().getPeriodPaymentRate();
+
+        if (previousRate != null && previousRate.compareTo(newRate) == 0) {
+            throw new PlatformApiDataValidationException("validation.msg.wc.loan.rate.change.same.rate",
+                    "New period payment rate is the same as the current rate", WorkingCapitalLoanConstants.periodPaymentRateParamName);
+        }


These should be in the validator class, no?

adamsaghy

Kindly review my concerns!

Also the calculator getting more complex, some comments which explain calculations should be added to help our work in the future.

…he middle of the loan life cycle

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch 3 times, most recently from 1a44be3 to ffff593 Compare April 16, 2026 20:42

budaidev marked this pull request as ready for review April 16, 2026 20:43

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch from ffff593 to e1c7df0 Compare April 17, 2026 04:39

budaidev changed the title ~~FINERACT-2455: WorkingCapital - % repayment modification options in t…~~ FINERACT-2455: WorkingCapital - % repayment modification options Apr 22, 2026

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch 2 times, most recently from d556345 to 744409d Compare April 24, 2026 13:05

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch 5 times, most recently from 53c4074 to 8608328 Compare April 26, 2026 19:00

Aman-Mittal reviewed Apr 28, 2026

View reviewed changes

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch from 8608328 to 5cad8ee Compare April 28, 2026 12:58

MarianaDmytrivBinariks force-pushed the FINERACT-2455/wc-period-payment-rate-change branch 2 times, most recently from 98c6dbb to b261a90 Compare April 28, 2026 14:03

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch 4 times, most recently from 1572df9 to 9878cd2 Compare April 29, 2026 11:41

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch from 9878cd2 to 3335dd5 Compare April 29, 2026 14:40

adamsaghy reviewed Apr 30, 2026

View reviewed changes

adamsaghy requested changes Apr 30, 2026

View reviewed changes

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch from 3335dd5 to a82c065 Compare April 30, 2026 20:48

FINERACT-2455: WorkingCapital - % repayment modification options in t…

6ff8921

…he middle of the loan life cycle

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch 2 times, most recently from c68ab85 to 1403499 Compare May 1, 2026 05:25

FINERACT-2455: e2e test scenarios for period payment rate change

b586c82

budaidev force-pushed the FINERACT-2455/wc-period-payment-rate-change branch from 1403499 to b586c82 Compare May 1, 2026 12:25

Conversation

budaidev commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

adamsaghy commented Apr 22, 2026

Uh oh!

adamsaghy commented Apr 24, 2026

Uh oh!

Aman-Mittal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamsaghy commented Apr 29, 2026

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

budaidev commented Apr 15, 2026 •

edited

Loading