P-ragati commented on code in PR #5693:
URL: https://github.com/apache/fineract/pull/5693#discussion_r2992762180
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanDisbursementValidator.java:
##########
@@ -39,29 +40,59 @@ public void
compareDisbursedToApprovedOrProposedPrincipal(final Loan loan, final
final BigDecimal totalCapitalizedIncomeAdjustment =
MathUtil.nullToZero(loan.getSummary().getTotalCapitalizedIncomeAdjustment());
final BigDecimal netCapitalizedIncome =
totalCapitalizedIncome.subtract(totalCapitalizedIncomeAdjustment);
- if (loan.loanProduct().isAllowApprovedDisbursedAmountsOverApplied()) {
- // Validate total disbursed amount (after this transaction)
against max allowed
- validateOverMaximumAmount(loan, totalDisbursed,
netCapitalizedIncome);
- } else {
- if ((totalDisbursed.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());
+ // Always use the same logic for over-applied config and fallback
+ LoanProduct loanProduct = loan.getLoanProduct();
+ BigDecimal approvedPrincipal = loan.getApprovedPrincipal();
+ BigDecimal maxAllowed = approvedPrincipal;
+
+ if (loanProduct.getOverAppliedCalculationType() != null &&
loanProduct.getOverAppliedNumber() != null) {
+ BigDecimal overAppliedNumber =
BigDecimal.valueOf(loanProduct.getOverAppliedNumber());
+ if
("percentage".equalsIgnoreCase(loanProduct.getOverAppliedCalculationType())) {
+ BigDecimal extra =
approvedPrincipal.multiply(overAppliedNumber).divide(BigDecimal.valueOf(100));
+ maxAllowed = approvedPrincipal.add(extra);
+ } else {
+ // ABSOLUTE (flat)
+ maxAllowed = approvedPrincipal.add(overAppliedNumber);
}
}
+
+ BigDecimal total = totalDisbursed.add(netCapitalizedIncome);
+ if (maxAllowed == null) {
+ maxAllowed = approvedPrincipal;
+ }
+ if (total.compareTo(maxAllowed) > 0) {
+ throw new LoanDisbursalException(
+ "Disbursement exceeds allowed limit including over-applied
threshold",
+ "disburse.amount.must.be.less.than.or.equal.to.max.allowed",
total, maxAllowed);
+ }
}
public void validateOverMaximumAmount(final Loan loan, final BigDecimal
totalDisbursed, final BigDecimal capitalizedIncome) {
- final BigDecimal maxDisbursedAmount =
loanApplicationValidator.getOverAppliedMax(loan);
- if
(totalDisbursed.add(capitalizedIncome).compareTo(maxDisbursedAmount) > 0) {
+ LoanProduct loanProduct = loan.getLoanProduct();
+ BigDecimal approvedPrincipal = loan.getApprovedPrincipal();
+ BigDecimal maxAllowed = approvedPrincipal;
+
+ if (loanProduct.getOverAppliedCalculationType() != null &&
loanProduct.getOverAppliedNumber() != null) {
+ BigDecimal overAppliedNumber =
BigDecimal.valueOf(loanProduct.getOverAppliedNumber());
+ if
("percentage".equalsIgnoreCase(loanProduct.getOverAppliedCalculationType())) {
+ BigDecimal extra =
approvedPrincipal.multiply(overAppliedNumber).divide(BigDecimal.valueOf(100));
+ maxAllowed = approvedPrincipal.add(extra);
+ } else {
+ // ABSOLUTE (flat)
+ maxAllowed = approvedPrincipal.add(overAppliedNumber);
+ }
+ }
+
Review Comment:
Updated. Removed duplicated max calculation and now consistently using
loanApplicationValidator.getOverAppliedMax(loan) to centralize the logic.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
