CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 64 Packages Projects Releases Wiki Activity

FINERACT-2317: Include capitalized income and buy down fee in available disbursement calculation

Browse Source
This commit is contained in:
Oleksii Novikov
2025-08-06 09:19:23 +02:00
committed by Adam Saghy
parent 9f53440543
commit 25b440b842
4 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanDisbursementValidator.java
+8 -13
View File
@@ -22,6 +22,7 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import lombok.RequiredArgsConstructor;
import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.infrastructure.core.service.MathUtil;
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
import org.apache.fineract.portfolio.loanaccount.exception.InvalidLoanStateTransitionException;
import org.apache.fineract.portfolio.loanaccount.exception.LoanDisbursalException;
@@ -35,15 +36,18 @@ public final class LoanDisbursementValidator {
public void compareDisbursedToApprovedOrProposedPrincipal(final Loan loan, final BigDecimal disbursedAmount,
final BigDecimal totalDisbursed) {
final BigDecimal capitalizedIncome = loan.getSummary().getTotalCapitalizedIncome();
final BigDecimal totalCapitalizedIncome = loan.getSummary().getTotalCapitalizedIncome();
final BigDecimal totalCapitalizedIncomeAdjustment = MathUtil.nullToZero(loan.getSummary().getTotalCapitalizedIncomeAdjustment());
final BigDecimal netCapitalizedIncome = totalCapitalizedIncome.subtract(totalCapitalizedIncomeAdjustment);
if (loan.loanProduct().isDisallowExpectedDisbursements() && loan.loanProduct().isAllowApprovedDisbursedAmountsOverApplied()) {
validateOverMaximumAmount(loan, totalDisbursed, capitalizedIncome);
validateOverMaximumAmount(loan, totalDisbursed, netCapitalizedIncome);
} else {
if (loan.loanProduct().isAllowApprovedDisbursedAmountsOverApplied()) {
validateOverMaximumAmount(loan, disbursedAmount, capitalizedIncome);
validateOverMaximumAmount(loan, disbursedAmount, netCapitalizedIncome);
} else {
if ((totalDisbursed.compareTo(loan.getApprovedPrincipal()) > 0)
|| (totalDisbursed.add(capitalizedIncome).compareTo(loan.getApprovedPrincipal()) > 0)) {
|| (totalDisbursed.add(netCapitalizedIncome).compareTo(loan.getApprovedPrincipal()) > 0)) {
final String errorMsg = "Loan can't be disbursed, disburse amount is exceeding approved principal.";
throw new LoanDisbursalException(errorMsg, "disburse.amount.must.be.less.than.approved.principal", totalDisbursed,
loan.getApprovedPrincipal());
@@ -65,15 +69,6 @@ public final class LoanDisbursementValidator {
}
}
public void validateDisburseAmountNotExceedingApprovedAmount(final Loan loan, final BigDecimal diff,
final BigDecimal principalDisbursed) {
if (!loan.loanProduct().isMultiDisburseLoan() && diff.compareTo(BigDecimal.ZERO) < 0) {
final String errorMsg = "Loan can't be disbursed,disburse amount is exceeding approved amount ";
throw new LoanDisbursalException(errorMsg, "disburse.amount.must.be.less.than.approved.amount", principalDisbursed,
loan.getLoanRepaymentScheduleDetail().getPrincipal().getAmount());
}
}
public void validateDisburseDate(final Loan loan, final LocalDate disbursedOn, final LocalDate expectedDate) {
if (expectedDate != null
&& (DateUtils.isAfter(disbursedOn, loan.fetchRepaymentScheduleInstallment(1).getDueDate())
fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanAccountDelinquencyRangeEventSerializerTest.java
Vendored
+6
View File
@@ -100,6 +100,7 @@ import org.apache.fineract.portfolio.loanaccount.service.LoanChargeService;
import org.apache.fineract.portfolio.loanaccount.service.LoanReadPlatformService;
import org.apache.fineract.portfolio.loanaccount.service.LoanTransactionProcessingService;
import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct;
import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRelatedDetail;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -367,9 +368,14 @@ public class LoanAccountDelinquencyRangeEventSerializerTest {
LoanProduct loanProduct = Mockito.mock(LoanProduct.class);
when(loanProduct.isMultiDisburseLoan()).thenReturn(false);
LoanProductRelatedDetail loanProductRelatedDetail = Mockito.mock(LoanProductRelatedDetail.class);
when(loanProductRelatedDetail.isEnableIncomeCapitalization()).thenReturn(false);
Loan loan = Mockito.spy(Loan.class);
ReflectionTestUtils.setField(loan, "loanProduct", loanProduct);
ReflectionTestUtils.setField(loan, "loanStatus", LoanStatus.ACTIVE);
when(loan.getLoanRepaymentScheduleDetail()).thenReturn(loanProductRelatedDetail);
LoanTransaction transaction1 = Mockito.mock(LoanTransaction.class);
LoanTransaction transaction2 = Mockito.mock(LoanTransaction.class);
CollectionData collectionData = Mockito.mock(CollectionData.class);