somasorosdpc commented on code in PR #4273:
URL: https://github.com/apache/fineract/pull/4273#discussion_r1930238230


##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java:
##########
@@ -92,42 +92,94 @@ public void processAccrualActivityForLoanClosure(@NotNull 
Loan loan) {
         if 
(!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting()) {
             return;
         }
+
         LocalDate transactionDate = loan.isOverPaid() ? 
loan.getOverpaidOnDate() : loan.getClosedOnDate();
-        // reverse after closure activities
+
+        // Reverse accrual activities posted after the closure date
         loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed() 
&& t.getDateOf().isAfter(transactionDate))
                 .forEach(this::reverseAccrualActivityTransaction);
 
-        // calculate activity amounts
         BigDecimal feeChargesPortion = BigDecimal.ZERO;
         BigDecimal penaltyChargesPortion = BigDecimal.ZERO;
         BigDecimal interestPortion = BigDecimal.ZERO;
-        // collect installment amounts
+
+        // Calculate total portions from all installments
         for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
-            feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
-            penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
-            interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            if (!installment.isDownPayment()) { // Exclude downpayment 
installments
+                feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
+                penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
+                interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            }
         }
+
+        // Subtract already posted accrual activities
         List<LoanTransaction> accrualActivities = loan.getLoanTransactions(t 
-> t.isAccrualActivity() && !t.isReversed());
-        // subtract already posted activities
         for (LoanTransaction accrualActivity : accrualActivities) {
-            if (MathUtil.isLessThan(feeChargesPortion, 
accrualActivity.getFeeChargesPortion())
-                    || MathUtil.isLessThan(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion())
-                    || MathUtil.isLessThan(interestPortion, 
accrualActivity.getInterestPortion())) {
-                reverseAccrualActivityTransaction(accrualActivity);
-            } else {
-                feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
-                penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
-                interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+            feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
+            penaltyChargesPortion = MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
+            interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+        }
+
+        // Check each past installment for accrual activity
+        for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
+            if (!installment.isDownPayment()) {
+                List<LoanTransaction> installmentAccruals = 
accrualActivities.stream()
+                        .filter(t -> 
t.getDateOf().isEqual(installment.getDueDate())).toList();
+
+                if (installmentAccruals.isEmpty()) {
+                    // No AAT for this installment; create one
+                    createAccrualActivityTransaction(loan, installment, 
transactionDate);
+
+                    // Subtract processed portions
+                    feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
installment.getFeeChargesCharged());
+                    penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, installment.getPenaltyCharges());

Review Comment:
   I would prefer add transaction's portions instead of installment portions.



##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java:
##########
@@ -92,42 +92,94 @@ public void processAccrualActivityForLoanClosure(@NotNull 
Loan loan) {
         if 
(!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting()) {
             return;
         }
+
         LocalDate transactionDate = loan.isOverPaid() ? 
loan.getOverpaidOnDate() : loan.getClosedOnDate();
-        // reverse after closure activities
+
+        // Reverse accrual activities posted after the closure date
         loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed() 
&& t.getDateOf().isAfter(transactionDate))
                 .forEach(this::reverseAccrualActivityTransaction);
 
-        // calculate activity amounts
         BigDecimal feeChargesPortion = BigDecimal.ZERO;
         BigDecimal penaltyChargesPortion = BigDecimal.ZERO;
         BigDecimal interestPortion = BigDecimal.ZERO;
-        // collect installment amounts
+
+        // Calculate total portions from all installments
         for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
-            feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
-            penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
-            interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            if (!installment.isDownPayment()) { // Exclude downpayment 
installments
+                feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
+                penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
+                interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            }
         }
+
+        // Subtract already posted accrual activities
         List<LoanTransaction> accrualActivities = loan.getLoanTransactions(t 
-> t.isAccrualActivity() && !t.isReversed());
-        // subtract already posted activities
         for (LoanTransaction accrualActivity : accrualActivities) {
-            if (MathUtil.isLessThan(feeChargesPortion, 
accrualActivity.getFeeChargesPortion())
-                    || MathUtil.isLessThan(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion())
-                    || MathUtil.isLessThan(interestPortion, 
accrualActivity.getInterestPortion())) {
-                reverseAccrualActivityTransaction(accrualActivity);
-            } else {
-                feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
-                penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
-                interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+            feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
+            penaltyChargesPortion = MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
+            interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+        }
+
+        // Check each past installment for accrual activity
+        for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {

Review Comment:
   it contains all the installments



##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java:
##########
@@ -92,42 +92,94 @@ public void processAccrualActivityForLoanClosure(@NotNull 
Loan loan) {
         if 
(!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting()) {
             return;
         }
+
         LocalDate transactionDate = loan.isOverPaid() ? 
loan.getOverpaidOnDate() : loan.getClosedOnDate();
-        // reverse after closure activities
+
+        // Reverse accrual activities posted after the closure date
         loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed() 
&& t.getDateOf().isAfter(transactionDate))
                 .forEach(this::reverseAccrualActivityTransaction);
 
-        // calculate activity amounts
         BigDecimal feeChargesPortion = BigDecimal.ZERO;
         BigDecimal penaltyChargesPortion = BigDecimal.ZERO;
         BigDecimal interestPortion = BigDecimal.ZERO;
-        // collect installment amounts
+
+        // Calculate total portions from all installments
         for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
-            feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
-            penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
-            interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            if (!installment.isDownPayment()) { // Exclude downpayment 
installments
+                feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
+                penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
+                interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            }
         }
+
+        // Subtract already posted accrual activities
         List<LoanTransaction> accrualActivities = loan.getLoanTransactions(t 
-> t.isAccrualActivity() && !t.isReversed());
-        // subtract already posted activities
         for (LoanTransaction accrualActivity : accrualActivities) {
-            if (MathUtil.isLessThan(feeChargesPortion, 
accrualActivity.getFeeChargesPortion())
-                    || MathUtil.isLessThan(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion())
-                    || MathUtil.isLessThan(interestPortion, 
accrualActivity.getInterestPortion())) {
-                reverseAccrualActivityTransaction(accrualActivity);
-            } else {
-                feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
-                penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
-                interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+            feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
+            penaltyChargesPortion = MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
+            interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+        }
+
+        // Check each past installment for accrual activity
+        for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
+            if (!installment.isDownPayment()) {
+                List<LoanTransaction> installmentAccruals = 
accrualActivities.stream()
+                        .filter(t -> 
t.getDateOf().isEqual(installment.getDueDate())).toList();
+
+                if (installmentAccruals.isEmpty()) {
+                    // No AAT for this installment; create one
+                    createAccrualActivityTransaction(loan, installment, 
transactionDate);
+
+                    // Subtract processed portions
+                    feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
installment.getFeeChargesCharged());
+                    penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, installment.getPenaltyCharges());
+                    interestPortion = MathUtil.subtract(interestPortion, 
installment.getInterestCharged());
+                } else if (installmentAccruals.size() > 1 || 
!isAccrualActivityConsistent(installment, installmentAccruals.get(0))) {
+                    // Reverse and recreate if inconsistent or duplicate
+                    
installmentAccruals.forEach(this::reverseAccrualActivityTransaction);
+                    createAccrualActivityTransaction(loan, installment, 
transactionDate);
+
+                    // Subtract processed portions
+                    feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
installment.getFeeChargesCharged());

Review Comment:
   I would prefer subtract transaction's portions instead of installment 
portions.



##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java:
##########
@@ -92,42 +92,94 @@ public void processAccrualActivityForLoanClosure(@NotNull 
Loan loan) {
         if 
(!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting()) {
             return;
         }
+
         LocalDate transactionDate = loan.isOverPaid() ? 
loan.getOverpaidOnDate() : loan.getClosedOnDate();
-        // reverse after closure activities
+
+        // Reverse accrual activities posted after the closure date
         loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed() 
&& t.getDateOf().isAfter(transactionDate))
                 .forEach(this::reverseAccrualActivityTransaction);
 
-        // calculate activity amounts
         BigDecimal feeChargesPortion = BigDecimal.ZERO;
         BigDecimal penaltyChargesPortion = BigDecimal.ZERO;
         BigDecimal interestPortion = BigDecimal.ZERO;
-        // collect installment amounts
+
+        // Calculate total portions from all installments
         for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
-            feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
-            penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
-            interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            if (!installment.isDownPayment()) { // Exclude downpayment 
installments
+                feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
+                penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
+                interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            }
         }
+
+        // Subtract already posted accrual activities
         List<LoanTransaction> accrualActivities = loan.getLoanTransactions(t 
-> t.isAccrualActivity() && !t.isReversed());
-        // subtract already posted activities
         for (LoanTransaction accrualActivity : accrualActivities) {
-            if (MathUtil.isLessThan(feeChargesPortion, 
accrualActivity.getFeeChargesPortion())
-                    || MathUtil.isLessThan(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion())
-                    || MathUtil.isLessThan(interestPortion, 
accrualActivity.getInterestPortion())) {
-                reverseAccrualActivityTransaction(accrualActivity);
-            } else {
-                feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
-                penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
-                interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+            feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
+            penaltyChargesPortion = MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
+            interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+        }
+
+        // Check each past installment for accrual activity
+        for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
+            if (!installment.isDownPayment()) {
+                List<LoanTransaction> installmentAccruals = 
accrualActivities.stream()
+                        .filter(t -> 
t.getDateOf().isEqual(installment.getDueDate())).toList();
+
+                if (installmentAccruals.isEmpty()) {
+                    // No AAT for this installment; create one
+                    createAccrualActivityTransaction(loan, installment, 
transactionDate);
+
+                    // Subtract processed portions
+                    feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
installment.getFeeChargesCharged());
+                    penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, installment.getPenaltyCharges());
+                    interestPortion = MathUtil.subtract(interestPortion, 
installment.getInterestCharged());
+                } else if (installmentAccruals.size() > 1 || 
!isAccrualActivityConsistent(installment, installmentAccruals.get(0))) {
+                    // Reverse and recreate if inconsistent or duplicate
+                    
installmentAccruals.forEach(this::reverseAccrualActivityTransaction);
+                    createAccrualActivityTransaction(loan, installment, 
transactionDate);
+
+                    // Subtract processed portions
+                    feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
installment.getFeeChargesCharged());
+                    penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, installment.getPenaltyCharges());
+                    interestPortion = MathUtil.subtract(interestPortion, 
installment.getInterestCharged());
+                }
             }
         }
-        BigDecimal transactionAmount = MathUtil.add(feeChargesPortion, 
penaltyChargesPortion, interestPortion);
-        if (!MathUtil.isGreaterThanZero(transactionAmount)) {
-            return;
+
+        // Skip final accrual activity creation if no portions remain
+        if (MathUtil.isGreaterThanZero(feeChargesPortion) || 
MathUtil.isGreaterThanZero(penaltyChargesPortion)
+                || MathUtil.isGreaterThanZero(interestPortion)) {
+            BigDecimal transactionAmount = MathUtil.add(feeChargesPortion, 
penaltyChargesPortion, interestPortion);
+            LoanTransaction newActivity = new LoanTransaction(loan, 
loan.getOffice(), LoanTransactionType.ACCRUAL_ACTIVITY.getValue(),
+                    transactionDate, transactionAmount, null, interestPortion, 
feeChargesPortion, penaltyChargesPortion, null, false, null,
+                    externalIdFactory.create());
+            makeAccrualActivityTransaction(loan, newActivity);
         }
-        LoanTransaction newActivity = new LoanTransaction(loan, 
loan.getOffice(), LoanTransactionType.ACCRUAL_ACTIVITY.getValue(),
-                transactionDate, transactionAmount, null, interestPortion, 
feeChargesPortion, penaltyChargesPortion, null, false, null,
-                externalIdFactory.create());
-        makeAccrualActivityTransaction(loan, newActivity);
+    }
+
+    /**
+     * Creates an accrual activity transaction for the given installment.
+     */
+    private void createAccrualActivityTransaction(Loan loan, 
LoanRepaymentScheduleInstallment installment, LocalDate transactionDate) {

Review Comment:
   This class already has makeAccrualActivityTransaction which does the same 
result



##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java:
##########
@@ -876,17 +876,22 @@ public void 
testAccrualActivityPostingForMultiDisburseLoan() {
             chargeFee(loanId.get(), 40.0, repaymentPeriod1DueDate);
             addRepaymentForLoan(loanId.get(), 650.0, repaymentDate1);
             verifyTransactions(loanId.get(),
-                    transaction(650.0, "Repayment", repaymentDate1, 0.0, 
500.0, 39.45, 40.0, 30.0, 0.0, 40.55, false), //
-                    transaction(109.45, "Accrual Activity", repaymentDate1, 
0.0, 0.0, 39.45, 40.0, 30.0, 0.0, 0.0, false), //
-                    transaction(109.45, "Accrual", repaymentDate1, 0.0, 0.0, 
39.45, 40.0, 30.0, 0.0, 0.0, false), //
-                    transaction(500.0, "Disbursement", disbursementDay, 500.0, 
0, 0, 0, 0, 0, 0, false) //
-            );
+                    transaction(650.0, "Repayment", repaymentDate1, 0.0, 
500.0, 39.45, 40.0, 30.0, 0.0, 40.55, false),
+                    transaction(79.86, "Accrual Activity", repaymentDate1, 
0.0, 0.0, 9.86, 40.0, 30.0, 0.0, 0.0, false),
+                    transaction(9.86, "Accrual Activity", repaymentDate1, 0.0, 
0.0, 9.86, 0.0, 0.0, 0.0, 0.0, false),
+                    transaction(9.86, "Accrual Activity", repaymentDate1, 0.0, 
0.0, 9.86, 0.0, 0.0, 0.0, 0.0, false),
+                    transaction(9.87, "Accrual Activity", repaymentDate1, 0.0, 
0.0, 9.87, 0.0, 0.0, 0.0, 0.0, false),
+                    transaction(109.45, "Accrual", repaymentDate1, 0.0, 0.0, 
39.45, 40.0, 30.0, 0.0, 0.0, false),
+                    transaction(500.0, "Disbursement", disbursementDay, 500.0, 
0, 0, 0, 0, 0, 0, false));
         });
         runAt(repaymentPeriod1CloseDate, () -> {
             inlineLoanCOBHelper.executeInlineCOB(List.of(loanId.get()));
             verifyTransactions(loanId.get(),
                     transaction(650.0, "Repayment", repaymentDate1, 0.0, 
500.0, 39.45, 40.0, 30.0, 0.0, 40.55, false), //
-                    transaction(109.45, "Accrual Activity", repaymentDate1, 
0.0, 0.0, 39.45, 40.0, 30.0, 0.0, 0.0, false), //
+                    transaction(79.86, "Accrual Activity", repaymentDate1, 
0.0, 0.0, 9.86, 40.0, 30.0, 0.0, 0.0, false),

Review Comment:
   This is wrong. You should have only 1 Accrual Activity transaction per day



##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java:
##########
@@ -92,42 +92,94 @@ public void processAccrualActivityForLoanClosure(@NotNull 
Loan loan) {
         if 
(!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting()) {
             return;
         }
+
         LocalDate transactionDate = loan.isOverPaid() ? 
loan.getOverpaidOnDate() : loan.getClosedOnDate();
-        // reverse after closure activities
+
+        // Reverse accrual activities posted after the closure date
         loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed() 
&& t.getDateOf().isAfter(transactionDate))
                 .forEach(this::reverseAccrualActivityTransaction);
 
-        // calculate activity amounts
         BigDecimal feeChargesPortion = BigDecimal.ZERO;
         BigDecimal penaltyChargesPortion = BigDecimal.ZERO;
         BigDecimal interestPortion = BigDecimal.ZERO;
-        // collect installment amounts
+
+        // Calculate total portions from all installments
         for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
-            feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
-            penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
-            interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            if (!installment.isDownPayment()) { // Exclude downpayment 
installments
+                feeChargesPortion = MathUtil.add(feeChargesPortion, 
installment.getFeeChargesCharged());
+                penaltyChargesPortion = MathUtil.add(penaltyChargesPortion, 
installment.getPenaltyCharges());
+                interestPortion = MathUtil.add(interestPortion, 
installment.getInterestCharged());
+            }
         }
+
+        // Subtract already posted accrual activities
         List<LoanTransaction> accrualActivities = loan.getLoanTransactions(t 
-> t.isAccrualActivity() && !t.isReversed());
-        // subtract already posted activities
         for (LoanTransaction accrualActivity : accrualActivities) {
-            if (MathUtil.isLessThan(feeChargesPortion, 
accrualActivity.getFeeChargesPortion())
-                    || MathUtil.isLessThan(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion())
-                    || MathUtil.isLessThan(interestPortion, 
accrualActivity.getInterestPortion())) {
-                reverseAccrualActivityTransaction(accrualActivity);
-            } else {
-                feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
-                penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
-                interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+            feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
accrualActivity.getFeeChargesPortion());
+            penaltyChargesPortion = MathUtil.subtract(penaltyChargesPortion, 
accrualActivity.getPenaltyChargesPortion());
+            interestPortion = MathUtil.subtract(interestPortion, 
accrualActivity.getInterestPortion());
+        }
+
+        // Check each past installment for accrual activity
+        for (LoanRepaymentScheduleInstallment installment : 
loan.getRepaymentScheduleInstallments()) {
+            if (!installment.isDownPayment()) {
+                List<LoanTransaction> installmentAccruals = 
accrualActivities.stream()
+                        .filter(t -> 
t.getDateOf().isEqual(installment.getDueDate())).toList();
+
+                if (installmentAccruals.isEmpty()) {
+                    // No AAT for this installment; create one
+                    createAccrualActivityTransaction(loan, installment, 
transactionDate);
+
+                    // Subtract processed portions
+                    feeChargesPortion = MathUtil.subtract(feeChargesPortion, 
installment.getFeeChargesCharged());
+                    penaltyChargesPortion = 
MathUtil.subtract(penaltyChargesPortion, installment.getPenaltyCharges());
+                    interestPortion = MathUtil.subtract(interestPortion, 
installment.getInterestCharged());
+                } else if (installmentAccruals.size() > 1 || 
!isAccrualActivityConsistent(installment, installmentAccruals.get(0))) {
+                    // Reverse and recreate if inconsistent or duplicate
+                    
installmentAccruals.forEach(this::reverseAccrualActivityTransaction);

Review Comment:
   once you already subtracted this transaction amounts If you reverse them, 
you should add back the portions. but for cleaner code you could subtract 
portions after you processed pre-closure transactions.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to