FINERACT-2381: Fix Accrual Activity calculation

2025-09-26 18:22:40 +02:00
parent e063081a82
commit ef80634b4e
5 changed files with 83 additions and 56 deletions
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,9 +37,14 @@ import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAdjustT
 import org.apache.fineract.infrastructure.event.business.domain.loan.transaction.LoanTransactionAccrualActivityPostBusinessEvent;
 import org.apache.fineract.infrastructure.event.business.domain.loan.transaction.LoanTransactionAccrualActivityPreBusinessEvent;
 import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
+import org.apache.fineract.organisation.monetary.domain.Money;
+import org.apache.fineract.portfolio.loanaccount.data.TransactionChangeData;
+import org.apache.fineract.portfolio.loanaccount.domain.ChangedTransactionDetail;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanAccountService;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment;
+import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleProcessingWrapper;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelation;
@@ -101,6 +107,32 @@ public class LoanAccrualActivityProcessingServiceImpl implements LoanAccrualActi
        });
    }

+    @Override
+    public void recalculateAccrualActivityTransaction(Loan loan, ChangedTransactionDetail changedTransactionDetail) {
+        List<LoanTransaction> accrualActivities = loanTransactionRepository.findNonReversedByLoanAndType(loan,
+                LoanTransactionType.ACCRUAL_ACTIVITY);
+        accrualActivities.forEach(accrualActivity -> {
+            final LoanTransaction newLoanTransaction = LoanTransaction.copyTransactionProperties(accrualActivity);
+
+            calculateAccrualActivity(newLoanTransaction, loan.getCurrency(), loan.getRepaymentScheduleInstallments());
+
+            if (!LoanTransaction.transactionAmountsMatch(loan.getCurrency(), accrualActivity, newLoanTransaction)) {
+                createNewTransaction(accrualActivity, newLoanTransaction, changedTransactionDetail);
+            }
+        });
+    }
+
+    protected void createNewTransaction(LoanTransaction loanTransaction, LoanTransaction newLoanTransaction,
+            ChangedTransactionDetail changedTransactionDetail) {
+        loanTransaction.reverse();
+        loanTransaction.updateExternalId(null);
+        newLoanTransaction.copyLoanTransactionRelations(loanTransaction.getLoanTransactionRelations());
+        // Adding Replayed relation from newly created transaction to reversed transaction
+        newLoanTransaction.getLoanTransactionRelations().add(
+                LoanTransactionRelation.linkToTransaction(newLoanTransaction, loanTransaction, LoanTransactionRelationTypeEnum.REPLAYED));
+        changedTransactionDetail.addTransactionChange(new TransactionChangeData(loanTransaction, newLoanTransaction));
+    }
+
    @Override
    @Transactional
    public void processAccrualActivityForLoanClosure(final @NonNull Loan loan) {
@@ -206,6 +238,52 @@ public class LoanAccrualActivityProcessingServiceImpl implements LoanAccrualActi
        }
    }

+    private void calculateAccrualActivity(LoanTransaction loanTransaction, MonetaryCurrency currency,
+            List<LoanRepaymentScheduleInstallment> installments) {
+
+        final int firstNormalInstallmentNumber = LoanRepaymentScheduleProcessingWrapper.fetchFirstNormalInstallmentNumber(installments);
+
+        final List<LoanRepaymentScheduleInstallment> targetInstallments = installments.stream()
+                .filter(installment -> LoanRepaymentScheduleProcessingWrapper.isInPeriod(loanTransaction.getTransactionDate(), installment,
+                        installment.getInstallmentNumber().equals(firstNormalInstallmentNumber))
+                        || (DateUtils.isEqual(installment.getObligationsMetOnDate(), loanTransaction.getTransactionDate())
+                                && installment.getDueDate().isAfter(loanTransaction.getTransactionDate())))
+                .toList();
+
+        if (targetInstallments.isEmpty()) {
+            return;
+        }
+
+        AtomicBoolean isReset = new AtomicBoolean(false);
+        targetInstallments.forEach(currentInstallment -> {
+            if (currentInstallment.isNotFullyPaidOff() && (currentInstallment.getDueDate().isAfter(loanTransaction.getTransactionDate())
+                    || (currentInstallment.getDueDate().isEqual(loanTransaction.getTransactionDate())
+                            && loanTransaction.getTransactionDate().equals(DateUtils.getBusinessLocalDate())))) {
+                loanTransaction.reverse();
+            } else {
+                if (!isReset.get()) {
+                    loanTransaction.resetDerivedComponents();
+                    isReset.set(true);
+                }
+                final Money principalPortion = Money.zero(currency);
+                Money interestPortion = currentInstallment.getInterestCharged(currency);
+                Money feeChargesPortion = currentInstallment.getFeeChargesCharged(currency);
+                Money penaltyChargesPortion = currentInstallment.getPenaltyChargesCharged(currency);
+
+                loanTransaction.updateComponentsAndTotal(principalPortion, interestPortion, feeChargesPortion, penaltyChargesPortion);
+                final Loan loan = loanTransaction.getLoan();
+                if ((loan.isClosedObligationsMet() || loanBalanceService.isOverPaid(loan)) && currentInstallment.isObligationsMet()
+                        && currentInstallment.isTransactionDateWithinPeriod(currentInstallment.getObligationsMetOnDate())) {
+                    loanTransaction.updateTransactionDate(currentInstallment.getObligationsMetOnDate());
+                }
+            }
+        });
+        if (MathUtil.isZero(MathUtil.nullToZero(MathUtil.add(loanTransaction.getInterestPortion(), loanTransaction.getFeeChargesPortion(),
+                loanTransaction.getPenaltyChargesPortion())))) {
+            loanTransaction.reverse();
+        }
+    }
+
    private Map<LocalDate, List<LoanTransaction>> loadExistingAccrualActivitiesByDate(final @NonNull Loan loan,
            final List<LoanRepaymentScheduleInstallment> installments) {
        final Set<LocalDate> dueDates = installments.stream().map(LoanRepaymentScheduleInstallment::getDueDate).collect(Collectors.toSet());
@@ -62,6 +62,7 @@ public class ReprocessLoanTransactionsServiceImpl implements ReprocessLoanTransa
    private final LoanTransactionService loanTransactionService;
    private final LoanJournalEntryPoster loanJournalEntryPoster;
    private final BusinessEventNotifierService businessEventNotifierService;
+    private final LoanAccrualActivityProcessingService loanAccrualActivityProcessingService;

    @Override
    public void reprocessTransactions(final Loan loan) {
@@ -227,6 +228,7 @@ public class ReprocessLoanTransactionsServiceImpl implements ReprocessLoanTransa
                .map(TransactionChangeData::getNewTransaction).toList();
        loan.getLoanTransactions().addAll(newTransactions);
        loanBalanceService.updateLoanSummaryDerivedFields(loan);
+        loanAccrualActivityProcessingService.recalculateAccrualActivityTransaction(loan, changedTransactionDetail);
        return changedTransactionDetail;
    }
 }