Skip to content

FINERACT-2520: Add disbursement charges to total repayment expected in progressive loan schedule #5592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wiki05 wants to merge 1 commit into
base: develop
Choose a base branch
from
+38 −0
Open

FINERACT-2520: Add disbursement charges to total repayment expected in progressive loan schedule #5592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../fineract/portfolio/loanaccount/loanschedule/domain/ProgressiveLoanScheduleGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ public LoanScheduleModel generate(final MathContext mc, final LoanApplicationTer
scheduleParams.incrementPeriodNumber();
}

if (chargesDueAtTimeOfDisbursement.compareTo(BigDecimal.ZERO) > 0) {
scheduleParams.addTotalRepaymentExpected(Money.of(currency, chargesDueAtTimeOfDisbursement, mc));
}
Copy link
Contributor

@Aman-Mittal Aman-Mittal Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Can you add a unit test covering this case for coverage?

Copy link
Author

@Wiki05 Wiki05 Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Aman-Mittal , I've added a new unit test to LoanScheduleGeneratorTest.java that verifies the inclusion of disbursement charges in the total repayment. Please let me know if it looks good now!


if (loanApplicationTerms.isMultiDisburseLoan()) {
processDisbursements(loanApplicationTerms, disbursementDataList, scheduleParams, interestScheduleModel, periods,
chargesDueAtTimeOfDisbursement, true, mc);
Expand Down
34 changes: 34 additions & 0 deletions .../apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanScheduleGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class LoanScheduleGeneratorTest {
private static final CurrencyData CURRENCY = APPLICATION_CURRENCY.toData();
private static final BigDecimal DISBURSEMENT_AMOUNT = BigDecimal.valueOf(192.22);
private static final BigDecimal DISBURSEMENT_AMOUNT_100 = BigDecimal.valueOf(100);
private static final BigDecimal DISBURSEMENT_CHARGE = BigDecimal.valueOf(10.0);
private static final BigDecimal NOMINAL_INTEREST_RATE = BigDecimal.valueOf(9.99);
private static final int NUMBER_OF_REPAYMENTS = 6;
private static final int REPAYMENT_FREQUENCY = 1;
Expand Down Expand Up @@ -168,4 +169,37 @@ private void checkDownPaymentPeriod(LoanSchedulePlanDownPaymentPeriod period, in
assertEquals(0, expectedTotalDue.compareTo(period.getTotalDueAmount()));
assertEquals(0, expectedOutstandingLoanBalance.compareTo(period.getOutstandingLoanBalance()));
}

@Test
void testGenerateLoanScheduleWithDisbursementCharges() {
LoanRepaymentScheduleModelData modelData = new LoanRepaymentScheduleModelData(LocalDate.of(2024, 1, 1), CURRENCY,
DISBURSEMENT_AMOUNT, DISBURSEMENT_DATE, NUMBER_OF_REPAYMENTS, REPAYMENT_FREQUENCY, REPAYMENT_FREQUENCY_TYPE,
NOMINAL_INTEREST_RATE, false, DaysInMonthType.DAYS_30, DaysInYearType.DAYS_360, null, null, null, false, null,
InterestMethod.DECLINING_BALANCE, true, false);

ScheduledDateGenerator scheduledDateGenerator = new DefaultScheduledDateGenerator();
ProgressiveLoanScheduleGenerator generator = new ProgressiveLoanScheduleGenerator(scheduledDateGenerator, emiCalculator,
interestScheduleModelRepositoryWrapperMock);
generator.setLoanTransactionProcessingService(loanTransactionProcessingService);

LoanSchedulePlan loanSchedule = generator.generate(mc, modelData);

BigDecimal totalPrincipal = BigDecimal.ZERO;
BigDecimal totalInterest = BigDecimal.ZERO;
BigDecimal totalDueAmount = BigDecimal.ZERO;

for (var period : loanSchedule.getPeriods()) {
if (period instanceof LoanSchedulePlanRepaymentPeriod repayment) {
totalPrincipal = totalPrincipal.add(repayment.getPrincipalAmount());
totalInterest = totalInterest.add(repayment.getInterestAmount());
totalDueAmount = totalDueAmount.add(repayment.getTotalDueAmount());
}
}

BigDecimal expectedTotalWithCharge = totalPrincipal.add(totalInterest).add(DISBURSEMENT_CHARGE);

assertEquals(0, expectedTotalWithCharge.stripTrailingZeros().compareTo(totalDueAmount.stripTrailingZeros()),
"The sum of all period totals should include the disbursement charge");
}

}