FINERACT-2181: Fix accrual activity reversal logic: prevent duplicate…

… reverse-replay, copy external ID correctly
apache · Mar 6, 2025 · 5be1775 · 5be1775
1 parent 8223c72
commit 5be1775
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...ache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java b/...ache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java
@@ -207,6 +207,12 @@ private LoanTransaction reverseReplayAccrualActivityTransaction(@NotNull Loan lo
             newLoanTransaction.copyLoanTransactionRelations(loanTransaction.getLoanTransactionRelations());
             newLoanTransaction.getLoanTransactionRelations().add(LoanTransactionRelation.linkToTransaction(newLoanTransaction,
                     loanTransaction, LoanTransactionRelationTypeEnum.REPLAYED));
+
+            newLoanTransaction.updateExternalId(loanTransaction.getExternalId());
+            loanTransaction.reverse();
+            loanTransaction.updateExternalId(null);
+            loanAccountService.saveLoanTransactionWithDataIntegrityViolationChecks(loanTransaction);
+
             loanAccountService.saveLoanTransactionWithDataIntegrityViolationChecks(newLoanTransaction);
             loan.addLoanTransaction(newLoanTransaction);
 

diff --git a/.../org/apache/fineract/portfolio/loanaccount/service/LoanAccrualsProcessingServiceImpl.java b/.../org/apache/fineract/portfolio/loanaccount/service/LoanAccrualsProcessingServiceImpl.java
@@ -702,12 +702,16 @@ private void reprocessPeriodicAccruals(Loan loan, final List<LoanTransaction> ac
         if (loan.isChargedOff()) {
             return;
         }
+
+        // Add check for already reversed transactions
+        List<LoanTransaction> nonReversedAccruals = accrualTransactions.stream().filter(t -> !t.isReversed()).collect(Collectors.toList());
+
         ensureAccrualTransactionMappings(loan);
         LoanRepaymentScheduleInstallment lastInstallment = loan.getLastLoanRepaymentScheduleInstallment();
         LocalDate lastDueDate = lastInstallment.getDueDate();
         if (isProgressiveAccrual(loan)) {
             AccrualBalances accrualBalances = new AccrualBalances();
-            accrualTransactions.forEach(lt -> {
+            nonReversedAccruals.forEach(lt -> {
                 switch (lt.getTypeOf()) {
                     case ACCRUAL -> {
                         accrualBalances.setFeePortion(MathUtil.add(accrualBalances.getFeePortion(), lt.getFeeChargesPortion()));
@@ -757,11 +761,11 @@ private void reprocessPeriodicAccruals(Loan loan, final List<LoanTransaction> ac
             List<LoanRepaymentScheduleInstallment> installments = loan.getRepaymentScheduleInstallments();
             boolean isBasedOnSubmittedOnDate = !isChargeOnDueDate();
             for (LoanRepaymentScheduleInstallment installment : installments) {
-                checkAndUpdateAccrualsForInstallment(loan, accrualTransactions, installments, isBasedOnSubmittedOnDate, installment);
+                checkAndUpdateAccrualsForInstallment(loan, nonReversedAccruals, installments, isBasedOnSubmittedOnDate, installment);
             }
         }
         // reverse accruals after last installment
-        reverseTransactionsAfter(accrualTransactions, lastDueDate, false);
+        reverseTransactionsAfter(nonReversedAccruals, lastDueDate, false);
     }
 
     private void reprocessNonPeriodicAccruals(Loan loan, final List<LoanTransaction> accrualTransactions) {