adamsaghy commented on code in PR #5053:
URL: https://github.com/apache/fineract/pull/5053#discussion_r2439101406
##########
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java:
##########
@@ -2890,71 +2892,157 @@ private void handleReAge(LoanTransaction
loanTransaction, TransactionCtx ctx) {
MonetaryCurrency currency = ctx.getCurrency();
List<LoanRepaymentScheduleInstallment> installments =
ctx.getInstallments();
- AtomicReference<Money> outstandingPrincipalBalance = new
AtomicReference<>(Money.zero(currency));
- installments.forEach(i -> {
- Money principalOutstanding = i.getPrincipalOutstanding(currency);
- if (principalOutstanding.isGreaterThanZero()) {
-
outstandingPrincipalBalance.set(outstandingPrincipalBalance.get().add(principalOutstanding));
- i.addToPrincipal(loanTransaction.getTransactionDate(),
principalOutstanding.negated());
+ // re-aging logic for interest-bearing loans
+ if (ctx instanceof ProgressiveTransactionCtx progressiveTransactionCtx
+ &&
loanTransaction.getLoan().isInterestBearingAndInterestRecalculationEnabled()) {
+ handleReAgeWithInterestRecalculationEnabled(loanTransaction,
progressiveTransactionCtx);
+ } else if (loanTransaction.getLoan().isInterestBearing() &&
!loanTransaction.getLoan().isInterestRecalculationEnabled()) {
+ // TODO: implement interestRecalculation = false logic
+ throw new NotImplementedException(
+ "Logic for re-aging when interest bearing loan has
interestRecalculation disabled is not implemented");
+ } else {
+ AtomicReference<Money> outstandingPrincipalBalance = new
AtomicReference<>(Money.zero(currency));
+ installments.forEach(i -> {
+ Money principalOutstanding =
i.getPrincipalOutstanding(currency);
+ if (principalOutstanding.isGreaterThanZero()) {
+
outstandingPrincipalBalance.set(outstandingPrincipalBalance.get().add(principalOutstanding));
+ i.addToPrincipal(loanTransaction.getTransactionDate(),
principalOutstanding.negated());
+ }
+ });
+
+
loanTransaction.updateComponentsAndTotal(outstandingPrincipalBalance.get(),
Money.zero(currency), Money.zero(currency),
+ Money.zero(currency));
+
+ Money calculatedPrincipal = Money.zero(currency);
+ Money adjustCalculatedPrincipal = Money.zero(currency);
+ if (outstandingPrincipalBalance.get().isGreaterThanZero()) {
+ calculatedPrincipal = outstandingPrincipalBalance.get()
+
.dividedBy(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments(),
MoneyHelper.getMathContext());
+ Integer installmentAmountInMultiplesOf =
loanTransaction.getLoan().getLoanProductRelatedDetail()
+ .getInstallmentAmountInMultiplesOf();
+ if (installmentAmountInMultiplesOf != null) {
+ calculatedPrincipal =
Money.roundToMultiplesOf(calculatedPrincipal, installmentAmountInMultiplesOf);
+ }
+ adjustCalculatedPrincipal = outstandingPrincipalBalance.get()
+
.minus(calculatedPrincipal.multipliedBy(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments()));
+ }
+
+ Optional<LoanRepaymentScheduleInstallment>
lastNormalInstallmentOptional = installments.stream().filter(i ->
!i.isDownPayment())
+ .filter(i ->
i.getDueDate().isBefore(loanTransaction.getTransactionDate())).reduce((first,
second) -> second);
+
+ int reAgedInstallmentNumber;
+ LocalDate fromDate;
+ Loan loan;
+ if (lastNormalInstallmentOptional.isEmpty()) {
+ LoanRepaymentScheduleInstallment firstNormalInstallment =
installments.stream().filter(i -> !i.isDownPayment())
+
.min(Comparator.comparing(LoanRepaymentScheduleInstallment::getDueDate)).orElseThrow();
+ reAgedInstallmentNumber =
firstNormalInstallment.getInstallmentNumber();
+ fromDate = firstNormalInstallment.getFromDate();
+ loan = firstNormalInstallment.getLoan();
+ } else {
+ LoanRepaymentScheduleInstallment lastNormalInstallment =
lastNormalInstallmentOptional.get();
+ reAgedInstallmentNumber =
lastNormalInstallment.getInstallmentNumber() + 1;
+ fromDate = lastNormalInstallment.getDueDate();
+ loan = lastNormalInstallment.getLoan();
}
- });
-
loanTransaction.updateComponentsAndTotal(outstandingPrincipalBalance.get(),
Money.zero(currency), Money.zero(currency),
- Money.zero(currency));
+ LoanRepaymentScheduleInstallment reAgedInstallment =
LoanRepaymentScheduleInstallment.newReAgedInstallment(loan,
+ reAgedInstallmentNumber, fromDate,
loanTransaction.getLoanReAgeParameter().getStartDate(),
+ calculatedPrincipal.getAmount());
+ insertOrReplaceRelatedInstallment(installments, reAgedInstallment,
currency, loanTransaction.getTransactionDate());
- Money calculatedPrincipal = Money.zero(currency);
- Money adjustCalculatedPrincipal = Money.zero(currency);
- if (outstandingPrincipalBalance.get().isGreaterThanZero()) {
- calculatedPrincipal = outstandingPrincipalBalance.get()
-
.dividedBy(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments(),
MoneyHelper.getMathContext());
- Integer installmentAmountInMultiplesOf =
loanTransaction.getLoan().getLoanProductRelatedDetail()
- .getInstallmentAmountInMultiplesOf();
- if (installmentAmountInMultiplesOf != null) {
- calculatedPrincipal =
Money.roundToMultiplesOf(calculatedPrincipal, installmentAmountInMultiplesOf);
+ for (int i = 1; i <
loanTransaction.getLoanReAgeParameter().getNumberOfInstallments(); i++) {
+ LocalDate calculatedDueDate =
calculateReAgedInstallmentDueDate(loanTransaction.getLoanReAgeParameter(),
+ reAgedInstallment.getDueDate());
+ int nextReAgedInstallmentNumber =
reAgedInstallment.getInstallmentNumber() + 1;
+ reAgedInstallment =
LoanRepaymentScheduleInstallment.newReAgedInstallment(reAgedInstallment.getLoan(),
+ nextReAgedInstallmentNumber,
reAgedInstallment.getDueDate(), calculatedDueDate,
calculatedPrincipal.getAmount());
+ if (i + 1 ==
loanTransaction.getLoanReAgeParameter().getNumberOfInstallments()) {
+
reAgedInstallment.addToPrincipal(loanTransaction.getTransactionDate(),
adjustCalculatedPrincipal);
+ }
+ insertOrReplaceRelatedInstallment(installments,
reAgedInstallment, currency, loanTransaction.getTransactionDate());
}
- adjustCalculatedPrincipal = outstandingPrincipalBalance.get()
-
.minus(calculatedPrincipal.multipliedBy(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments()));
+ int lastReAgedInstallmentNumber =
reAgedInstallment.getInstallmentNumber();
+ List<LoanRepaymentScheduleInstallment> toRemove =
installments.stream().filter(i -> i != null && !i.isAdditional()
+ && i.getInstallmentNumber() != null &&
i.getInstallmentNumber() > lastReAgedInstallmentNumber).toList();
+ toRemove.forEach(installments::remove);
+ reprocessInstallments(installments);
}
+ }
- Optional<LoanRepaymentScheduleInstallment>
lastNormalInstallmentOptional = installments.stream().filter(i ->
!i.isDownPayment())
- .filter(i ->
i.getDueDate().isBefore(loanTransaction.getTransactionDate())).reduce((first,
second) -> second);
+ private void cleanupInstallmentsAndRepaymentPeriodsAfterReAging(final
ProgressiveTransactionCtx ctx) {
+ final List<LoanRepaymentScheduleInstallment> installments =
ctx.getInstallments();
+ final List<RepaymentPeriod> repaymentPeriods =
ctx.getModel().repaymentPeriods();
- int reAgedInstallmentNumber;
- LocalDate fromDate;
- Loan loan;
- if (lastNormalInstallmentOptional.isEmpty()) {
- LoanRepaymentScheduleInstallment firstNormalInstallment =
installments.stream().filter(i -> !i.isDownPayment())
-
.min(Comparator.comparing(LoanRepaymentScheduleInstallment::getDueDate)).orElseThrow();
- reAgedInstallmentNumber =
firstNormalInstallment.getInstallmentNumber();
- fromDate = firstNormalInstallment.getFromDate();
- loan = firstNormalInstallment.getLoan();
- } else {
- LoanRepaymentScheduleInstallment lastNormalInstallment =
lastNormalInstallmentOptional.get();
- reAgedInstallmentNumber =
lastNormalInstallment.getInstallmentNumber() + 1;
- fromDate = lastNormalInstallment.getDueDate();
- loan = lastNormalInstallment.getLoan();
+ // Find the last re-aged installment number
+ final OptionalInt lastReAgedInstallmentNumberOpt =
installments.stream().filter(LoanRepaymentScheduleInstallment::isReAged)
+
.mapToInt(LoanRepaymentScheduleInstallment::getInstallmentNumber).max();
+
+ if (lastReAgedInstallmentNumberOpt.isPresent()) {
+ final int lastReAgedInstallmentNumber =
lastReAgedInstallmentNumberOpt.getAsInt();
+ final LoanRepaymentScheduleInstallment lastReAgedInstallment =
installments.stream()
+ .filter(i ->
i.getInstallmentNumber().equals(lastReAgedInstallmentNumber)).findFirst().orElse(null);
+ // Remove installments with numbers greater than the last re-aged
installment
+ final List<LoanRepaymentScheduleInstallment> installmentsToRemove
= installments.stream().filter(i -> i != null
+ && !i.isAdditional() && i.getInstallmentNumber() != null
&& i.getInstallmentNumber() > lastReAgedInstallmentNumber)
+ .toList();
+ if (lastReAgedInstallment != null) {
+ final List<RepaymentPeriod> repaymentPeriodsToRemove =
repaymentPeriods.stream()
+ .filter(rp ->
!rp.getFromDate().isBefore(lastReAgedInstallment.getDueDate())).toList();
+ repaymentPeriodsToRemove.forEach(repaymentPeriods::remove);
+ }
+ installmentsToRemove.forEach(installments::remove);
}
+ }
- LoanRepaymentScheduleInstallment reAgedInstallment =
LoanRepaymentScheduleInstallment.newReAgedInstallment(loan,
- reAgedInstallmentNumber, fromDate,
loanTransaction.getLoanReAgeParameter().getStartDate(),
calculatedPrincipal.getAmount());
- insertOrReplaceRelatedInstallment(installments, reAgedInstallment,
currency, loanTransaction.getTransactionDate());
+ private void removeOutstandingAmountsFromInstallment(final
LoanRepaymentScheduleInstallment existingInstallment,
Review Comment:
Would it be better to use `updateInstallmentsByModelForReAging` and set
principal and interest from the model directly?
--
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]
