FINERACT-2354: Re-aging: -Interest Handling Option: Equal amortization

Reimplement charge handling

Author: somasorosdpc

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepaymentScheduleInstallment.java

@@ -260,6 +260,17 @@ public LoanRepaymentScheduleInstallment(Loan loan, Integer installmentNumber, Lo
         this.isReAged = isReAged;
     }
 
+    public static LoanRepaymentScheduleInstallment newReAgedInstallment(final Loan loan, final Integer installmentNumber,
+            final LocalDate fromDate, final LocalDate dueDate, final BigDecimal principal, final BigDecimal interest, final BigDecimal fees,
+            final BigDecimal penalties, final BigDecimal interestAccrued, final BigDecimal feeAccrued, final BigDecimal penaltyAccrued) {
+        LoanRepaymentScheduleInstallment installment = new LoanRepaymentScheduleInstallment(loan, installmentNumber, fromDate, dueDate,
+                principal, interest, fees, penalties, null, null, null, null, false, false, true);
+        installment.setInterestAccrued(interestAccrued);
+        installment.setFeeAccrued(feeAccrued);
+        installment.setPenaltyAccrued(penaltyAccrued);
+        return installment;
+    }
+
     public static LoanRepaymentScheduleInstallment newReAgedInstallment(final Loan loan, final Integer installmentNumber,
             final LocalDate fromDate, final LocalDate dueDate, final BigDecimal principal, final BigDecimal interest, final BigDecimal fees,
             final BigDecimal penalties) {

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java

@@ -70,7 +70,6 @@
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.organisation.monetary.domain.MoneyHelper;
-import org.apache.fineract.portfolio.charge.domain.ChargeCalculationType;
 import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
 import org.apache.fineract.portfolio.loanaccount.data.LoanTermVariationsData;
 import org.apache.fineract.portfolio.loanaccount.data.OutstandingAmountsDTO;
@@ -2686,6 +2685,7 @@ private Set<LoanCharge> getLoanChargesOfInstallment(final Set<LoanCharge> charge
         final boolean isFirstInstallment = installment.getInstallmentNumber().equals(firstInstallmentNumber);
         return charges.stream()
                 .filter(loanCharge -> (loanCharge.isInstalmentFee() && loanCharge.hasInstallmentFor(installment))
+                        || (installment.isReAged() && loanCharge.hasInstallmentFor(installment))
                         || loanCharge.isDueInPeriod(installment.getFromDate(), installment.getDueDate(), isFirstInstallment))
                 .collect(Collectors.toSet());
     }
@@ -3303,51 +3303,48 @@ private void handleReAgeWithCommonStrategy(LoanTransaction loanTransaction, Comm
         Money principalValue = calculatedEMI.value.minus(calculatedInterest.value.add(calculatedFees.value).add(calculatedPenalties.value));
         Money principalAdjust = outstandingBalances.principal.minus(principalValue.multipliedBy(numberOfReAgeInstallments));
         EqualAmortizationValues calculatedPrincipal = new EqualAmortizationValues(principalValue, principalAdjust);
+        List<ReAgedChargeEqualAmortizationValues> calculatedCharges = outstandingBalances.liftedLoanCharges().stream()
+                .map(loanCharge -> new ReAgedChargeEqualAmortizationValues(loanCharge, calculateEqualAmortizationValues(
+                        loanCharge.getAmountOutstanding(currency), numberOfReAgeInstallments, null, currency)))
+                .toList();
 
         FirstReAgeInstallmentProps firstReAgeInstallmentProps = calculateFirstReAgeInstallmentProps(installments,
                 loanReAgeParameter.getStartDate());
 
         LoanRepaymentScheduleInstallment reAgedInstallment = LoanRepaymentScheduleInstallment.newReAgedInstallment(loan,
                 firstReAgeInstallmentProps.reAgedInstallmentNumber, firstReAgeInstallmentProps.fromDate, loanReAgeParameter.getStartDate(),
                 calculatedPrincipal.value.getAmount(), calculatedInterest.value.getAmount(), calculatedFees.value.getAmount(),
-                calculatedPenalties.value.getAmount());
-        // todo redistribute lifted fees and penalties
-        createChargesDuringReAgingIfNeeded(calculatedFees.value.getAmount(), calculatedPenalties.value.getAmount(), outstandingBalances,
-                loan, loanReAgeParameter.getStartDate());
-        reAgedInstallment.setInterestAccrued(calculatedInterestAccrued.value.getAmount());
-        reAgedInstallment.setFeeAccrued(calculatedFeeAccrued.value.getAmount());
-        reAgedInstallment.setPenaltyAccrued(calculatedPenaltyAccrued.value.getAmount());
+                calculatedPenalties.value.getAmount(), calculatedInterestAccrued.value.getAmount(), calculatedFeeAccrued.value.getAmount(),
+                calculatedPenaltyAccrued.value.getAmount());
+
         reAgedInstallment = insertOrReplaceRelatedInstallment(installments, reAgedInstallment, currency,
                 loanTransaction.getTransactionDate(), settings.isEqualInstallmentForInterest(),
                 settings.isEqualInstallmentForFeesAndPenalties());
+        createChargeMappingsForInstallment(reAgedInstallment, calculatedCharges, false);
 
         for (int i = 1; i < numberOfReAgeInstallments; i++) {
             LocalDate calculatedDueDate = calculateReAgedInstallmentDueDate(loanReAgeParameter, reAgedInstallment.getDueDate());
             int nextReAgedInstallmentNumber = firstReAgeInstallmentProps.reAgedInstallmentNumber + i;
-            if (i + 1 == numberOfReAgeInstallments) {
+            boolean isLastInstallment = i + 1 == numberOfReAgeInstallments;
+            if (isLastInstallment) {
                 // Last installment values
                 reAgedInstallment = LoanRepaymentScheduleInstallment.newReAgedInstallment(reAgedInstallment.getLoan(),
                         nextReAgedInstallmentNumber, reAgedInstallment.getDueDate(), calculatedDueDate,
                         calculatedPrincipal.getAdjustedValue().getAmount(), calculatedInterest.getAdjustedValue().getAmount(),
-                        calculatedFees.getAdjustedValue().getAmount(), calculatedPenalties.getAdjustedValue().getAmount());
-                reAgedInstallment.setInterestAccrued(calculatedInterestAccrued.getAdjustedValue().getAmount());
-                reAgedInstallment.setFeeAccrued(calculatedFeeAccrued.getAdjustedValue().getAmount());
-                reAgedInstallment.setPenaltyAccrued(calculatedPenaltyAccrued.getAdjustedValue().getAmount());
-                // todo redistribute lifted fees and penalties
-                createChargesDuringReAgingIfNeeded(calculatedFees.getAdjustedValue().getAmount(),
-                        calculatedPenalties.getAdjustedValue().getAmount(), outstandingBalances, loan, reAgedInstallment.getDueDate());
+                        calculatedFees.getAdjustedValue().getAmount(), calculatedPenalties.getAdjustedValue().getAmount(),
+                        calculatedInterestAccrued.getAdjustedValue().getAmount(), calculatedFeeAccrued.getAdjustedValue().getAmount(),
+                        calculatedPenaltyAccrued.getAdjustedValue().getAmount());
             } else {
                 reAgedInstallment = LoanRepaymentScheduleInstallment.newReAgedInstallment(reAgedInstallment.getLoan(),
                         nextReAgedInstallmentNumber, reAgedInstallment.getDueDate(), calculatedDueDate,
                         calculatedPrincipal.value.getAmount(), calculatedInterest.value.getAmount(), calculatedFees.value.getAmount(),
-                        calculatedPenalties.value.getAmount());
-                // todo redistribute lifted fees and penalties
-                createChargesDuringReAgingIfNeeded(calculatedFees.value.getAmount(), calculatedPenalties.value.getAmount(),
-                        outstandingBalances, loan, reAgedInstallment.getDueDate());
+                        calculatedPenalties.value.getAmount(), calculatedInterestAccrued.value.getAmount(),
+                        calculatedFeeAccrued.value.getAmount(), calculatedPenaltyAccrued.value.getAmount());
             }
             reAgedInstallment = insertOrReplaceRelatedInstallment(installments, reAgedInstallment, currency,
                     loanTransaction.getTransactionDate(), settings.isEqualInstallmentForInterest(),
                     settings.isEqualInstallmentForFeesAndPenalties());
+            createChargeMappingsForInstallment(reAgedInstallment, calculatedCharges, isLastInstallment);
         }
         int lastReAgedInstallmentNumber = reAgedInstallment.getInstallmentNumber();
         List<LoanRepaymentScheduleInstallment> toRemove = installments.stream()
@@ -3361,19 +3358,13 @@ private void handleReAgeWithCommonStrategy(LoanTransaction loanTransaction, Comm
         }
     }
 
-    private void createChargesDuringReAgingIfNeeded(final BigDecimal calculatedFees, final BigDecimal calculatedPenalties,
-            final OutstandingBalances outstandingBalances, final Loan loan, final LocalDate chargeDueDate) {
-        if (MathUtil.nullToZero(calculatedFees).compareTo(BigDecimal.ZERO) > 0) {
-            outstandingBalances.liftedLoanCharges().forEach(charge -> {
-                if (charge.isDueDateCharge()) {
-                    final LoanCharge newLoanCharge = loanChargeService.create(loan, charge.getCharge(), null,
-                            charge.isPenaltyCharge() ? calculatedPenalties : calculatedFees, charge.getChargeTimeType(),
-                            ChargeCalculationType.FLAT, chargeDueDate, charge.getChargePaymentMode(), null, null,
-                            externalIdFactory.create());
-                    loanChargeService.addLoanCharge(loan, newLoanCharge);
-                }
-            });
-        }
+    private void createChargeMappingsForInstallment(final LoanRepaymentScheduleInstallment installment,
+            List<ReAgedChargeEqualAmortizationValues> reAgedChargeEqualAmortizationValues, boolean isLastInstallment) {
+        reAgedChargeEqualAmortizationValues.forEach(amortizationValue -> {
+            BigDecimal value = isLastInstallment ? amortizationValue.equalAmortizationValues.getAdjustedValue().getAmount()
+                    : amortizationValue.equalAmortizationValues.value.getAmount();
+            installment.getInstallmentCharges().add(new LoanInstallmentCharge(value, amortizationValue.charge, installment));
+        });
     }
 
     private FirstReAgeInstallmentProps calculateFirstReAgeInstallmentProps(List<LoanRepaymentScheduleInstallment> installments,
@@ -3522,11 +3513,10 @@ OutstandingBalances liftOutstandingBalances(List<LoanRepaymentScheduleInstallmen
                         .stream()//
                         .filter(c -> MathUtil.isGreaterThanZero(c.getAmountOutstanding()))//
                         .forEach(loanInstallmentCharge -> {
-                            Money outstanding = loanInstallmentCharge.getAmountOutstanding(currency);
-                            if (MathUtil.nullToZero(loanInstallmentCharge.getAmountPaid()).equals(ZERO)) {
-                                ctx.getCharges().remove(loanInstallmentCharge);
-                                loanTransaction.getLoan().getCharges().remove(loanInstallmentCharge);
-                            }
+                            // if (MathUtil.nullToZero(loanInstallmentCharge.getAmountPaid()).equals(ZERO)) {
+                            // ctx.getCharges().remove(loanInstallmentCharge);
+                            // loanTransaction.getLoan().getCharges().remove(loanInstallmentCharge);
+                            // }
                             liftedLoanCharges.add(loanInstallmentCharge);
                         });
                 Money feesOutstanding = i.getFeeChargesOutstanding(currency);
@@ -3582,6 +3572,9 @@ private static final class CommonReAgeSettings {
         boolean isEqualInstallmentForFeesAndPenalties = false;
     }
 
+    private record ReAgedChargeEqualAmortizationValues(LoanCharge charge, EqualAmortizationValues equalAmortizationValues) {
+    }
+
     private record FirstReAgeInstallmentProps(int reAgedInstallmentNumber, LocalDate fromDate) {
     }