FINERACT-2412: fix

Author: somasorosdpc

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

@@ -44,6 +44,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -1699,10 +1700,9 @@ private void recalculateRepaymentPeriodsWithEMICalculation(final Money amortizab
                 .allMatch(i -> i.getDueDate().isBefore(transactionDate));
 
         if (amortizableAmount.isGreaterThanZero()) {
-            Optional<LoanRepaymentScheduleInstallment> additionalInstallmentOptional = installments.stream()
-                    .filter(LoanRepaymentScheduleInstallment::isAdditional).findFirst();
             if (isPostMaturityDisbursement) {
-                LoanRepaymentScheduleInstallment additionalInstallment = additionalInstallmentOptional.orElse(null);
+                LoanRepaymentScheduleInstallment additionalInstallment = installments.stream()
+                        .filter(LoanRepaymentScheduleInstallment::isAdditional).findFirst().orElse(null);
                 if (additionalInstallment != null && additionalInstallment.getPrincipal(currency).isZero()) {
                     additionalInstallment.updatePrincipal(amortizableAmount.getAmount());
                 }
@@ -1712,28 +1712,14 @@ private void recalculateRepaymentPeriodsWithEMICalculation(final Money amortizab
             final AtomicInteger installmentCounter = new AtomicInteger();
             final ILoanConfigurationDetails loanProductRelatedDetail = model.loanProductRelatedDetail();
 
+            List<LoanRepaymentScheduleInstallment> newInstallments = new LinkedList<>();
+
             model.repaymentPeriods().forEach(rm -> {
                 LoanRepaymentScheduleInstallment installment = null;
                 while (iterator.hasNext() && (installment == null || installment.isAdditional() || installment.isDownPayment())) {
                     installment = iterator.next();
                     installmentCounter.getAndIncrement();
                 }
-                if (installment == null) {
-                    Optional<LoanRepaymentScheduleInstallment> additional = installments.stream()
-                            .filter(LoanRepaymentScheduleInstallment::isAdditional).findAny();
-                    if (additional.isPresent()) {
-                        installment = additional.get();
-                    }
-                }
-                boolean mergeToAdditional = installment != null && installment.isAdditional()
-                        && !installment.getDueDate().isAfter(rm.getDueDate());
-                boolean adjustAdditional = installment != null && installment.isAdditional()
-                        && installment.getDueDate().isAfter(rm.getDueDate());
-                if (mergeToAdditional) {
-                    installment.setFromDate(rm.getFromDate());
-                    installment.setDueDate(rm.getDueDate());
-                    installment.setAdditional(false);
-                }
 
                 if (installment != null && installment.getDueDate().equals(rm.getDueDate())
                         && !installment.getDueDate().isBefore(transactionDate)) {
@@ -1743,9 +1729,7 @@ private void recalculateRepaymentPeriodsWithEMICalculation(final Money amortizab
                 } else {
                     if (loanProductRelatedDetail != null && loanProductRelatedDetail.isAllowFullTermForTranche()
                             && loanProductRelatedDetail.getNumberOfRepayments() > 0 && !rm.getDueDate().isBefore(transactionDate)) {
-
-                        // fix new installment index.
-                        if (!adjustAdditional) {
+                        if (installment == null || !installment.isAdditional()) {
                             installmentCounter.getAndIncrement();
                         }
                         final LoanRepaymentScheduleInstallment newInstallment = new LoanRepaymentScheduleInstallment(
@@ -1754,21 +1738,28 @@ private void recalculateRepaymentPeriodsWithEMICalculation(final Money amortizab
                                 false, false, false);
 
                         newInstallment.updateObligationsMet(currency, transactionDate);
-                        // fix order of installments in the list.
-                        iterator.previous();
                         iterator.add(newInstallment);
-                        iterator.next();
-                        if (adjustAdditional) {
-                            // fix installment and charge relation due to updated maturity date
-                            moveRelatedChargesToInstallment(processedLoanCharges, newInstallment, List.of(installment), currency);
-                        }
+                        newInstallments.add(newInstallment);
                     }
                 }
-                if (adjustAdditional) {
-                    installment.setFromDate(rm.getDueDate());
-                    installment.setInstallmentNumber(installmentCounter.incrementAndGet());
-                }
             });
+            // fix additional installment
+            Optional<LoanRepaymentScheduleInstallment> additionalInstallmentOptional = installments.stream()
+                    .filter(LoanRepaymentScheduleInstallment::isAdditional).findFirst();
+            if (additionalInstallmentOptional.isPresent() && !newInstallments.isEmpty()) {
+                LoanRepaymentScheduleInstallment additional = additionalInstallmentOptional.get();
+                // iterate trough new installments to fix charges
+                for (LoanRepaymentScheduleInstallment installment : newInstallments) {
+                    moveRelatedChargesToInstallment(processedLoanCharges, installment, List.of(additional), currency);
+                    additional.setFromDate(installment.getDueDate());
+                    additional.setInstallmentNumber(installment.getInstallmentNumber() + 1);
+                }
+                installments.remove(additional);
+                if (additional.getDueDate().isAfter(model.getMaturityDate())) {
+                    // step is needed to move the additional installment to the end of the list.
+                    installments.add(additional);
+                }
+            }
         }
     }
 
@@ -3892,11 +3883,11 @@ private void handleReAgeWithCommonStrategy(LoanTransaction loanTransaction, Comm
     }
 
     private void moveRelatedChargesToInstallment(Set<LoanCharge> charges, LoanRepaymentScheduleInstallment target,
-            List<LoanRepaymentScheduleInstallment> installments, MonetaryCurrency currency) {
-        int firstNormalInstallmentNumber = LoanRepaymentScheduleProcessingWrapper.fetchFirstNormalInstallmentNumber(installments);
+            List<LoanRepaymentScheduleInstallment> sources, MonetaryCurrency currency) {
+        int firstNormalInstallmentNumber = LoanRepaymentScheduleProcessingWrapper.fetchFirstNormalInstallmentNumber(sources);
         Set<LoanCharge> chargesOfNewInstallment = getLoanChargesOfInstallment(charges, target, firstNormalInstallmentNumber);
         Integer targetInstallmentNumber = target.getInstallmentNumber();
-        installments.stream().filter(i -> Objects.equals(i.getInstallmentNumber(), targetInstallmentNumber)).findFirst()
+        sources.stream().filter(source -> Objects.equals(source.getInstallmentNumber(), targetInstallmentNumber)).findFirst()
                 .filter(source -> source != target).ifPresent(source -> {
                     // move fees
                     chargesOfNewInstallment.stream().filter(LoanCharge::isNotFullyPaid).filter(LoanCharge::isFeeCharge)