Fix disbursement validation to respect over-applied loan product configuration

Author: P-ragati

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanDisbursementValidator.java

@@ -24,6 +24,7 @@
 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.loanproduct.domain.LoanProduct;
 import org.apache.fineract.portfolio.loanaccount.exception.InvalidLoanStateTransitionException;
 import org.apache.fineract.portfolio.loanaccount.exception.LoanDisbursalException;
 import org.springframework.stereotype.Component;
@@ -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);
+            }
+        }
+
+        BigDecimal total = totalDisbursed.add(capitalizedIncome);
+        if (maxAllowed == null) {
+            maxAllowed = approvedPrincipal;
+        }
+        if (total.compareTo(maxAllowed) > 0) {
             final String errorMessage = String.format(
-                    "Loan disbursal amount can't be greater than maximum applied loan amount calculation. "
-                            + "Total disbursed amount: %s  Maximum disbursal amount: %s",
-                    totalDisbursed.stripTrailingZeros().toPlainString(), maxDisbursedAmount.stripTrailingZeros().toPlainString());
+                "Disbursement exceeds allowed limit including over-applied threshold. Total disbursed amount: %s  Maximum allowed: %s",
+                total.stripTrailingZeros().toPlainString(), maxAllowed.stripTrailingZeros().toPlainString());
             throw new InvalidLoanStateTransitionException("disbursal",
-                    "amount.can't.be.greater.than.maximum.applied.loan.amount.calculation", errorMessage, totalDisbursed,
-                    maxDisbursedAmount);
+                "amount.can't.be.greater.than.maximum.applied.loan.amount.calculation", errorMessage, total, maxAllowed);
         }
     }