Aman-Mittal commented on code in PR #5401:
URL: https://github.com/apache/fineract/pull/5401#discussion_r2747150436
##########
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java:
##########
@@ -2189,11 +2189,18 @@ private void handleZeroInterestChargeOff(final
LoanTransaction loanTransaction,
}
});
- final Money amountToEditLastInstallment =
loanTransaction.getLoan().getPrincipal().minus(installments.stream() //
- .filter(i -> i.getPrincipal() != null) //
+ final BigDecimal totalCreditedPrincipal = installments.stream() //
.filter(i -> !i.isAdditional()) //
- .map(LoanRepaymentScheduleInstallment::getPrincipal) //
- .reduce(ZERO, BigDecimal::add));
+ .map(i -> MathUtil.nullToZero(i.getCreditedPrincipal())) //
+ .reduce(ZERO, BigDecimal::add);
+
+ final Money amountToEditLastInstallment =
loanTransaction.getLoan().getPrincipal() //
+ .plus(Money.of(currency, totalCreditedPrincipal)) //
+ .minus(installments.stream() //
+ .filter(i -> i.getPrincipal() != null) //
+ .filter(i -> !i.isAdditional()) //
+
.map(LoanRepaymentScheduleInstallment::getPrincipal) //
+ .reduce(ZERO, BigDecimal::add));
Review Comment:
I think we can break down this logic further
.filter(i -> i.getPrincipal() != null) //
.filter(i -> !i.isAdditional()) This filter
can be combined
this business logic can be broken down based on following
scheduledPrincipal -> installments.stream() //
.filter(i -> i.getPrincipal() != null
&&!i.isAdditional()) //
.map(LoanRepaymentScheduleInstallment::getPrincipal) //
.reduce(ZERO, BigDecimal::add)
final Money totalPrincipal = loanTransaction.getLoan().getPrincipal()
.plus(Money.of(currency, totalCreditedPrincipal));
final Money amountToEditLastInstallment =
totalPrincipal.minus(scheduledPrincipal);
--
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]
