FINERACT-2354: Implemented re-aging for Interest bearing loans - Default Behavior, interestRecalculation = true, without dueDate change

Author: mariiaKraievska

fineract-e2e-tests-runner/src/test/resources/features/LoanReAging.feature

@@ -1818,8 +1818,16 @@ public boolean hasAccelerateChargeOffStrategy() {
         return LoanChargeOffBehaviour.ACCELERATE_MATURITY.equals(getLoanProductRelatedDetail().getChargeOffBehaviour());
     }
 
+    public boolean hasZeroInterestChargeOffStrategy() {
+        return LoanChargeOffBehaviour.ZERO_INTEREST.equals(getLoanProductRelatedDetail().getChargeOffBehaviour());
+    }
+
     public boolean hasContractTerminationTransaction() {
         return getLoanTransactions().stream().anyMatch(t -> t.isContractTermination() && t.isNotReversed());
     }
 
+    public boolean hasReAgingTransaction() {
+        return getLoanTransactions().stream().anyMatch(t -> t.isReAge() && t.isNotReversed());
+    }
+
 }

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

@@ -157,7 +157,8 @@ public void handleRepaymentOrRecoveryOrWaiverTransaction(final Loan loan, final
             if (loan.isCumulativeSchedule() && loan.isInterestBearingAndInterestRecalculationEnabled()) {
                 loanScheduleService.regenerateRepaymentScheduleWithInterestRecalculation(loan, scheduleGeneratorDTO);
             } else if (loan.isProgressiveSchedule() && ((loan.hasChargeOffTransaction() && loan.hasAccelerateChargeOffStrategy())
-                    || loan.hasContractTerminationTransaction())) {
+                    || loan.hasContractTerminationTransaction()
+                    || (loan.isInterestRecalculationEnabled() && loan.hasReAgingTransaction()))) {
                 loanScheduleService.regenerateRepaymentSchedule(loan, scheduleGeneratorDTO);
             }
             reprocessLoanTransactionsService.reprocessTransactions(loan);

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanDownPaymentHandlerServiceImpl.java

@@ -62,6 +62,7 @@ public BigDecimal calculateInterestRecalculationFutureOutstandingValue(Loan loan
         ctx.setChargedOff(loan.isChargedOff());
         ctx.setWrittenOff(loan.isClosedWrittenOff());
         ctx.setContractTerminated(loan.isContractTermination());
+        ctx.setReAged(loan.hasReAgingTransaction());
         advancedPaymentScheduleTransactionProcessor.recalculateInterestForDate(nextPaymentDueDate, ctx, false);
         RepaymentPeriod repaymentPeriod = scheduleModel.findRepaymentPeriodByDueDate(nextPaymentDueDate)
                 .orElseGet(scheduleModel::getLastRepaymentPeriod);

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/ProgressivePossibleNextRepaymentCalculationServiceImpl.java

@@ -47,6 +47,8 @@ public class ProgressiveTransactionCtx extends TransactionCtx {
     @Setter
     private boolean isContractTerminated = false;
     @Setter
+    private boolean isReAged = false;
+    @Setter
     private boolean isPrepayAttempt = false;
     private final List<LoanRepaymentScheduleInstallment> skipRepaymentScheduleInstallments = new ArrayList<>();
 

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

@@ -115,6 +115,7 @@ public Optional<ProgressiveLoanInterestScheduleModel> getSavedModel(Loan loan, L
                 ctx.setChargedOff(loan.isChargedOff());
                 ctx.setWrittenOff(loan.isClosedWrittenOff());
                 ctx.setContractTerminated(loan.isContractTermination());
+                ctx.setReAged(loan.hasReAgingTransaction());
                 advancedPaymentScheduleTransactionProcessor.recalculateInterestForDate(businessDate, ctx);
             }
         } else {

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

@@ -140,4 +140,7 @@ Money getPeriodInterestTillDate(@NotNull ProgressiveLoanInterestScheduleModel sc
      * interest paused.
      */
     void applyInterestPause(ProgressiveLoanInterestScheduleModel scheduleModel, LocalDate fromDate, LocalDate endDate);
+
+    void calculateModelForReAgedRepaymentPeriods(ProgressiveLoanInterestScheduleModel scheduleModel, List<RepaymentPeriod> repaymentPeriods,
+            LocalDate tillDate, Money zeroedCreditedPrincipal);
 }

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/InterestScheduleModelRepositoryWrapperImpl.java

@@ -559,7 +559,23 @@ private void calculateEMIValueAndRateFactorsForDecliningBalanceInterestMethod(fi
         }
     }
 
+    @Override
+    public void calculateModelForReAgedRepaymentPeriods(final ProgressiveLoanInterestScheduleModel scheduleModel,
+            final List<RepaymentPeriod> repaymentPeriods, final LocalDate tillDate, final Money zeroedCreditedPrincipal) {
+        repaymentPeriods.forEach(repaymentPeriod -> {
+            calculateOutstandingBalance(scheduleModel);
+        });
+
+        calculateLastUnpaidRepaymentPeriodEMI(scheduleModel, tillDate, zeroedCreditedPrincipal);
+        checkAndAdjustEmiIfNeededOnRelatedRepaymentPeriods(scheduleModel, repaymentPeriods, zeroedCreditedPrincipal);
+    }
+
     private void calculateLastUnpaidRepaymentPeriodEMI(ProgressiveLoanInterestScheduleModel scheduleModel, LocalDate tillDate) {
+        calculateLastUnpaidRepaymentPeriodEMI(scheduleModel, tillDate, null);
+    }
+
+    private void calculateLastUnpaidRepaymentPeriodEMI(ProgressiveLoanInterestScheduleModel scheduleModel, LocalDate tillDate,
+            Money additionalCreditedPrincipal) {
         Optional<RepaymentPeriod> findLastUnpaidRepaymentPeriod = scheduleModel.repaymentPeriods().stream().filter(rp -> !rp.isFullyPaid())
                 .reduce((first, second) -> second);
 
@@ -582,14 +598,17 @@ private void calculateLastUnpaidRepaymentPeriodEMI(ProgressiveLoanInterestSchedu
                     .flatMap(rp -> rp.getInterestPeriods().stream().map(InterestPeriod::getCapitalizedIncomePrincipal))
                     .reduce(scheduleModel.zero(), (m1, m2) -> m1.plus(m2, mc)); // 100
 
-            Money diff = totalDisbursedAmount.plus(totalCapitalizedIncome, mc).plus(scheduleModel.getTotalCreditedPrincipal(), mc)
-                    .plus(totalDueInterest, mc).minus(totalEMI, mc);
+            Money diff = totalDisbursedAmount.plus(totalCapitalizedIncome, mc).plus(scheduleModel.getTotalCreditedPrincipal(), mc);
+            if (additionalCreditedPrincipal != null) {
+                diff = diff.plus(additionalCreditedPrincipal, mc);
+            }
+            diff = diff.plus(totalDueInterest, mc).minus(totalEMI, mc);
 
             repaymentPeriod.setEmi(repaymentPeriod.getEmi().add(diff, mc));
             if (repaymentPeriod.getEmi()
                     .isLessThan(repaymentPeriod.getTotalPaidAmount().minus(repaymentPeriod.getTotalCreditedAmount(), mc))) {
                 repaymentPeriod.setEmi(repaymentPeriod.getTotalPaidAmount().minus(repaymentPeriod.getTotalCreditedAmount(), mc));
-                calculateLastUnpaidRepaymentPeriodEMI(scheduleModel, tillDate);
+                calculateLastUnpaidRepaymentPeriodEMI(scheduleModel, tillDate, additionalCreditedPrincipal);
             }
 
             calculateUnrecognizedInterestTillDateOnScheduleModelCopyAndDefer(scheduleModel, repaymentPeriod, tillDate);
@@ -618,6 +637,11 @@ private void calculateOutstandingBalance(ProgressiveLoanInterestScheduleModel sc
 
     private void checkAndAdjustEmiIfNeededOnRelatedRepaymentPeriods(final ProgressiveLoanInterestScheduleModel scheduleModel,
             final List<RepaymentPeriod> relatedRepaymentPeriods) {
+        checkAndAdjustEmiIfNeededOnRelatedRepaymentPeriods(scheduleModel, relatedRepaymentPeriods, null);
+    }
+
+    private void checkAndAdjustEmiIfNeededOnRelatedRepaymentPeriods(final ProgressiveLoanInterestScheduleModel scheduleModel,
+            final List<RepaymentPeriod> relatedRepaymentPeriods, final Money additionalCreditedPrincipal) {
         MathContext mc = scheduleModel.mc();
         ProgressiveLoanInterestScheduleModel newScheduleModel = null;
         int adjustCounter = 1;
@@ -644,7 +668,11 @@ private void checkAndAdjustEmiIfNeededOnRelatedRepaymentPeriods(final Progressiv
                 }
             });
             calculateOutstandingBalance(newScheduleModel);
-            calculateLastUnpaidRepaymentPeriodEMI(newScheduleModel, relatedPeriodsFirstDueDate);
+            if (additionalCreditedPrincipal != null) {
+                calculateLastUnpaidRepaymentPeriodEMI(newScheduleModel, relatedPeriodsFirstDueDate, additionalCreditedPrincipal);
+            } else {
+                calculateLastUnpaidRepaymentPeriodEMI(newScheduleModel, relatedPeriodsFirstDueDate);
+            }
             if (!getEmiAdjustment(newScheduleModel.repaymentPeriods()).hasLessEmiDifference(emiAdjustment)) {
                 break;
             }

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/EMICalculator.java

@@ -68,7 +68,8 @@ public class InterestPeriod implements Comparable<InterestPeriod> {
     @Getter
     private final MathContext mc;
 
-    private final boolean isPaused;
+    @Setter
+    private boolean isPaused;
 
     public static InterestPeriod copy(@NotNull RepaymentPeriod repaymentPeriod, @NotNull InterestPeriod interestPeriod, MathContext mc) {
         return new InterestPeriod(repaymentPeriod, interestPeriod.getFromDate(), interestPeriod.getDueDate(),