FINERACT-2455: Add WC near-breach evaluation business step by oleksii-novikov-onix · Pull Request #5849 · apache/fineract

oleksii-novikov-onix · 2026-05-14T15:37:33Z

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.

galovics

I'm not convinced CREDIT_BALANCE_REFUND should be in REDUCING_TRANSACTION_TYPES here.

A CREDIT_BALANCE_REFUND is the bank returning an overpayment to the borrower - money leaving the loan, not an inbound payment. Summing it in paidInWindow would make the borrower appear to have paid more than they actually did, and could suppress a near-breach trigger that should have fired. None of the e2e scenarios exercise this path, so a bug here would go undetected.

Wouldn't it make more sense to only count REPAYMENT and GOODWILL_CREDIT? (And worth a double-check on GOODWILL_CREDIT too - that's a bank-side write-off, not a borrower payment, though at least it goes the right direction.)

https://github.com/apache/fineract/blob/FINERACT-2455/wc-near-breach-evaluation-business-step/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java#L782-L783

oleksii-novikov-onix · 2026-05-18T06:09:38Z

@galovics Thanks, I removed CREDIT_BALANCE_REFUND

adamsaghy · 2026-05-19T11:11:05Z

+            final BigDecimal requiredCumulative = thresholdFraction.multiply(BigDecimal.valueOf(index + 1L), MoneyHelper.getMathContext())
+                    .multiply(period.getMinPaymentAmount(), MoneyHelper.getMathContext());


We can extract this calculation into a method for better readability + please use Money object for appropriate rounding and number of digist after decimal point.

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

+            anyPassed = true;
+            final BigDecimal requiredCumulative = thresholdFraction.multiply(BigDecimal.valueOf(index + 1L), MoneyHelper.getMathContext())
+                    .multiply(period.getMinPaymentAmount(), MoneyHelper.getMathContext());
+            final BigDecimal paidCumulative = transactionRepository.sumPaymentsInWindow(loanId, period.getFromDate(), evalDate,


Please use Money object for appropriate rounding and number of digist after decimal point.

adamsaghy · 2026-05-19T11:26:15Z

+        final boolean isDisbursed = input.getDisbursementDetails().stream()
+                .map(WorkingCapitalLoanDisbursementDetails::getActualDisbursementDate).anyMatch(Objects::nonNull);
+        if (!isDisbursed) {
+            log.debug("Skipping near breach evaluation for WC loan {} - not yet disbursed", input.getId());
+            return input;
+        }


Please use the WorkingCapitalLoan.loanStatus instead.

adamsaghy · 2026-05-19T11:27:14Z

+    private final WorkingCapitalLoanNearBreachEvaluationService nearBreachEvaluationService;
+
+    @Override
+    public WorkingCapitalLoan execute(final WorkingCapitalLoan input) {


I would rename input field to something more relevant, like: "loan".

adamsaghy · 2026-05-19T11:28:53Z

+        }
+
+        final LocalDate businessDate = DateUtils.getBusinessLocalDate();
+        nearBreachEvaluationService.evaluateNearBreach(input, businessDate.plusDays(1L));


why to increase the date by 1? COB date is the date on we evaluate the near-breach, am i missing something?

adamsaghy · 2026-05-19T11:30:05Z

+            AND t.reversed = false
+            AND t.transactionType IN :reducingTypes
+            """)
+    BigDecimal sumPaymentsInWindow(@Param("loanId") Long loanId, @Param("fromDate") LocalDate fromDate, @Param("toDate") LocalDate toDate,


We dont need this. Paid amount is available on the breach schedule already.

adamsaghy · 2026-05-19T11:31:25Z

    @Override
-    public void evaluateBreachAndNearBreach(final WorkingCapitalLoan loan, final LocalDate businessDate) {
+    public void evaluateBreach(final WorkingCapitalLoan loan, final LocalDate businessDate) {
        final List<WorkingCapitalLoanBreachSchedule> allPeriods = repository.findByLoanIdOrderByPeriodNumberAsc(loan.getId());


I dont think we need all periods. Fetch only the (one) relevant by business date, please

…n business step

galovics reviewed May 15, 2026

View reviewed changes

oleksii-novikov-onix force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from a743639 to 9ca4f57 Compare May 18, 2026 06:07

oleksii-novikov-onix force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from 9ca4f57 to 55cc88c Compare May 18, 2026 12:13

ruzeynalov force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from 55cc88c to ff9bfb2 Compare May 18, 2026 12:23

oleksii-novikov-onix marked this pull request as ready for review May 18, 2026 14:48

oleksii-novikov-onix force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from ff9bfb2 to 0546770 Compare May 19, 2026 10:06

adamsaghy reviewed May 19, 2026

View reviewed changes

Comment thread ...ract-e2e-tests-runner/src/test/resources/features/WorkingCapitalNearBreachEvaluation.feature Outdated

adamsaghy reviewed May 19, 2026

View reviewed changes

Comment thread .../portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java Outdated

adamsaghy reviewed May 19, 2026

View reviewed changes

ruzeynalov force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from 0546770 to eef3043 Compare May 19, 2026 12:38

oleksii-novikov-onix force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from eef3043 to 406aa0e Compare May 19, 2026 14:58

oleksii-novikov-onix and others added 2 commits May 19, 2026 21:17

FINERACT-2455: Add WC near-breach evaluation business step

ca8e448

FINERACT-2455: Added e2e tests for verifying WC near-breach evaluatio…

2801210

…n business step

oleksii-novikov-onix force-pushed the FINERACT-2455/wc-near-breach-evaluation-business-step branch from 406aa0e to 2801210 Compare May 19, 2026 18:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FINERACT-2455: Add WC near-breach evaluation business step#5849

FINERACT-2455: Add WC near-breach evaluation business step#5849
oleksii-novikov-onix wants to merge 2 commits into
apache:developfrom
openMF:FINERACT-2455/wc-near-breach-evaluation-business-step

oleksii-novikov-onix commented May 14, 2026

Uh oh!

galovics left a comment

Uh oh!

oleksii-novikov-onix commented May 18, 2026

Uh oh!

Uh oh!

Uh oh!

adamsaghy May 19, 2026 •

edited

Loading

Uh oh!

adamsaghy May 19, 2026

Uh oh!

adamsaghy May 19, 2026

Uh oh!

adamsaghy May 19, 2026 •

edited

Loading

Uh oh!

adamsaghy May 19, 2026

Uh oh!

adamsaghy May 19, 2026

Uh oh!

adamsaghy May 19, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		final BigDecimal requiredCumulative = thresholdFraction.multiply(BigDecimal.valueOf(index + 1L), MoneyHelper.getMathContext())
		.multiply(period.getMinPaymentAmount(), MoneyHelper.getMathContext());

Conversation

oleksii-novikov-onix commented May 14, 2026

Description

Checklist

Uh oh!

galovics left a comment

Choose a reason for hiding this comment

Uh oh!

oleksii-novikov-onix commented May 18, 2026

Uh oh!

Uh oh!

Uh oh!

adamsaghy May 19, 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!

adamsaghy May 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy May 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy May 19, 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!

adamsaghy May 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy May 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsaghy May 19, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

adamsaghy May 19, 2026 •

edited

Loading

adamsaghy May 19, 2026 •

edited

Loading

adamsaghy May 19, 2026 •

edited

Loading