mariiaKraievska commented on code in PR #5294:
URL: https://github.com/apache/fineract/pull/5294#discussion_r2686172367
##########
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java:
##########
@@ -134,12 +137,111 @@ private void addDisbursement(final
ProgressiveLoanInterestScheduleModel schedule
scheduleModel.repaymentPeriods().stream().filter(rp ->
!operation.getSubmittedOnDate().isAfter(rp.getFromDate()))
.forEach(rp ->
rp.setTotalDisbursedAmount(rp.getTotalDisbursedAmount().add(operation.getAmount())));
- scheduleModel
-
.changeOutstandingBalanceAndUpdateInterestPeriods(operation.getSubmittedOnDate(),
operation.getAmount(),
- scheduleModel.zero(), scheduleModel.zero())
- .ifPresent((repaymentPeriod) ->
calculateEMIValueAndRateFactors(
- getEffectiveRepaymentDueDate(scheduleModel,
repaymentPeriod, operation.getSubmittedOnDate()), scheduleModel,
- operation));
+ final int numberOfRepayments =
scheduleModel.loanProductRelatedDetail().getNumberOfRepayments();
+ if
(scheduleModel.loanProductRelatedDetail().isAllowFullTermForTranche() &&
numberOfRepayments > 0) {
+ addFullTermTrancheDisbursement(scheduleModel, operation);
+ } else {
+ scheduleModel
+
.changeOutstandingBalanceAndUpdateInterestPeriods(operation.getSubmittedOnDate(),
operation.getAmount(),
+ scheduleModel.zero(), scheduleModel.zero())
+ .ifPresent((repaymentPeriod) ->
calculateEMIValueAndRateFactors(
+ getEffectiveRepaymentDueDate(scheduleModel,
repaymentPeriod, operation.getSubmittedOnDate()), scheduleModel,
+ operation));
+ }
+ }
+
+ private void addFullTermTrancheDisbursement(final
ProgressiveLoanInterestScheduleModel scheduleModel,
+ final EmiChangeOperation operation) {
+ final MathContext mc = scheduleModel.mc();
+ final LocalDate disbursementDate = operation.getSubmittedOnDate();
+ final Money disbursedAmount = operation.getAmount();
+ final ILoanConfigurationDetails loanProductRelatedDetail =
scheduleModel.loanProductRelatedDetail();
+ final Optional<RepaymentPeriod> firstDisbursedPeriod =
scheduleModel.repaymentPeriods().stream()
+ .filter(period ->
isInPeriodFromInclusiveToExclusive(disbursementDate, period.getFromDate(),
period.getDueDate()))
+ .findFirst();
+ final LocalDate firstDisbursedPeriodStartDate =
firstDisbursedPeriod.isPresent() ? firstDisbursedPeriod.get().getFromDate()
+ : scheduleModel.getMaturityDate();
+
+ final LoanApplicationTerms loanApplicationTerms =
buildLoanApplicationTerms(loanProductRelatedDetail,
firstDisbursedPeriodStartDate,
+ disbursedAmount, mc);
+
+ final ProgressiveLoanInterestScheduleModel
temporaryReAgedScheduleModel =
generateTemporaryScheduleModelWithParticularDisbursementDate(
+ loanApplicationTerms, mc, firstDisbursedPeriodStartDate,
disbursementDate);
+
+ mergeNewInterestScheduleModelWithExistingOne(scheduleModel,
temporaryReAgedScheduleModel, operation);
+ }
+
+ private LoanApplicationTerms buildLoanApplicationTerms(final
ILoanConfigurationDetails loanProductRelatedDetail,
+ final LocalDate firstDisbursedPeriodStartDate, final Money
disbursedAmount, final MathContext mc) {
+ return new LoanApplicationTerms.Builder()
+ // Loan basics
+
.currency(loanProductRelatedDetail.getCurrencyData()).principal(disbursedAmount)
+
.repaymentsStartingFromDate(firstDisbursedPeriodStartDate).downPaymentPercentage(ZERO)
+
.seedDate(firstDisbursedPeriodStartDate).inArrearsTolerance(Money.zero(loanProductRelatedDetail.getCurrencyData()))
+ // Term & frequency
+
.loanTermFrequency(loanProductRelatedDetail.getNumberOfRepayments())
+
.loanTermPeriodFrequencyType(loanProductRelatedDetail.getRepaymentPeriodFrequencyType())
+
.numberOfRepayments(loanProductRelatedDetail.getNumberOfRepayments())
+ .repaymentEvery(loanProductRelatedDetail.getRepayEvery())
+
.repaymentPeriodFrequencyType(loanProductRelatedDetail.getRepaymentPeriodFrequencyType())
+ // Interest configuration
+
.interestRatePerPeriod(loanProductRelatedDetail.getAnnualNominalInterestRate())
+
.annualNominalInterestRate(loanProductRelatedDetail.getAnnualNominalInterestRate())
+
.interestRatePeriodFrequencyType(loanProductRelatedDetail.getRepaymentPeriodFrequencyType())
+ .interestMethod(loanProductRelatedDetail.getInterestMethod())
+
.interestRecognitionOnDisbursementDate(loanProductRelatedDetail.isInterestRecognitionOnDisbursementDate())
+ // Day count conventions
+
.daysInMonthType(DaysInMonthType.fromInt(loanProductRelatedDetail.getDaysInMonthType()))
+
.daysInYearType(DaysInYearType.fromInt(loanProductRelatedDetail.getDaysInYearType()))
+
.daysInYearCustomStrategy(loanProductRelatedDetail.getDaysInYearCustomStrategy())
+ // Flags & options
+ .isDownPaymentEnabled(false)
+
.allowPartialPeriodInterestCalculation(loanProductRelatedDetail.isAllowPartialPeriodInterestCalculation())
+ // Technical
+ .mc(mc).build();
+ }
+
+ private void mergeNewInterestScheduleModelWithExistingOne(final
ProgressiveLoanInterestScheduleModel scheduleModel,
Review Comment:
mergeNewInterestScheduleModelWithExistingOne for re-aging actually has the
different approach, I renamed it accordinally
--
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]
