oleksii-novikov-onix commented on code in PR #4544:
URL: https://github.com/apache/fineract/pull/4544#discussion_r2030711441
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java:
##########
@@ -142,34 +143,46 @@ public Set<LoanCharge> fromParsedJson(final JsonElement
element, List<LoanDisbur
expectedDisbursementDate =
this.fromApiJsonHelper.extractLocalDateNamed(
LoanApiConstants.expectedDisbursementDateParameterName,
disbursementDataElement, dateFormat,
locale);
+ } else {
+ expectedDisbursementDate =
this.fromApiJsonHelper
+
.extractLocalDateNamed(LoanApiConstants.expectedDisbursementDateParameterName,
element);
}
}
if
(ChargeTimeType.DISBURSEMENT.getValue().equals(chargeDefinition.getChargeTimeType()))
{
- for (LoanDisbursementDetails
disbursementDetail : disbursementDetails) {
- LoanTrancheDisbursementCharge
loanTrancheDisbursementCharge = null;
- if
(chargeDefinition.isPercentageOfApprovedAmount()
- &&
disbursementDetail.expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate))
{
- final LoanCharge loanCharge =
createNewWithoutLoan(chargeDefinition, principal, amount, chargeTime,
- chargeCalculation, dueDate,
chargePaymentModeEnum, numberOfRepayments, externalId);
- loanCharges.add(loanCharge);
- if
(loanCharge.isTrancheDisbursementCharge()) {
- loanTrancheDisbursementCharge =
new LoanTrancheDisbursementCharge(loanCharge,
- disbursementDetail);
-
loanCharge.updateLoanTrancheDisbursementCharge(loanTrancheDisbursementCharge);
- }
- } else {
- if
(disbursementDetail.expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate))
{
- final LoanCharge loanCharge =
createNewWithoutLoan(chargeDefinition,
-
disbursementDetail.principal(), amount, chargeTime, chargeCalculation,
-
disbursementDetail.expectedDisbursementDateAsLocalDate(), chargePaymentModeEnum,
- numberOfRepayments,
externalId);
+ if
(CollectionUtils.isEmpty(disbursementDetails)) {
+ // non-tranche
+ final LoanCharge loanCharge =
createNewWithoutLoan(chargeDefinition, principal, amount, chargeTime,
+ chargeCalculation, dueDate,
chargePaymentModeEnum, numberOfRepayments, externalId);
+ loanCharges.add(loanCharge);
+ } else {
+ // tranche
+ for (LoanDisbursementDetails
disbursementDetail : disbursementDetails) {
+ LoanTrancheDisbursementCharge
loanTrancheDisbursementCharge = null;
Review Comment:
There is no need to assign null manually - it is the default value
--
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]
