oleksii-novikov-onix commented on code in PR #4661:
URL: https://github.com/apache/fineract/pull/4661#discussion_r2086362317
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java:
##########
@@ -450,10 +454,50 @@ public LoanAccountData
retrieveTemplateWithCompleteGroupAndProductDetails(final
return loanDetails;
}
+ private CurrencyData retriveLoanCurrencyData(final Long loanId) {
+ final LoanCurrencyDataMapper loanCurrencyMapper = new
LoanCurrencyDataMapper(sqlGenerator);
+ final String sql = "select " + loanCurrencyMapper.schema() + " where
l.id = ?";
+
+ return this.jdbcTemplate.queryForObject(sql, loanCurrencyMapper,
loanId);
+ }
+
@Override
- public LoanTransactionData retrieveLoanTransactionTemplate(final Long
loanId, LoanTransactionType transactionType) {
- return
LoanTransactionData.templateOnTop(retrieveLoanTransactionTemplate(loanId),
- LoanEnumerations.transactionType(transactionType));
+ public LoanTransactionData retrieveLoanTransactionTemplate(final Long
loanId, final LoanTransactionType transactionType,
+ final Long transactionId) {
+
+ LoanTransactionData loanTransactionData = null;
+ Collection<PaymentTypeData> paymentOptions = null;
+ BigDecimal transactionAmount = BigDecimal.ZERO;
+ switch (transactionType) {
+ case CAPITALIZED_INCOME:
+ final Loan loan =
loanRepositoryWrapper.findOneWithNotFoundDetection(loanId);
+ if
(loan.getLoanProduct().getLoanProductRelatedDetail().isEnableIncomeCapitalization())
{
+ final BigDecimal capitalizedIncomeBalance =
loanCapitalizedIncomeBalanceRepository.findAllByLoanId(loanId).stream()
+
.map(LoanCapitalizedIncomeBalance::getAmount).reduce(BigDecimal.ZERO,
BigDecimal::add);
+ transactionAmount =
loan.getApprovedPrincipal().subtract(loan.getDisbursedAmount()).subtract(capitalizedIncomeBalance);
+ }
+ paymentOptions =
this.paymentTypeReadPlatformService.retrieveAllPaymentTypes();
+ loanTransactionData =
LoanTransactionData.loanTransactionDataForCreditTemplate(
+ LoanEnumerations.transactionType(transactionType),
DateUtils.getBusinessLocalDate(), transactionAmount,
+ paymentOptions, retriveLoanCurrencyData(loanId));
+
+ break;
+ case CAPITALIZED_INCOME_ADJUSTMENT:
+ final LoanCapitalizedIncomeBalance
loanCapitalizedIncomeBalance = loanCapitalizedIncomeBalanceRepository
+ .findByLoanIdAndLoanTransactionId(loanId,
transactionId);
+ transactionAmount = loanCapitalizedIncomeBalance.getAmount()
Review Comment:
There is no null check on `loanCapitalizedIncomeBalance` before accessing
its amount. I believe the better approach is to wrap
`LoanCapitalizedIncomeBalance` result in an `Optional`, and check if it is
empty before doing anything.
--
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]
