CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FINERACT-2205: Handling charges which belong to installments that got removed.

Browse Source
This commit is contained in:
mariiaKraievska
2025-01-27 21:27:33 +01:00
committed by Arnold Gálovics
parent df838cb113
commit de1555f68f
2 changed files with 1035 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
+1002
View File
File diff suppressed because it is too large Load Diff
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java
+33 -4
View File
@@ -1239,12 +1239,41 @@ public class AdvancedPaymentScheduleTransactionProcessor extends AbstractLoanRep
} }
currentInstallment.updateDueDate(transactionDate); currentInstallment.updateDueDate(transactionDate);
final BigDecimal futurePrincipal = installments.stream()
.filter(installment -> transactionDate.isBefore(installment.getDueDate())) final List<LoanRepaymentScheduleInstallment> futureInstallments = installments.stream()
.map(LoanRepaymentScheduleInstallment::getPrincipal).reduce(BigDecimal.ZERO, BigDecimal::add); .filter(installment -> transactionDate.isBefore(installment.getDueDate())).toList();
final BigDecimal futurePrincipal = futureInstallments.stream().map(LoanRepaymentScheduleInstallment::getPrincipal)
.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
final BigDecimal futureFee = futureInstallments.stream().map(LoanRepaymentScheduleInstallment::getFeeChargesCharged)
.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
final BigDecimal futurePenalty = futureInstallments.stream().map(LoanRepaymentScheduleInstallment::getPenaltyCharges)
.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
currentInstallment.updatePrincipal(MathUtil.nullToZero(currentInstallment.getPrincipal()).add(futurePrincipal)); currentInstallment.updatePrincipal(MathUtil.nullToZero(currentInstallment.getPrincipal()).add(futurePrincipal));
final List<LoanRepaymentScheduleInstallment> installmentsUpToTransactionDate = installments.stream() final List<LoanRepaymentScheduleInstallment> installmentsUpToTransactionDate = installments.stream()
.filter(installment -> transactionDate.isAfter(installment.getFromDate())).toList(); .filter(installment -> transactionDate.isAfter(installment.getFromDate()))
.collect(Collectors.toCollection(ArrayList::new));
if (futureFee.compareTo(BigDecimal.ZERO) > 0 || futurePenalty.compareTo(BigDecimal.ZERO) > 0) {
final Optional<LocalDate> latestDueDate = loan.getCharges().stream()
.filter(loanCharge -> loanCharge.isActive() && loanCharge.isNotFullyPaid()).map(LoanCharge::getDueDate)
.max(LocalDate::compareTo);
if (latestDueDate.isPresent()) {
final LoanRepaymentScheduleInstallment lastInstallment = installmentsUpToTransactionDate
.get(installmentsUpToTransactionDate.size() - 1);
final LoanRepaymentScheduleInstallment installmentForCharges = new LoanRepaymentScheduleInstallment(loan,
lastInstallment.getInstallmentNumber() + 1, currentInstallment.getDueDate(), latestDueDate.get(),
BigDecimal.ZERO, BigDecimal.ZERO, futureFee, futurePenalty, null, null, null, true, false, false);
installmentsUpToTransactionDate.add(installmentForCharges);
}
}
loan.updateLoanSchedule(installmentsUpToTransactionDate); loan.updateLoanSchedule(installmentsUpToTransactionDate);
loan.updateLoanScheduleDependentDerivedFields(); loan.updateLoanScheduleDependentDerivedFields();
} }