reluxa commented on code in PR #3751:
URL: https://github.com/apache/fineract/pull/3751#discussion_r1500472622
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java:
##########
@@ -307,42 +286,115 @@ protected void processCreditTransaction(LoanTransaction
loanTransaction, Transac
if
(loanTransaction.getTransactionDate().equals(pastDueDate)) {
LoanRepaymentScheduleInstallment
currentInstallment = ctx.getInstallments()
.get(ctx.getInstallments().size() - 1);
-
currentInstallment.addToCredits(transactionAmount.getAmount());
- currentInstallment.addToPrincipal(transactionDate,
chargebackAllocation.get(PRINCIPAL));
- Money originalInterest =
currentInstallment.getInterestCharged(ctx.getCurrency());
- currentInstallment.updateInterestCharged(
-
originalInterest.plus(chargebackAllocation.get(INTEREST)).getAmountDefaultedToNullIfZero());
- if (repaidAmount.isGreaterThanZero()) {
-
currentInstallment.payPrincipalComponent(loanTransaction.getTransactionDate(),
repaidAmount);
-
transactionMappings.add(LoanTransactionToRepaymentScheduleMapping.createFrom(loanTransaction,
- currentInstallment, repaidAmount,
zeroMoney, zeroMoney, zeroMoney));
- }
+ processInstallmentAfterChargeback(loanTransaction,
ctx, transactionMappings, overpaymentAmount,
+ chargebackAllocation, transactionDate,
currentInstallment);
} else {
Loan loan = loanTransaction.getLoan();
LoanRepaymentScheduleInstallment installment = new
LoanRepaymentScheduleInstallment(loan,
(ctx.getInstallments().size() + 1),
pastDueDate, transactionDate, zeroMoney.getAmount(),
zeroMoney.getAmount(),
zeroMoney.getAmount(), zeroMoney.getAmount(), false, null);
- installment.markAsAdditional();
-
installment.addToCredits(transactionAmount.getAmount());
- installment.addToPrincipal(transactionDate,
chargebackAllocation.get(PRINCIPAL));
- Money originalInterest =
installment.getInterestCharged(ctx.getCurrency());
- installment.updateInterestCharged(
-
originalInterest.plus(chargebackAllocation.get(INTEREST)).getAmountDefaultedToNullIfZero());
+ processInstallmentAfterChargeback(loanTransaction,
ctx, transactionMappings, overpaymentAmount,
+ chargebackAllocation, transactionDate,
installment);
loan.addLoanRepaymentScheduleInstallment(installment);
- if (repaidAmount.isGreaterThanZero()) {
-
installment.payPrincipalComponent(loanTransaction.getTransactionDate(),
repaidAmount);
-
transactionMappings.add(LoanTransactionToRepaymentScheduleMapping.createFrom(loanTransaction,
installment,
- repaidAmount, zeroMoney, zeroMoney,
zeroMoney));
- }
}
}
-
loanTransaction.updateLoanTransactionToRepaymentScheduleMappings(transactionMappings);
+ } else {
+ throw new RuntimeException("Unsupported transaction " +
loanTransaction.getTypeOf().name());
}
}
}
}
+ private void processInstallmentAfterChargeback(LoanTransaction
loanTransaction, TransactionCtx ctx,
+ List<LoanTransactionToRepaymentScheduleMapping>
transactionMappings, Money overpaymentAmount,
+ Map<AllocationType, Money> chargebackAllocation, LocalDate
transactionDate,
+ LoanRepaymentScheduleInstallment currentInstallment) {
+ recognizeAmountsAfterChargeback(ctx.getCurrency(), transactionDate,
currentInstallment, chargebackAllocation);
+ if (overpaymentAmount.isGreaterThanZero()) {
+ LoanTransactionToRepaymentScheduleMapping mapping =
repayFromOverpaymentAfterChargeback(loanTransaction, currentInstallment,
+ overpaymentAmount, chargebackAllocation);
+ transactionMappings.add(mapping);
+ }
+ }
+
+ protected LoanTransactionToRepaymentScheduleMapping
repayFromOverpaymentAfterChargeback(LoanTransaction loanTransaction,
Review Comment:
Consider using allocateOverpayment
--
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]
