FINERACT-2421: Disbursement charge amount incorrect calculation

[alberto-art3ch]

Description

Disbursement charge amount incorrect calculation for full/partial disbursement. Repayment schedule and charges Charges: values are not based on disb amount+interest

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.

[Aman-Mittal]

The method can be refactored to improve readability and maintainability. Consider:

Flattening the nested conditionals and using early returns to clarify the control flow.

Assigning loan.getDisbursementDetails() to a local variable to avoid repeated calls.

Replacing the manual loop for summing disbursements with a stream-based reduce operation.

Structuring the “sum disbursements” and “fallback principal” paths separately to make the logic clearer.

Optionally, renaming the method to better reflect its behavior.

[alberto-art3ch]

Code updated, please review @Aman-Mittal

[Aman-Mittal]

See my review

[Aman-Mittal]

Is this test skipped due to flaky test? just curious

[alberto-art3ch]

It was skipped now has been fixed and available for testing

[Aman-Mittal]

here is suggestion this may be more cleaner

private Money sumMultiDisbursementAmounts(final Loan loan) {
if (!loan.isMultiDisburmentLoan()) {
return Money.zero(loan.getCurrency());
}

final List<LoanDisbursementDetails> disbursements = loan.getDisbursementDetails();
final String currency = loan.getCurrency();

if (loan.isSubmittedAndPendingApproval()) {
    return Money.of(currency, loan.getProposedPrincipal());
}

if (loan.isApproved()) {
    return Money.of(currency, loan.getApprovedPrincipal());
}

// For open loans or any loans with disbursement details
BigDecimal totalPrincipal = disbursements.stream()
        .map(LoanDisbursementDetails::principal)
        .reduce(BigDecimal.ZERO, BigDecimal::add);

return Money.of(currency, totalPrincipal);

}

[alberto-art3ch]

Done! code updated