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

Author: somasorosdpc

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAgingStepDef.java

@@ -57,18 +57,11 @@ public void createReAgingTransaction(DataTable table) throws IOException {
         Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         long loanId = loanResponse.body().getLoanId();
 
-        List<String> data = table.asLists().get(1);
-        int frequencyNumber = Integer.parseInt(data.get(0));
-        String frequencyType = data.get(1);
-        String startDate = data.get(2);
-        int numberOfInstallments = Integer.parseInt(data.get(3));
-
-        PostLoansLoanIdTransactionsRequest reAgingRequest = LoanRequestFactory//
-                .defaultReAgingRequest()//
-                .frequencyNumber(frequencyNumber)//
-                .frequencyType(frequencyType)//
-                .startDate(startDate)//
-                .numberOfInstallments(numberOfInstallments);//
+        PostLoansLoanIdTransactionsRequest reAgingRequest = setReAgeingRequestProperties(//
+                LoanRequestFactory.defaultReAgingRequest(), //
+                table.row(0), //
+                table.row(1) //
+        );
 
         Response<PostLoansLoanIdTransactionsResponse> response = loanTransactionsApi.executeLoanTransaction(loanId, reAgingRequest, "reAge")
                 .execute();
@@ -81,18 +74,11 @@ public void createReAgingTransactionByLoanExternalId(DataTable table) throws IOE
         Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         String loanExternalId = loanResponse.body().getResourceExternalId();
 
-        List<String> data = table.asLists().get(1);
-        int frequencyNumber = Integer.parseInt(data.get(0));
-        String frequencyType = data.get(1);
-        String startDate = data.get(2);
-        int numberOfInstallments = Integer.parseInt(data.get(3));
-
-        PostLoansLoanIdTransactionsRequest reAgingRequest = LoanRequestFactory//
-                .defaultReAgingRequest()//
-                .frequencyNumber(frequencyNumber)//
-                .frequencyType(frequencyType)//
-                .startDate(startDate)//
-                .numberOfInstallments(numberOfInstallments);//
+        PostLoansLoanIdTransactionsRequest reAgingRequest = setReAgeingRequestProperties(//
+                LoanRequestFactory.defaultReAgingRequest(), //
+                table.row(0), //
+                table.row(1) //
+        );
 
         Response<PostLoansLoanIdTransactionsResponse> response = loanTransactionsApi
                 .executeLoanTransaction1(loanExternalId, reAgingRequest, "reAge").execute();
@@ -197,4 +183,20 @@ public void reAgeContractTerminatedLoanFailure(final DataTable table) throws IOE
         assertThat(errorDetails.getHttpStatusCode()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(403);
         assertThat(developerMessage).matches(ErrorMessageHelper.reAgeContractTerminatedLoanFailure());
     }
+
+    PostLoansLoanIdTransactionsRequest setReAgeingRequestProperties(PostLoansLoanIdTransactionsRequest request, List<String> headers,
+            List<String> values) {
+        for (int i = 0; i < headers.size(); i++) {
+            String header = headers.get(i).toLowerCase().trim().replaceAll(" ", "");
+            switch (header) {
+                case "frequencynumber" -> request.setFrequencyNumber(Integer.parseInt(values.get(i)));
+                case "frequencytype" -> request.setFrequencyType(values.get(i));
+                case "startdate" -> request.setStartDate(values.get(i));
+                case "numberofinstallments" -> request.setNumberOfInstallments(Integer.parseInt(values.get(i)));
+                case "reageinteresthandling" -> request.setReAgeInterestHandling(values.get(i));
+                default -> throw new IllegalStateException("Unknown header: " + header);
+            }
+        }
+        return request;
+    }
 }

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

@@ -74,6 +74,7 @@
 import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
 import org.apache.fineract.portfolio.fund.domain.Fund;
 import org.apache.fineract.portfolio.group.domain.Group;
+import org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeInterestHandlingType;
 import org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.LoanRepaymentScheduleTransactionProcessor;
 import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanApplicationTerms;
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct;
@@ -1824,6 +1825,14 @@ public boolean hasContractTerminationTransaction() {
         return getLoanTransactions().stream().anyMatch(t -> t.isContractTermination() && t.isNotReversed());
     }
 
+    public LoanReAgeInterestHandlingType getReAgeInterestHandlingType() {
+        Optional<LoanTransaction> lastReAgeTransaction = loanTransactions.stream()//
+                .filter(LoanTransaction::isNotReversed)//
+                .filter(LoanTransaction::isReAge)//
+                .findFirst();//
+        return lastReAgeTransaction.map(loanTransaction -> loanTransaction.getLoanReAgeParameter().getInterestHandlingType()).orElse(null);
+    }
+
     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

@@ -261,9 +261,21 @@ public LoanRepaymentScheduleInstallment(Loan loan, Integer installmentNumber, Lo
     }
 
     public static LoanRepaymentScheduleInstallment newReAgedInstallment(final Loan loan, final Integer installmentNumber,
-            final LocalDate fromDate, final LocalDate dueDate, final BigDecimal principal) {
-        return new LoanRepaymentScheduleInstallment(loan, installmentNumber, fromDate, dueDate, principal, null, null, null, null, null,
-                null, null, false, false, true);
+            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) {
+        return new LoanRepaymentScheduleInstallment(loan, installmentNumber, fromDate, dueDate, principal, interest, fees, penalties, null,
+                null, null, null, false, false, true);
     }
 
     public static LoanRepaymentScheduleInstallment getLastNonDownPaymentInstallment(List<LoanRepaymentScheduleInstallment> installments) {

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

@@ -481,4 +481,13 @@ boolean existsNonReversedByLoanAndTypeAndDate(@Param("loan") Loan loan, @Param("
             """)
     CodeValue fetchClassificationCodeValueByTransactionId(@Param("transactionId") Long transactionId);
 
+    @Query("""
+                    SELECT lt FROM LoanTransaction lt
+                    WHERE lt.loan = :loan
+                        AND lt.reversed = false
+                            AND lt.typeOf = :type
+                         AND lt.dateOf <= :onDate
+            """)
+    Optional<LoanTransaction> findNonReversedTransactionActiveOnDate(@Param("loan") Loan loan, @Param("type") LoanTransactionType type,
+            @Param("onDate") LocalDate onDate);
 }

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

@@ -29,6 +29,7 @@
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionComparator;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRepository;
+import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -56,4 +57,7 @@ private Predicate<LoanTransaction> loanTransactionForReprocessingPredicate() {
                         || !transaction.isNonMonetaryTransaction() || transaction.isContractTermination());
     }
 
+    public Optional<LoanTransaction> getActiveReageTransactionOnDate(Loan loan, LocalDate onDate) {
+        return loanTransactionRepository.findNonReversedTransactionActiveOnDate(loan, LoanTransactionType.REAGE, onDate);
+    }
 }

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

@@ -58,7 +58,8 @@ public BigDecimal calculateInterestRecalculationFutureOutstandingValue(Loan loan
         }
         List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments = loan.getRepaymentScheduleInstallments();
         ProgressiveTransactionCtx ctx = new ProgressiveTransactionCtx(loan.getCurrency(), repaymentScheduleInstallments, Set.of(),
-                new MoneyHolder(loan.getTotalOverpaidAsMoney()), new ChangedTransactionDetail(), scheduleModel);
+                new MoneyHolder(loan.getTotalOverpaidAsMoney()), new ChangedTransactionDetail(), scheduleModel,
+                loan.getReAgeInterestHandlingType());
         ctx.setChargedOff(loan.isChargedOff());
         ctx.setWrittenOff(loan.isClosedWrittenOff());
         ctx.setContractTerminated(loan.isContractTermination());