Skip to content

Commit d33e148

Browse files
mariiaKraievskamariiaKraievska
committed
FINERACT-2324: Remove "loan.getLoanTransactions()" from reprocessing (reverse-replay) related actions
1 parent 0dd34eb commit d33e148

File tree

25 files changed

+229
-151
lines changed

25 files changed

+229
-151
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,4 +473,23 @@ SELECT CASE WHEN COUNT(lt) > 0 THEN true ELSE false END
473473
boolean existsNonReversedByLoanAndTypeAndDate(@Param("loan") Loan loan, @Param("type") LoanTransactionType type,
474474
@Param("transactionDate") LocalDate transactionDate);
475475

476+
@Query("""
477+
SELECT lt FROM LoanTransaction lt
478+
JOIN lt.loanChargesPaid lcp
479+
WHERE lt.loan = :loan
480+
AND lt.typeOf = :transactionType
481+
AND lcp.loanCharge = :loanCharge
482+
ORDER BY lt.dateOf, lt.createdDate, lt.id
483+
""")
484+
List<LoanTransaction> findRepaymentAtDisbursementTransactionsWithCharge(@Param("loan") Loan loan,
485+
@Param("transactionType") LoanTransactionType transactionType, @Param("loanCharge") LoanCharge loanCharge);
486+
487+
@Query("""
488+
SELECT lt
489+
FROM LoanTransaction lt
490+
WHERE lt.loan = :loan
491+
AND lt.reversed = false
492+
ORDER BY lt.dateOf, lt.createdDate, lt.id
493+
""")
494+
List<LoanTransaction> findNonReversedByLoan(@Param("loan") Loan loan);
476495
}

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public boolean accept(String s) {
8989
@Override
9090
public ChangedTransactionDetail reprocessLoanTransactions(final LocalDate disbursementDate,
9191
final List<LoanTransaction> transactionsPostDisbursement, final MonetaryCurrency currency,
92-
final List<LoanRepaymentScheduleInstallment> installments, final Set<LoanCharge> charges) {
92+
final List<LoanRepaymentScheduleInstallment> installments, final Set<LoanCharge> charges,
93+
final List<LoanTransaction> loanTransactions) {
9394

9495
if (charges != null) {
9596
for (final LoanCharge loanCharge : charges) {
@@ -181,7 +182,8 @@ public ChangedTransactionDetail reprocessLoanTransactions(final LocalDate disbur
181182
if (loanTransaction.isRepaymentLikeType() || loanTransaction.isInterestWaiver() || loanTransaction.isRecoveryRepayment()) {
182183
// pass through for new transactions
183184
if (loanTransaction.getId() == null) {
184-
processLatestTransaction(loanTransaction, new TransactionCtx(currency, installments, charges, overpaymentHolder, null));
185+
processLatestTransaction(loanTransaction, TransactionCtx.builder().currency(currency).installments(installments)
186+
.charges(charges).overpaymentHolder(overpaymentHolder).loanTransactions(loanTransactions).build());
185187
loanTransaction.adjustInterestComponent();
186188
} else {
187189
/**
@@ -192,8 +194,8 @@ public ChangedTransactionDetail reprocessLoanTransactions(final LocalDate disbur
192194

193195
// Reset derived component of new loan transaction and
194196
// re-process transaction
195-
processLatestTransaction(newLoanTransaction,
196-
new TransactionCtx(currency, installments, charges, overpaymentHolder, null));
197+
processLatestTransaction(newLoanTransaction, TransactionCtx.builder().currency(currency).installments(installments)
198+
.charges(charges).overpaymentHolder(overpaymentHolder).loanTransactions(loanTransactions).build());
197199
newLoanTransaction.adjustInterestComponent();
198200
/**
199201
* Check if the transaction amounts have changed. If so, reverse the original transaction and update
@@ -222,7 +224,7 @@ public ChangedTransactionDetail reprocessLoanTransactions(final LocalDate disbur
222224
recalculateCreditTransaction(changedTransactionDetail, loanTransaction, currency, installments, overpaymentHolder);
223225
reprocessChargebackTransactionRelation(changedTransactionDetail, transactionsToBeProcessed);
224226
} else if (loanTransaction.isChargeOff()) {
225-
recalculateChargeOffTransaction(changedTransactionDetail, loanTransaction, currency, installments);
227+
recalculateChargeOffTransaction(changedTransactionDetail, loanTransaction, currency, installments, loanTransactions);
226228
} else if (loanTransaction.isAccrualActivity()) {
227229
recalculateAccrualActivityTransaction(changedTransactionDetail, loanTransaction, currency, installments);
228230
}
@@ -414,13 +416,13 @@ protected boolean isTransactionALateRepaymentOnInstallment(final int installment
414416
}
415417

416418
private void recalculateChargeOffTransaction(ChangedTransactionDetail changedTransactionDetail, LoanTransaction loanTransaction,
417-
MonetaryCurrency currency, List<LoanRepaymentScheduleInstallment> installments) {
419+
MonetaryCurrency currency, List<LoanRepaymentScheduleInstallment> installments, final List<LoanTransaction> loanTransactions) {
418420
final LoanTransaction newLoanTransaction = LoanTransaction.copyTransactionProperties(loanTransaction);
419421

420422
final BigDecimal newInterest = getInterestTillChargeOffForPeriod(newLoanTransaction.getLoan(),
421423
newLoanTransaction.getTransactionDate());
422424
createMissingAccrualTransactionDuringChargeOffIfNeeded(newInterest, newLoanTransaction, newLoanTransaction.getTransactionDate(),
423-
changedTransactionDetail);
425+
changedTransactionDetail, loanTransactions);
424426

425427
newLoanTransaction.resetDerivedComponents();
426428
// determine how much is outstanding total and breakdown for principal, interest and charges
@@ -842,7 +844,7 @@ protected void handleChargeback(LoanTransaction loanTransaction, TransactionCtx
842844

843845
private void handleChargeOff(LoanTransaction loanTransaction, TransactionCtx transactionCtx) {
844846
recalculateChargeOffTransaction(transactionCtx.getChangedTransactionDetail(), loanTransaction, transactionCtx.getCurrency(),
845-
transactionCtx.getInstallments());
847+
transactionCtx.getInstallments(), transactionCtx.getLoanTransactions());
846848
}
847849

848850
protected void handleCreditBalanceRefund(LoanTransaction loanTransaction, MonetaryCurrency currency,
@@ -1005,7 +1007,7 @@ private BigDecimal getInterestTillChargeOffForPeriod(final Loan loan, final Loca
10051007

10061008
private void createMissingAccrualTransactionDuringChargeOffIfNeeded(final BigDecimal newInterest,
10071009
final LoanTransaction chargeOffTransaction, final LocalDate chargeOffDate,
1008-
final ChangedTransactionDetail changedTransactionDetail) {
1010+
final ChangedTransactionDetail changedTransactionDetail, final List<LoanTransaction> loanTransactions) {
10091011
final Loan loan = chargeOffTransaction.getLoan();
10101012
final List<LoanRepaymentScheduleInstallment> relevantInstallments = loan.getRepaymentScheduleInstallments().stream()
10111013
.filter(i -> !i.getFromDate().isAfter(chargeOffDate)).toList();
@@ -1014,13 +1016,15 @@ private void createMissingAccrualTransactionDuringChargeOffIfNeeded(final BigDec
10141016
return;
10151017
}
10161018

1017-
final BigDecimal sumOfAccrualsTillChargeOff = loan.getLoanTransactions().stream()
1019+
final BigDecimal sumOfAccrualsTillChargeOff = loanTransactions != null ? loanTransactions.stream()
10181020
.filter(lt -> lt.isAccrual() && !lt.getTransactionDate().isAfter(chargeOffDate) && lt.isNotReversed())
1019-
.map(lt -> Optional.ofNullable(lt.getInterestPortion()).orElse(BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
1021+
.map(lt -> Optional.ofNullable(lt.getInterestPortion()).orElse(BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add)
1022+
: BigDecimal.ZERO;
10201023

1021-
final BigDecimal sumOfAccrualAdjustmentsTillChargeOff = loan.getLoanTransactions().stream()
1024+
final BigDecimal sumOfAccrualAdjustmentsTillChargeOff = loanTransactions != null ? loanTransactions.stream()
10221025
.filter(lt -> lt.isAccrualAdjustment() && !lt.getTransactionDate().isAfter(chargeOffDate) && lt.isNotReversed())
1023-
.map(lt -> Optional.ofNullable(lt.getInterestPortion()).orElse(BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
1026+
.map(lt -> Optional.ofNullable(lt.getInterestPortion()).orElse(BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add)
1027+
: BigDecimal.ZERO;
10241028

10251029
final BigDecimal missingAccrualAmount = newInterest.subtract(sumOfAccrualsTillChargeOff).add(sumOfAccrualAdjustmentsTillChargeOff);
10261030

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public interface LoanRepaymentScheduleTransactionProcessor {
5151
* needs to be re-processed.
5252
*/
5353
ChangedTransactionDetail reprocessLoanTransactions(LocalDate disbursementDate, List<LoanTransaction> repaymentsOrWaivers,
54-
MonetaryCurrency currency, List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments, Set<LoanCharge> charges);
54+
MonetaryCurrency currency, List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments, Set<LoanCharge> charges,
55+
List<LoanTransaction> loanTransactions);
5556

5657
Money handleRepaymentSchedule(List<LoanTransaction> transactionsPostDisbursement, MonetaryCurrency currency,
5758
List<LoanRepaymentScheduleInstallment> installments, Set<LoanCharge> loanCharges);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@
2121
import java.util.List;
2222
import java.util.Set;
2323
import lombok.AllArgsConstructor;
24+
import lombok.Builder;
2425
import lombok.Data;
2526
import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
2627
import org.apache.fineract.portfolio.loanaccount.domain.ChangedTransactionDetail;
2728
import org.apache.fineract.portfolio.loanaccount.domain.LoanCharge;
2829
import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment;
30+
import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
2931

3032
@Data
33+
@Builder
3134
@AllArgsConstructor
3235
public class TransactionCtx {
3336

@@ -36,4 +39,5 @@ public class TransactionCtx {
3639
private final Set<LoanCharge> charges;
3740
private final MoneyHolder overpaymentHolder;
3841
private final ChangedTransactionDetail changedTransactionDetail;
42+
private final List<LoanTransaction> loanTransactions;
3943
}

‎fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractCumulativeLoanScheduleGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2802,7 +2802,7 @@ public OutstandingAmountsDTO calculatePrepaymentAmount(final MonetaryCurrency cu
28022802
final List<LoanTransaction> loanTransactions = loanTransactionRepository.findNonReversedTransactionsForReprocessingByLoan(loan);
28032803

28042804
loanRepaymentScheduleTransactionProcessor.reprocessLoanTransactions(loanApplicationTerms.getExpectedDisbursementDate(),
2805-
loanTransactions, currency, loanScheduleDTO.getInstallments(), loan.getActiveCharges());
2805+
loanTransactions, currency, loanScheduleDTO.getInstallments(), loan.getActiveCharges(), loanTransactions);
28062806
Money totalPrincipal = Money.zero(currency);
28072807
Money totalInterest = Money.zero(currency);
28082808
Money feeCharges = Money.zero(currency);

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

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ public class LoanBalanceService {
5050
private final LoanTransactionRepository loanTransactionRepository;
5151

5252
public Money calculateTotalOverpayment(final Loan loan) {
53+
return calculateTotalOverpaymentInternal(loan, loan.getLoanTransactions());
54+
}
55+
56+
public Money calculateTotalOverpaymentViaPersistence(final Loan loan) {
57+
final List<LoanTransaction> loanTransactions = loanTransactionRepository.findNonReversedByLoan(loan);
58+
return calculateTotalOverpaymentInternal(loan, loanTransactions);
59+
}
60+
61+
private Money calculateTotalOverpaymentInternal(final Loan loan, final List<LoanTransaction> loanTransactions) {
5362
Money totalPaidInRepayments = loan.getTotalPaidInRepayments();
5463

5564
final MonetaryCurrency currency = loan.getCurrency();
@@ -64,7 +73,7 @@ public Money calculateTotalOverpayment(final Loan loan) {
6473
cumulativeTotalWaivedOnInstallments = cumulativeTotalWaivedOnInstallments.plus(scheduledRepayment.getInterestWaived(currency));
6574
}
6675

67-
for (final LoanTransaction loanTransaction : loan.getLoanTransactions()) {
76+
for (final LoanTransaction loanTransaction : loanTransactions) {
6877
if (loanTransaction.isReversed()) {
6978
continue;
7079
}
@@ -93,20 +102,32 @@ public boolean isOverPaid(final Loan loan) {
93102
}
94103

95104
public void updateLoanSummaryDerivedFields(final Loan loan) {
105+
updateLoanSummaryDerivedFieldsInternal(loan, false);
106+
}
107+
108+
public void updateLoanSummaryDerivedFieldsViaPersistence(final Loan loan) {
109+
updateLoanSummaryDerivedFieldsInternal(loan, true);
110+
}
111+
112+
private void updateLoanSummaryDerivedFieldsInternal(final Loan loan, final boolean viaPersistence) {
96113
flushModeHandler.withFlushMode(FlushModeType.COMMIT, () -> {
97114
if (loan.isNotDisbursed()) {
98115
if (loan.getSummary() != null) {
99116
loan.getSummary().zeroFields();
100117
}
101118
loan.setTotalOverpaid(null);
102119
} else {
103-
refreshSummaryAndBalancesForDisbursedLoan(loan);
120+
refreshSummaryAndBalancesForDisbursedLoanInternal(loan, viaPersistence);
104121
}
105122
});
106123
}
107124

108125
public void refreshSummaryAndBalancesForDisbursedLoan(final Loan loan) {
109-
final Money overpaidBy = calculateTotalOverpayment(loan);
126+
refreshSummaryAndBalancesForDisbursedLoanInternal(loan, false);
127+
}
128+
129+
private void refreshSummaryAndBalancesForDisbursedLoanInternal(final Loan loan, final boolean viaPersistence) {
130+
final Money overpaidBy = viaPersistence ? calculateTotalOverpaymentViaPersistence(loan) : calculateTotalOverpayment(loan);
110131
loan.setTotalOverpaid(null);
111132
if (!overpaidBy.isLessThanZero()) {
112133
loan.setTotalOverpaid(overpaidBy.getAmountDefaultedToNullIfZero());
@@ -120,7 +141,12 @@ public void refreshSummaryAndBalancesForDisbursedLoan(final Loan loan) {
120141
final Money capitalizedIncomeAdjustment = capitalizedIncomeBalanceService.calculateCapitalizedIncomeAdjustment(loan);
121142
loan.getSummary().updateSummary(loan.getCurrency(), principal, loan.getRepaymentScheduleInstallments(), loan.getLoanCharges(),
122143
capitalizedIncome, capitalizedIncomeAdjustment);
123-
updateLoanOutstandingBalances(loan);
144+
145+
if (viaPersistence) {
146+
updateLoanOutstandingBalancesViaPersistence(loan);
147+
} else {
148+
updateLoanOutstandingBalances(loan);
149+
}
124150
}
125151

126152
private Money calculateTotalRecoveredPayments(Loan loan) {
@@ -130,14 +156,23 @@ private Money calculateTotalRecoveredPayments(Loan loan) {
130156
}
131157

132158
public void updateLoanOutstandingBalances(Loan loan) {
133-
Money outstanding = Money.zero(loan.getCurrency());
134159
final List<LoanTransaction> loanTransactions = new ArrayList<>();
135160
for (final LoanTransaction transaction : loan.getLoanTransactions()) {
136161
if (transaction.isNotReversed() && !transaction.isNonMonetaryTransaction()) {
137162
loanTransactions.add(transaction);
138163
}
139164
}
140165
loanTransactions.sort(LoanTransactionComparator.INSTANCE);
166+
updateLoanOutstandingBalancesInternal(loan, loanTransactions);
167+
}
168+
169+
private void updateLoanOutstandingBalancesViaPersistence(final Loan loan) {
170+
final List<LoanTransaction> loanTransactions = loanTransactionRepository.findNonReversedMonetaryTransactionsByLoan(loan);
171+
updateLoanOutstandingBalancesInternal(loan, loanTransactions);
172+
}
173+
174+
private void updateLoanOutstandingBalancesInternal(final Loan loan, final List<LoanTransaction> loanTransactions) {
175+
Money outstanding = Money.zero(loan.getCurrency());
141176

142177
for (LoanTransaction loanTransaction : loanTransactions) {
143178
if (loanTransaction.isDisbursement() || loanTransaction.isIncomePosting() || loanTransaction.isCapitalizedIncome()) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,8 @@ private void handleChargePaidTransaction(final Loan loan, final LoanCharge charg
595595
final Set<LoanCharge> loanCharges = new HashSet<>(1);
596596
loanCharges.add(charge);
597597
loanTransactionProcessingService.processLatestTransaction(loan.getTransactionProcessingStrategyCode(), chargesPayment,
598-
new TransactionCtx(loan.getCurrency(), chargePaymentInstallments, loanCharges,
599-
new MoneyHolder(loan.getTotalOverpaidAsMoney()), null));
598+
TransactionCtx.builder().currency(loan.getCurrency()).installments(chargePaymentInstallments).charges(loanCharges)
599+
.overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney())).build());
600600

601601
loanLifecycleStateMachine.determineAndTransition(loan, chargesPayment.getTransactionDate());
602602
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ public void handleRepaymentOrRecoveryOrWaiverTransaction(final Loan loan, final
139139
&& loanTransactionProcessingService.canProcessLatestTransactionOnly(loan, loanTransaction, currentInstallment); //
140140
if (processLatest) {
141141
loanTransactionProcessingService.processLatestTransaction(loan.getTransactionProcessingStrategyCode(), loanTransaction,
142-
new TransactionCtx(loan.getCurrency(), loan.getRepaymentScheduleInstallments(), loan.getActiveCharges(),
143-
new MoneyHolder(loan.getTotalOverpaidAsMoney()), null));
142+
TransactionCtx.builder().currency(loan.getCurrency()).installments(loan.getRepaymentScheduleInstallments())
143+
.charges(loan.getActiveCharges()).overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney())).build());
144144
if (!loan.isProgressiveSchedule() && loan.isInterestBearingAndInterestRecalculationEnabled()) {
145145
if (currentInstallment == null || currentInstallment.isNotFullyPaidOff()) {
146146
reprocessOnPostConditions = true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ private void handleRefundTransaction(final Loan loan, final LoanTransaction loan
8282
loanRefundValidator.validateTransactionAmountThreshold(loan, null);
8383

8484
loadTransactionProcessingService.processLatestTransaction(loan.getTransactionProcessingStrategyCode(), loanTransaction,
85-
new TransactionCtx(loan.getCurrency(), loan.getRepaymentScheduleInstallments(), loan.getActiveCharges(),
86-
new MoneyHolder(loan.getTotalOverpaidAsMoney()), null));
85+
TransactionCtx.builder().currency(loan.getCurrency()).installments(loan.getRepaymentScheduleInstallments())
86+
.charges(loan.getActiveCharges()).overpaymentHolder(new MoneyHolder(loan.getTotalOverpaidAsMoney())).build());
8787

8888
loanLifecycleStateMachine.determineAndTransition(loan, loanTransaction.getTransactionDate());
8989
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ ChangedTransactionDetail processLatestTransaction(String transactionProcessingSt
4444

4545
ChangedTransactionDetail reprocessLoanTransactions(String transactionProcessingStrategyCode, LocalDate disbursementDate,
4646
List<LoanTransaction> repaymentsOrWaivers, MonetaryCurrency currency,
47-
List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments, Set<LoanCharge> charges);
47+
List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments, Set<LoanCharge> charges,
48+
List<LoanTransaction> loanTransactions);
4849

4950
LoanRepaymentScheduleTransactionProcessor getTransactionProcessor(String transactionProcessingStrategyCode);
5051

0 commit comments

Comments
 (0)