adamsaghy commented on code in PR #5029:
URL: https://github.com/apache/fineract/pull/5029#discussion_r2375644218
##########
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java:
##########
@@ -2872,26 +2920,45 @@ private void handleReAge(LoanTransaction
loanTransaction, TransactionCtx ctx) {
adjustCalculatedPrincipal = outstandingPrincipalBalance.get()
.minus(calculatedPrincipal.multipliedBy(loanTransaction.getLoanReAgeParameter().getNumberOfInstallments()));
}
- final LoanRepaymentScheduleInstallment lastNormalInstallment =
installments.stream() //
- .filter(i ->
i.getDueDate().isBefore(loanTransaction.getTransactionDate())) //
- .reduce((first, second) -> second) //
- .orElseThrow();
- LoanRepaymentScheduleInstallment reAgedInstallment =
LoanRepaymentScheduleInstallment.newReAgedInstallment(
- lastNormalInstallment.getLoan(),
lastNormalInstallment.getInstallmentNumber() + 1,
lastNormalInstallment.getDueDate(),
- loanTransaction.getLoanReAgeParameter().getStartDate(),
calculatedPrincipal.getAmount());
- installments.add(reAgedInstallment);
- reAgedInstallment.updateObligationsMet(currency,
loanTransaction.getTransactionDate());
+
+ 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();
+ }
Review Comment:
duplicate?
--
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]
