FINERACT-2421: Working Capital loan details extended by alberto-art3ch · Pull Request #5859 · apache/fineract

alberto-art3ch · 2026-05-19T03:36:46Z

Description

Working Capital loan details extended to be used mainly for UI, like summary, account details, transactions

FINERACT-2421

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-05-20T20:44:09Z

                "null",
                "bigdecimal"
            ]
+        },


I dont think we need this

Done removed!

adamsaghy · 2026-05-20T20:44:42Z

    private boolean isLoanProductLinkedToFloatingRate;
    private Long fundId;
    private String fundName;
+    private String officeName;


Seems irrelevant...

Done removed!

adamsaghy · 2026-05-20T20:45:52Z

        @Schema(example = "0.0", description = "Approved discount set during loan approval")
        public BigDecimal discountApproved;
+        @Schema(example = "90", description = "Loan term in days (originalPaymentNumber from amortization schedule); null if schedule not yet generated")
+        public Integer totalDays;


Please rename to "totalNoPayments"

adamsaghy · 2026-05-20T20:46:15Z

        @Schema(example = "0.00", description = "Penalty charges portion from allocation")
        public BigDecimal penaltyChargesPortion;
+        @Schema(example = "500.00", description = "Amortized income portion (discount fee for transactions with an income relation, zero otherwise)")
+        public BigDecimal amortizedIncomePortion;


I dont think we need this field

Done removed!

adamsaghy · 2026-05-20T20:47:01Z

    private final BigDecimal actualAmortizationAmount;
    private final BigDecimal incomeModification;
    private final BigDecimal deferredBalance;
+    private final BigDecimal feesAmount;


We are not planning to add fees to Amortization schedule...

Done removed!

adamsaghy · 2026-05-20T20:47:22Z

    private BigDecimal discount;
    private BigDecimal discountProposed;
    private BigDecimal discountApproved;
+    private Integer totalDays;


Please rename to "totalNoPayments"

adamsaghy · 2026-05-20T20:47:47Z

+    // Income recognition
+    private BigDecimal realizedIncome;
+    private BigDecimal unrealizedIncome;
+    private BigDecimal overpaymentAmount;


Wrong group... overpayment does not belong to "Income recognition"

Done updated!

adamsaghy · 2026-05-20T20:48:05Z

+    private BigDecimal principalOutstanding;
+    private BigDecimal principalOverdue;
+
+    // Discount fee (cargo financiero del WC loan)


Please remove: (cargo financiero del WC loan)

adamsaghy · 2026-05-20T20:48:28Z

+    private BigDecimal principalDisbursed;
+    private BigDecimal principalPaid;
+    private BigDecimal principalOutstanding;
+    private BigDecimal principalOverdue;


We can remove: principalOverdue, not applicable to Working Capital loans

adamsaghy · 2026-05-20T20:48:54Z

+    private BigDecimal discountCharged;
+    private BigDecimal discountPaid;
+    private BigDecimal discountOutstanding;
+    private BigDecimal discountOverdue;


We can remove discountOverdue. Not applicable to Working Capital loans.

adamsaghy · 2026-05-20T20:49:11Z

+    private BigDecimal totalExpectedRepayment;
+    private BigDecimal totalRepayment;
+    private BigDecimal totalOutstanding;
+    private BigDecimal totalOverdue;


totalOverdue we can remove, not applicable for working capital loans.

adamsaghy · 2026-05-20T20:49:18Z

+    private BigDecimal totalRepayment;
+    private BigDecimal totalOutstanding;
+    private BigDecimal totalOverdue;
+    private BigDecimal totalRecovered;


totalRecovered we can remove, not applicable for working capital loans.

adamsaghy · 2026-05-20T20:49:53Z

+    // Transaction summaries
+    private BigDecimal totalDisbursement;
+    private BigDecimal totalRepaymentTransaction;
+    private BigDecimal totalRepaymentTransactionReversed;


We can remove this field, not bringing any value...

adamsaghy · 2026-05-20T20:50:05Z

    private BigDecimal feeChargesPortion;
    private BigDecimal penaltyChargesPortion;
+    // Income recognized in this transaction (e.g. discount fee on disbursement).
+    private BigDecimal amortizedIncomePortion;


No need for this field...

Done removed!

adamsaghy · 2026-05-20T20:50:15Z

                .actualAmortizationAmount(roundMoney(payment.actualAmortizationAmount())) //
                .incomeModification(roundMoney(payment.incomeModification())) //
                .deferredBalance(roundMoney(payment.deferredBalance())) //
+                .feesAmount(BigDecimal.ZERO) //


Please remove

adamsaghy · 2026-05-20T20:50:36Z

    @Mapping(target = "delinquencyGraceDays", source = "loanProductRelatedDetails.delinquencyGraceDays")
    @Mapping(target = "delinquencyStartType", source = "loanProductRelatedDetails", qualifiedByName = "delinquencyStartTypeData")
    @Mapping(target = "collectionData", ignore = true)
+    @Mapping(target = "totalDays", ignore = true)


Rename to totalNoPayments

adamsaghy

Please review my concerns.

adamsaghy · 2026-05-22T13:59:45Z

> Task :fineract-working-capital-loan:compileTestJava
/home/runner/work/fineract/fineract/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapperTest.java:103: error: cannot find symbol
        assertEquals(BigDecimal.ZERO, data.getAmortizedIncomePortion());
                                          ^
  symbol:   method getAmortizedIncomePortion()
  location: variable data of type WorkingCapitalLoanTransactionData
/home/runner/work/fineract/fineract/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapperTest.java:132: error: cannot find symbol
        assertEquals(BigDecimal.ZERO, data.getAmortizedIncomePortion());
                                          ^
  symbol:   method getAmortizedIncomePortion()
  location: variable data of type WorkingCapitalLoanTransactionData
/home/runner/work/fineract/fineract/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapperTest.java:158: error: cannot find symbol
        assertEquals(discountAmount, data.getAmortizedIncomePortion());
                                         ^
  symbol:   method getAmortizedIncomePortion()
  location: variable data of type WorkingCapitalLoanTransactionData
3 errors

alberto-art3ch changed the title ~~FINERACT-2421: Working Capital loan details extended~~ WEB-954: Performance, Subscription management migration May 19, 2026

alberto-art3ch changed the title ~~WEB-954: Performance, Subscription management migration~~ FINERACT-2421: Working Capital loan details extended May 19, 2026

alberto-art3ch force-pushed the FINERACT-2421/working-capital-loan-extend-details branch from 365d2a9 to f59370b Compare May 19, 2026 14:06

adamsaghy reviewed May 20, 2026

View reviewed changes

adamsaghy requested changes May 20, 2026

View reviewed changes

alberto-art3ch force-pushed the FINERACT-2421/working-capital-loan-extend-details branch 2 times, most recently from c4989ab to 52fecb4 Compare May 22, 2026 03:20

alberto-art3ch force-pushed the FINERACT-2421/working-capital-loan-extend-details branch 2 times, most recently from b578bfe to 975cc92 Compare May 22, 2026 14:52

FINERACT-2421: Working Capital loan details extended

ca3ae07

alberto-art3ch force-pushed the FINERACT-2421/working-capital-loan-extend-details branch from 975cc92 to ca3ae07 Compare May 22, 2026 16:04

Conversation

alberto-art3ch commented May 19, 2026

Description

Checklist

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 May 20, 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!

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 May 20, 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!

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!

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 left a comment

Choose a reason for hiding this comment

Uh oh!

adamsaghy commented May 22, 2026

Uh oh!

Reviewers

Assignees

adamsaghy May 20, 2026 •

edited

Loading

adamsaghy May 20, 2026 •

edited

Loading