FINERACT-2324: Remove getLoanTransactions from job related actions - Fix refund validator

Author: somasorosdpc

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

@@ -473,4 +473,14 @@ SELECT CASE WHEN COUNT(lt) > 0 THEN true ELSE false END
     boolean existsNonReversedByLoanAndTypeAndDate(@Param("loan") Loan loan, @Param("type") LoanTransactionType type,
             @Param("transactionDate") LocalDate transactionDate);
 
+    @Query("""
+            SELECT COALESCE(SUM(lt.amount), 0)
+            FROM LoanTransaction lt
+            WHERE lt.loan = :loan
+                AND lt.reversed = false
+                AND lt.typeOf IN :loanTransactionTypes
+            """)
+    BigDecimal sumTotalAmountByLoanAndTransactionTypes(@Param("loan") Loan loan,
+                                                       @Param("loanTransactionTypes") List<LoanTransactionType> loanTransactionTypes);
+
 }

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanRefundValidator.java

@@ -25,6 +25,7 @@
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
 import org.apache.fineract.portfolio.loanaccount.exception.InvalidLoanStateTransitionException;
@@ -75,12 +76,12 @@ public void validateCreditBalanceRefund(final Loan loan, final LoanTransaction n
         }
     }
 
-    public void validateRefundEligibility(final Loan loan, final LoanTransaction loanTransaction) {
+    public void validateRefundEligibility(final Loan loan, final LoanTransaction loanTransaction, final Money loanTotalPaidInRepayments) {
         if (loan.getStatus().isOverpaid() || loan.getStatus().isClosed()) {
             final String errorMessage = "This refund option is only for active loans ";
             throw new InvalidLoanStateTransitionException("transaction", "is.exceeding.overpaid.amount", errorMessage,
                     loan.getTotalOverpaid(), loanTransaction.getAmount(loan.getCurrency()).getAmount());
-        } else if (loan.getTotalPaidInRepayments().isZero()) {
+        } else if (loanTotalPaidInRepayments.isZero()) {
             final String errorMessage = "Cannot refund when no payment has been made";
             throw new InvalidLoanStateTransitionException("transaction", "no.payment.yet.made.for.loan", errorMessage);
         }

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

@@ -34,6 +34,7 @@ public class LoanRefundService {
     private final LoanRefundValidator loanRefundValidator;
     private final LoanTransactionProcessingService loadTransactionProcessingService;
     private final LoanLifecycleStateMachine loanLifecycleStateMachine;
+    private final LoanTransactionService loanTransactionService;
 
     public void makeRefund(final Loan loan, final LoanTransaction loanTransaction) {
         loanRefundValidator.validateTransferRefund(loan, loanTransaction);
@@ -68,7 +69,7 @@ private void handleRefundTransaction(final Loan loan, final LoanTransaction loan
 
         loanTransaction.updateLoan(loan);
 
-        loanRefundValidator.validateRefundEligibility(loan, loanTransaction);
+        loanRefundValidator.validateRefundEligibility(loan, loanTransaction, loanTransactionService.calculateTotalPaidInRepayments(loan));
 
         if (loanTransaction.isNotZero()) {
             loan.addLoanTransaction(loanTransaction);

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

@@ -24,19 +24,34 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionComparator;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRepository;
+import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class LoanTransactionService {
 
     private final LoanTransactionRepository loanTransactionRepository;
 
+    public static final List<LoanTransactionType> PAYMENT_LOAN_TRANSACTION_TYPES = List.of(LoanTransactionType.REPAYMENT, //
+            LoanTransactionType.MERCHANT_ISSUED_REFUND, //
+            LoanTransactionType.PAYOUT_REFUND, //
+            LoanTransactionType.GOODWILL_CREDIT, //
+            LoanTransactionType.CHARGE_REFUND, //
+            LoanTransactionType.CHARGE_ADJUSTMENT, //
+            LoanTransactionType.DOWN_PAYMENT, //
+            LoanTransactionType.INTEREST_PAYMENT_WAIVER, //
+            LoanTransactionType.INTEREST_REFUND, //
+            LoanTransactionType.CAPITALIZED_INCOME_ADJUSTMENT);
+
     public List<LoanTransaction> retrieveListOfTransactionsForReprocessing(final Loan loan) {
         return loan.getLoanTransactions().stream().filter(loanTransactionForReprocessingPredicate())
                 .sorted(LoanTransactionComparator.INSTANCE).collect(Collectors.toList());
@@ -56,4 +71,12 @@ private Predicate<LoanTransaction> loanTransactionForReprocessingPredicate() {
                         || !transaction.isNonMonetaryTransaction() || transaction.isContractTermination());
     }
 
+    public Money calculateTotalPaidInRepayments(final Loan loan) {
+        Money res = Money.of(loan.getCurrency(),
+                loanTransactionRepository.sumTotalAmountByLoanAndTransactionTypes(loan, PAYMENT_LOAN_TRANSACTION_TYPES));
+        if (!loan.getTotalPaidInRepayments().isEqualTo(res)) {
+            log.error("!!!!!!!!!!!!!!!!!! FAILS");
+        }
+        return res;
+    }
 }