FINERACT-2324: Remove "loan.getLoanTransactions()" from processLatestTransaction, builder for ProgressiveTransactionCtx

Author: mariiaKraievska

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

@@ -20,18 +20,16 @@
 
 import java.util.List;
 import java.util.Set;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.experimental.SuperBuilder;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.portfolio.loanaccount.domain.ChangedTransactionDetail;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanCharge;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
 
 @Data
-@Builder
-@AllArgsConstructor
+@SuperBuilder
 public class TransactionCtx {
 
     private final MonetaryCurrency currency;

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/ProgressivePossibleNextRepaymentCalculationServiceImpl.java

@@ -20,12 +20,12 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
+import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.portfolio.loanaccount.domain.ChangedTransactionDetail;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment;
@@ -58,8 +58,10 @@ public BigDecimal calculateInterestRecalculationFutureOutstandingValue(Loan loan
             return BigDecimal.ZERO;
         }
         List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments = loan.getRepaymentScheduleInstallments();
-        ProgressiveTransactionCtx ctx = new ProgressiveTransactionCtx(loan.getCurrency(), repaymentScheduleInstallments, Set.of(),
-                new MoneyHolder(loan.getTotalOverpaidAsMoney()), new ChangedTransactionDetail(), scheduleModel, Collections.emptyList());
+        final ProgressiveTransactionCtx ctx = ProgressiveTransactionCtx.builder().currency(loan.getCurrency())
+                .installments(repaymentScheduleInstallments).charges(Set.of())
+                .overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney())).changedTransactionDetail(new ChangedTransactionDetail())
+                .sumOfInterestRefundAmount(Money.zero(currency)).model(scheduleModel).build();
         ctx.setChargedOff(loan.isChargedOff());
         ctx.setWrittenOff(loan.isClosedWrittenOff());
         ctx.setContractTerminated(loan.isContractTermination());

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

@@ -233,8 +233,9 @@ public Pair<ChangedTransactionDetail, ProgressiveLoanInterestScheduleModel> repr
         final LoanProductRelatedDetail loanProductRelatedDetail = loan.getLoanRepaymentScheduleDetail();
         ProgressiveLoanInterestScheduleModel scheduleModel = emiCalculator.generateInstallmentInterestScheduleModel(installments,
                 loanProductRelatedDetail, loanTermVariations, installmentAmountInMultiplesOf, overpaymentHolder.getMoneyObject().getMc());
-        ProgressiveTransactionCtx ctx = new ProgressiveTransactionCtx(currency, installments, charges, overpaymentHolder,
-                changedTransactionDetail, scheduleModel, loanTransactions);
+        final ProgressiveTransactionCtx ctx = ProgressiveTransactionCtx.builder().currency(currency).installments(installments)
+                .charges(charges).overpaymentHolder(overpaymentHolder).changedTransactionDetail(changedTransactionDetail)
+                .model(scheduleModel).sumOfInterestRefundAmount(Money.zero(currency)).loanTransactions(loanTransactions).build();
 
         List<ChangeOperation> changeOperations = createSortedChangeList(loanTermVariations, loanTransactionsToReprocess, charges);
 

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

@@ -20,47 +20,30 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
+import lombok.experimental.SuperBuilder;
 import org.apache.fineract.organisation.monetary.domain.Money;
-import org.apache.fineract.portfolio.loanaccount.domain.ChangedTransactionDetail;
-import org.apache.fineract.portfolio.loanaccount.domain.LoanCharge;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
-import org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.MoneyHolder;
 import org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.TransactionCtx;
 import org.apache.fineract.portfolio.loanproduct.calc.data.ProgressiveLoanInterestScheduleModel;
 
 @Getter
+@SuperBuilder
 public class ProgressiveTransactionCtx extends TransactionCtx {
 
     private final ProgressiveLoanInterestScheduleModel model;
     private final List<LoanTransaction> alreadyProcessedTransactions = new ArrayList<>();
     @Setter
     private Money sumOfInterestRefundAmount;
     @Setter
-    private boolean isChargedOff = false;
+    private boolean isChargedOff;
     @Setter
-    private boolean isWrittenOff = false;
+    private boolean isWrittenOff;
     @Setter
-    private boolean isContractTerminated = false;
+    private boolean isContractTerminated;
     @Setter
-    private boolean isPrepayAttempt = false;
+    private boolean isPrepayAttempt;
     private final List<LoanRepaymentScheduleInstallment> skipRepaymentScheduleInstallments = new ArrayList<>();
-
-    public ProgressiveTransactionCtx(MonetaryCurrency currency, List<LoanRepaymentScheduleInstallment> installments,
-            Set<LoanCharge> charges, MoneyHolder overpaymentHolder, ChangedTransactionDetail changedTransactionDetail,
-            ProgressiveLoanInterestScheduleModel model, List<LoanTransaction> loanTransactions) {
-        this(currency, installments, charges, overpaymentHolder, changedTransactionDetail, model, Money.zero(currency), loanTransactions);
-    }
-
-    public ProgressiveTransactionCtx(MonetaryCurrency currency, List<LoanRepaymentScheduleInstallment> installments,
-            Set<LoanCharge> charges, MoneyHolder overpaymentHolder, ChangedTransactionDetail changedTransactionDetail,
-            ProgressiveLoanInterestScheduleModel model, Money sumOfInterestRefundAmount, List<LoanTransaction> loanTransactions) {
-        super(currency, installments, charges, overpaymentHolder, changedTransactionDetail, loanTransactions);
-        this.sumOfInterestRefundAmount = sumOfInterestRefundAmount;
-        this.model = model;
-    }
 }

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

@@ -21,14 +21,14 @@
 import jakarta.persistence.FlushModeType;
 import jakarta.transaction.Transactional;
 import java.time.LocalDate;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import lombok.RequiredArgsConstructor;
 import org.apache.fineract.infrastructure.core.persistence.FlushModeHandler;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
+import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.organisation.monetary.domain.MoneyHelper;
 import org.apache.fineract.portfolio.loanaccount.domain.ChangedTransactionDetail;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
@@ -111,9 +111,11 @@ public Optional<ProgressiveLoanInterestScheduleModel> getSavedModel(Loan loan, L
         if (progressiveLoanModel.isPresent() && !progressiveLoanModel.get().getBusinessDate().isAfter(businessDate)) {
             savedModel = extractModel(progressiveLoanModel);
             if (savedModel.isPresent() && progressiveLoanModel.get().getBusinessDate().isBefore(businessDate)) {
-                ProgressiveTransactionCtx ctx = new ProgressiveTransactionCtx(loan.getCurrency(), loan.getRepaymentScheduleInstallments(),
-                        Set.of(), new MoneyHolder(loan.getTotalOverpaidAsMoney()), new ChangedTransactionDetail(), savedModel.get(),
-                        Collections.emptyList());
+                final ProgressiveTransactionCtx ctx = ProgressiveTransactionCtx.builder().currency(loan.getCurrency()).charges(Set.of())
+                        .installments(loan.getRepaymentScheduleInstallments())
+                        .overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney()))
+                        .sumOfInterestRefundAmount(Money.zero(loan.getCurrency())).changedTransactionDetail(new ChangedTransactionDetail())
+                        .model(savedModel.get()).build();
                 ctx.setChargedOff(loan.isChargedOff());
                 ctx.setWrittenOff(loan.isClosedWrittenOff());
                 ctx.setContractTerminated(loan.isContractTermination());

fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessorTest.java

@@ -43,7 +43,6 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -493,8 +492,8 @@ public void testProcessLatestTransaction_PassesThroughHandlingPaymentAllocationF
         ChangedTransactionDetail changedTransactionDetail = mock(ChangedTransactionDetail.class);
 
         // Set up TransactionCtx with installments and charges
-        TransactionCtx ctx = new ProgressiveTransactionCtx(currency, installments, Set.of(), overpaymentHolder, changedTransactionDetail,
-                model, Collections.emptyList());
+        TransactionCtx ctx = ProgressiveTransactionCtx.builder().currency(currency).installments(installments)
+                .overpaymentHolder(overpaymentHolder).changedTransactionDetail(changedTransactionDetail).model(model).build();
 
         // Mock additional necessary methods
         LoanCharge loanCharge = mock(LoanCharge.class);
@@ -569,8 +568,8 @@ public void testDisbursementAfterMaturityDateWithEMICalculator() {
 
         ProgressiveLoanInterestScheduleModel model = mock(ProgressiveLoanInterestScheduleModel.class);
 
-        TransactionCtx ctx = new ProgressiveTransactionCtx(currency, spyInstallments, Set.of(), new MoneyHolder(Money.zero(currency)),
-                mock(ChangedTransactionDetail.class), model, Money.zero(currency), Collections.emptyList());
+        TransactionCtx ctx = ProgressiveTransactionCtx.builder().currency(currency).installments(spyInstallments)
+                .changedTransactionDetail(mock(ChangedTransactionDetail.class)).model(model).build();
 
         underTest.processLatestTransaction(disbursementTransaction, ctx);
 

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanTransactionProcessingServiceImpl.java

@@ -99,9 +99,10 @@ private ChangedTransactionDetail processLatestTransactionProgressiveInterestReca
                 .orElseGet(() -> advancedProcessor.calculateInterestScheduleModel(loan.getId(), loanTransaction.getTransactionDate()));
 
         final List<LoanTransaction> transactions = loanTransactionService.retrieveListOfTransactionsForReprocessing(loan);
-        ProgressiveTransactionCtx progressiveContext = new ProgressiveTransactionCtx(loan.getCurrency(),
-                loan.getRepaymentScheduleInstallments(), loan.getActiveCharges(), new MoneyHolder(loan.getTotalOverpaidAsMoney()),
-                new ChangedTransactionDetail(), model, getTotalRefundInterestAmount(loan), transactions);
+        final ProgressiveTransactionCtx progressiveContext = ProgressiveTransactionCtx.builder().currency(loan.getCurrency())
+                .installments(loan.getRepaymentScheduleInstallments()).charges(loan.getActiveCharges())
+                .overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney())).changedTransactionDetail(new ChangedTransactionDetail())
+                .model(model).sumOfInterestRefundAmount(getTotalRefundInterestAmount(loan)).loanTransactions(transactions).build();
         progressiveContext.getAlreadyProcessedTransactions().addAll(transactions);
         progressiveContext.setChargedOff(loan.isChargedOff());
         progressiveContext.setWrittenOff(loan.isClosedWrittenOff());

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/ReprocessLoanTransactionsServiceImpl.java

@@ -152,7 +152,7 @@ public void processLatestTransaction(final LoanTransaction loanTransaction, fina
         List<LoanTransaction> transactions = Collections.emptyList();
         if (loanTransaction.isInterestRefund() || loanTransaction.isContractTermination() || loanTransaction.isChargeback()
                 || loanTransaction.isChargeOff()) {
-            transactions = loan.getLoanTransactions();
+            transactions = loanTransactionRepository.findNonReversedByLoan(loan);
         }
 
         TransactionCtx transactionCtx;
@@ -161,9 +161,11 @@ public void processLatestTransaction(final LoanTransaction loanTransaction, fina
                     loanTransaction.getTransactionDate());
             final ProgressiveLoanInterestScheduleModel model = savedModel
                     .orElseGet(() -> advancedProcessor.calculateInterestScheduleModel(loan.getId(), loanTransaction.getTransactionDate()));
-            transactionCtx = new ProgressiveTransactionCtx(loan.getCurrency(), loan.getRepaymentScheduleInstallments(),
-                    loan.getActiveCharges(), new MoneyHolder(loan.getTotalOverpaidAsMoney()), new ChangedTransactionDetail(), model,
-                    transactions);
+            transactionCtx = ProgressiveTransactionCtx.builder().currency(loan.getCurrency())
+                    .installments(loan.getRepaymentScheduleInstallments()).charges(loan.getActiveCharges())
+                    .overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney()))
+                    .changedTransactionDetail(new ChangedTransactionDetail()).sumOfInterestRefundAmount(Money.zero(loan.getCurrency()))
+                    .model(model).loanTransactions(transactions).build();
         } else {
             transactionCtx = TransactionCtx.builder().currency(loan.getCurrency()).installments(loan.getRepaymentScheduleInstallments())
                     .charges(loan.getActiveCharges()).overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney()))