From 737455f52f3330461f97486b5f99f74ec62ba6ec Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Wed, 31 Jul 2024 00:23:10 -0600 Subject: [PATCH] FINERACT-2081: Loan account summary with Unpaid Payable Interest --- .../main/avro/loan/v1/LoanSummaryDataV1.avsc | 4 +- .../loanaccount/data/LoanSummaryData.java | 86 ++++------- .../data/LoanSchedulePeriodData.java | 44 ++++++ .../api/LoansApiResourceSwagger.java | 4 +- ...ntAllocationLoanRepaymentScheduleTest.java | 143 ++++++++++++++---- 5 files changed, 185 insertions(+), 96 deletions(-) diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc index 5e74118cf..9ad816a55 100644 --- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc +++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc @@ -437,7 +437,7 @@ }, { "default": null, - "name": "totalUnpaidAccruedDueInterest", + "name": "totalUnpaidPayableDueInterest", "type": [ "null", "bigdecimal" @@ -445,7 +445,7 @@ }, { "default": null, - "name": "totalUnpaidAccruedNotDueInterest", + "name": "totalUnpaidPayableNotDueInterest", "type": [ "null", "bigdecimal" diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java index af9e1b9f1..01d688f0b 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java @@ -26,7 +26,6 @@ import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.MathUtil; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanScheduleData; @@ -100,11 +99,12 @@ public class LoanSummaryData { private final Long chargeOffReasonId; private final String chargeOffReason; - private BigDecimal totalUnpaidAccruedDueInterest; - private BigDecimal totalUnpaidAccruedNotDueInterest; + private BigDecimal totalUnpaidPayableDueInterest; + private BigDecimal totalUnpaidPayableNotDueInterest; public static LoanSummaryData withTransactionAmountsSummary(final LoanSummaryData defaultSummaryData, final LoanScheduleData repaymentSchedule, final Collection loanTransactionBalances) { + final LocalDate businessDate = DateUtils.getBusinessLocalDate(); BigDecimal totalMerchantRefund = BigDecimal.ZERO; BigDecimal totalMerchantRefundReversed = BigDecimal.ZERO; @@ -121,8 +121,8 @@ public class LoanSummaryData { BigDecimal totalRepaymentTransactionReversed = BigDecimal.ZERO; BigDecimal totalInterestPaymentWaiver = BigDecimal.ZERO; BigDecimal totalInterestRefund = BigDecimal.ZERO; - BigDecimal totalUnpaidAccruedDueInterest = BigDecimal.ZERO; - BigDecimal totalUnpaidAccruedNotDueInterest = BigDecimal.ZERO; + BigDecimal totalUnpaidPayableDueInterest = BigDecimal.ZERO; + BigDecimal totalUnpaidPayableNotDueInterest = BigDecimal.ZERO; totalChargeAdjustment = fetchLoanTransactionBalanceByType(loanTransactionBalances, LoanTransactionType.CHARGE_ADJUSTMENT.getValue()); @@ -160,25 +160,12 @@ public class LoanSummaryData { LoanTransactionType.REPAYMENT.getValue()); if (repaymentSchedule != null) { - // Accrued Due Interest on Past due installments - totalUnpaidAccruedDueInterest = computeTotalAccruedDueInterestAmount(repaymentSchedule.getPeriods()); - if (MathUtil.isGreaterThanZero(totalUnpaidAccruedDueInterest)) { - totalUnpaidAccruedDueInterest = totalUnpaidAccruedDueInterest - .subtract(computeTotalInterestPaidDueAmount(repaymentSchedule.getPeriods())); - if (MathUtil.isLessThanZero(totalUnpaidAccruedDueInterest)) { - totalUnpaidAccruedDueInterest = BigDecimal.ZERO; - } - } + // Outstanding Interest on Past due installments + totalUnpaidPayableDueInterest = computeTotalUnpaidPayableDueInterestAmount(repaymentSchedule.getPeriods(), businessDate); - // Accrued Due Interest on Actual Installment - totalUnpaidAccruedNotDueInterest = computeTotalAccruedNotDueInterestAmountOnActualPeriod(repaymentSchedule.getPeriods()); - if (MathUtil.isGreaterThanZero(totalUnpaidAccruedNotDueInterest)) { - totalUnpaidAccruedNotDueInterest = totalUnpaidAccruedNotDueInterest - .subtract(computeTotalInterestPaidNotDueAmountOnActualPeriod(repaymentSchedule.getPeriods())); - if (MathUtil.isLessThanZero(totalUnpaidAccruedNotDueInterest)) { - totalUnpaidAccruedNotDueInterest = BigDecimal.ZERO; - } - } + // Accumulated daily interest of the current Installment period + totalUnpaidPayableNotDueInterest = computeTotalUnpaidPayableNotDueInterestAmountOnActualPeriod(repaymentSchedule.getPeriods(), + businessDate); } return LoanSummaryData.builder().currency(defaultSummaryData.currency).principalDisbursed(defaultSummaryData.principalDisbursed) @@ -212,8 +199,8 @@ public class LoanSummaryData { .totalChargeback(totalChargeback).totalCreditBalanceRefund(totalCreditBalanceRefund) .totalCreditBalanceRefundReversed(totalCreditBalanceRefundReversed).totalRepaymentTransaction(totalRepaymentTransaction) .totalRepaymentTransactionReversed(totalRepaymentTransactionReversed).totalInterestPaymentWaiver(totalInterestPaymentWaiver) - .totalUnpaidAccruedDueInterest(totalUnpaidAccruedDueInterest) - .totalUnpaidAccruedNotDueInterest(totalUnpaidAccruedNotDueInterest).totalInterestRefund(totalInterestRefund).build(); + .totalUnpaidPayableDueInterest(totalUnpaidPayableDueInterest) + .totalUnpaidPayableNotDueInterest(totalUnpaidPayableNotDueInterest).totalInterestRefund(totalInterestRefund).build(); } private static BigDecimal fetchLoanTransactionBalanceByType(final Collection loanTransactionBalances, @@ -236,44 +223,23 @@ public class LoanSummaryData { return LoanSummaryData.builder().currency(currencyData).build(); } - private static BigDecimal computeTotalAccruedDueInterestAmount(Collection periods) { - final LocalDate businessDate = DateUtils.getBusinessLocalDate(); + private static BigDecimal computeTotalUnpaidPayableDueInterestAmount(Collection periods, + final LocalDate businessDate) { return periods.stream().filter(period -> !period.getDownPaymentPeriod() && businessDate.isAfter(period.getDueDate())) - .map(period -> period.getTotalAccruedInterest()).reduce(BigDecimal.ZERO, BigDecimal::add); + .map(period -> period.getInterestOutstanding()).reduce(BigDecimal.ZERO, BigDecimal::add); } - private static BigDecimal computeTotalInterestPaidDueAmount(Collection periods) { - final LocalDate businessDate = DateUtils.getBusinessLocalDate(); - return periods.stream().filter(period -> !period.getDownPaymentPeriod() && businessDate.isAfter(period.getDueDate())) - .map(period -> period.getInterestPaid()).reduce(BigDecimal.ZERO, BigDecimal::add); - } - - private static BigDecimal computeTotalAccruedNotDueInterestAmountOnActualPeriod(Collection periods) { - final LocalDate businessDate = DateUtils.getBusinessLocalDate(); - return periods.stream() - .filter(period -> !period.getDownPaymentPeriod() && isActualPeriod(period) && businessDate.isBefore(period.getDueDate())) - .map(period -> period.getTotalAccruedInterest()).reduce(BigDecimal.ZERO, BigDecimal::add); - } - - private static BigDecimal computeTotalInterestPaidNotDueAmountOnActualPeriod(Collection periods) { - final LocalDate businessDate = DateUtils.getBusinessLocalDate(); - return periods.stream() - .filter(period -> !period.getDownPaymentPeriod() && isActualPeriod(period) && businessDate.isBefore(period.getDueDate())) - .map(period -> period.getInterestPaid()).reduce(BigDecimal.ZERO, BigDecimal::add); - } - - private static boolean isActualPeriod(LoanSchedulePeriodData period) { - final LocalDate businessDate = DateUtils.getBusinessLocalDate(); - boolean actualPeriod = false; - if (period.getPeriod() != null) { - if (period.getPeriod() == 1) { - actualPeriod = ((businessDate.isEqual(period.getFromDate()) || businessDate.isAfter(period.getFromDate())) - && businessDate.isBefore(period.getDueDate())); - } else { - actualPeriod = (businessDate.isAfter(period.getFromDate()) && businessDate.isBefore(period.getDueDate())); - } + private static BigDecimal computeTotalUnpaidPayableNotDueInterestAmountOnActualPeriod(final Collection periods, + final LocalDate businessDate) { + // Default value equal to Zero + BigDecimal totalAccruedNotDueInterestAmount = BigDecimal.ZERO; + // Find the current Period (If exists one) based in the Business date + final Optional optCurrentPeriod = periods.stream() + .filter(period -> !period.getDownPaymentPeriod() && period.isActualPeriod(businessDate)).findFirst(); + if (optCurrentPeriod.isPresent()) { + totalAccruedNotDueInterestAmount = optCurrentPeriod.get().getInterestDueUntilDate(businessDate); } - - return actualPeriod; + return totalAccruedNotDueInterestAmount; } + } diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/LoanSchedulePeriodData.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/LoanSchedulePeriodData.java index fcf050ee7..730b61a69 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/LoanSchedulePeriodData.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/LoanSchedulePeriodData.java @@ -23,6 +23,7 @@ import java.time.LocalDate; import java.time.temporal.ChronoUnit; import lombok.Getter; import org.apache.fineract.infrastructure.core.service.DateUtils; +import org.apache.fineract.organisation.monetary.domain.MoneyHelper; /** * Immutable data object that represents a period of a loan schedule. @@ -402,6 +403,49 @@ public final class LoanSchedulePeriodData { return value; } + public BigDecimal getRatePerDay() { + return getInterestOriginalDue().divide(BigDecimal.valueOf(getDaysInPeriod()), MoneyHelper.getMathContext()); + } + + public BigDecimal getInterestDueUntilDate(final LocalDate businessDate) { + if (getComplete()) { + return BigDecimal.ZERO; + } else { + if (businessDate.compareTo(getDueDate()) >= 0) { // Period is matured + return getInterestOriginalDue(); + } + if (businessDate.compareTo(getFromDate()) >= 0) { // If It is the current period + return getRatePerDay().multiply(BigDecimal.valueOf(DateUtils.getDifferenceInDays(getPeriodStartDate(), businessDate)), + MoneyHelper.getMathContext()); + } + return BigDecimal.ZERO; + } + } + + public boolean isActualPeriod(final LocalDate businessDate) { + boolean actualPeriod = false; + if (getPeriod() != null) { + if (getPeriod() == 1) { + actualPeriod = ((businessDate.compareTo(getFromDate()) >= 0) && businessDate.compareTo(getDueDate()) <= 0); + } else { + actualPeriod = ((businessDate.compareTo(getFromDate()) > 0) && businessDate.compareTo(getDueDate()) <= 0); + } + } + + return actualPeriod; + } + + private LocalDate getPeriodStartDate() { + if (getPeriod() != null) { + if (getPeriod() == 1) { + return getFromDate(); + } else { + return getFromDate().plusDays(1); + } + } + return null; + } + public BigDecimal getPrincipalDisbursed() { return defaultToZeroIfNull(this.principalDisbursed); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java index 44dbe6621..91ba44c03 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java @@ -640,9 +640,9 @@ final class LoansApiResourceSwagger { @Schema(example = "0.000000") public Double totalRepaymentTransactionReversed; @Schema(example = "0.000000") - public BigDecimal totalUnpaidAccruedDueInterest; + public BigDecimal totalUnpaidPayableDueInterest; @Schema(example = "0.000000") - public BigDecimal totalUnpaidAccruedNotDueInterest; + public BigDecimal totalUnpaidPayableNotDueInterest; @Schema(example = "0.000000") public BigDecimal totalInterestRefund; public Set overdueCharges; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java index f94bca231..e522f0bd9 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java @@ -4720,8 +4720,8 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan // After Disbursement we are expecting no Accrual transactions GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanResponse.getLoanId()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); // Not Due yet @@ -4732,14 +4732,14 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan periodicAccrualAccountingHelper.runPeriodicAccrualAccounting("30 January 2024"); GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(new BigDecimal("0.97"), loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(new BigDecimal("0.97"), loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); // Partial interest repayment addRepaymentForLoan(createdLoanId.get(), 20.50, "30 January 2024"); loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(new BigDecimal("0.05"), loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(new BigDecimal("0.05"), loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); // Not Due and Due Interest @@ -4749,8 +4749,8 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan periodicAccrualAccountingHelper.runPeriodicAccrualAccounting("20 February 2024"); GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); - assertEquals(new BigDecimal("0.12"), loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(new BigDecimal("0.52"), loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(new BigDecimal("0.12"), loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(new BigDecimal("0.52"), loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); } @@ -4767,11 +4767,12 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan runAt(operationDate, () -> { Long clientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId(); PostLoanProductsRequest product = createOnePeriod30DaysLongNoInterestPeriodicAccrualProductWithAdvancedPaymentAllocation() - .interestRatePerPeriod(12.0).interestCalculationPeriodType(RepaymentFrequencyType.DAYS).interestRateFrequencyType(YEARS) - .daysInMonthType(DaysInMonthType.ACTUAL.getValue()).daysInYearType(DaysInYearType.DAYS_365.getValue()) - .numberOfRepayments(4)// - .repaymentEvery(5)// - .repaymentFrequencyType(0L)// + .interestRatePerPeriod(108.0).interestCalculationPeriodType(RepaymentFrequencyType.DAYS) + .interestRateFrequencyType(YEARS).daysInMonthType(DaysInMonthType.ACTUAL.getValue()) + .daysInYearType(DaysInYearType.DAYS_360.getValue()).numberOfRepayments(4)// + .maxInterestRatePerPeriod((double) 110)// + .repaymentEvery(1)// + .repaymentFrequencyType(1L)// .allowPartialPeriodInterestCalcualtion(false)// .multiDisburseLoan(false)// .disallowExpectedDisbursements(null)// @@ -4781,7 +4782,8 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan .installmentAmountInMultiplesOf(null)// ;// PostLoanProductsResponse loanProductResponse = loanProductHelper.createLoanProduct(product); - PostLoansRequest applicationRequest = applyLoanRequest(clientId, loanProductResponse.getResourceId(), operationDate, 1000.0, 4); + PostLoansRequest applicationRequest = applyLoanRequest(clientId, loanProductResponse.getResourceId(), operationDate, 1000.0, 4) + .interestRatePerPeriod(BigDecimal.valueOf(108.0)); applicationRequest = applicationRequest.interestCalculationPeriodType(DAYS) .transactionProcessingStrategyCode(LoanProductTestBuilder.ADVANCED_PAYMENT_ALLOCATION_STRATEGY); @@ -4796,12 +4798,13 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan loanTransactionHelper.disburseLoan(loanResponse.getLoanId(), new PostLoansLoanIdRequest().actualDisbursementDate(operationDate) .dateFormat(DATETIME_PATTERN).transactionAmount(BigDecimal.valueOf(1000.0)).locale("en")); - // After Disbursement we are expecting no Accrual transactions + // After Disbursement we are expecting amount in Zero (first day) GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanResponse.getLoanId()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); + // First day on First Period, then TotalUnpaidPayableDueInterest = 0 and TotalUnpaidPayableNotDueInterest = 3 runAt("2 January 2024", () -> { // Generate the Accruals final PeriodicAccrualAccountingHelper periodicAccrualAccountingHelper = new PeriodicAccrualAccountingHelper(requestSpec, @@ -4809,30 +4812,106 @@ public class AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan periodicAccrualAccountingHelper.runPeriodicAccrualAccounting("2 January 2024"); GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(3.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); + // Second day on First Period, then TotalUnpaidPayableDueInterest = 0 and TotalUnpaidPayableNotDueInterest = 6 runAt("3 January 2024", () -> { - // Add a Charge - addCharge(createdLoanId.get(), false, 10, "6 January 2024"); - - final PeriodicAccrualAccountingHelper periodicAccrualAccountingHelper = new PeriodicAccrualAccountingHelper(requestSpec, - responseSpec); - periodicAccrualAccountingHelper.runPeriodicAccrualAccounting("2 January 2024"); - GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(6.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); - // Add Payment higher than accrued amount + // Third day on First Period, then TotalUnpaidPayableDueInterest = 0 and TotalUnpaidPayableNotDueInterest = 9 runAt("4 January 2024", () -> { - addRepaymentForLoan(createdLoanId.get(), 150.0, "4 January 2024"); + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(9.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // Fourth day on First Period, then TotalUnpaidPayableDueInterest = 0 and TotalUnpaidPayableNotDueInterest = 12 + runAt("5 January 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(12.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // Last day on First Period, then TotalUnpaidPayableDueInterest = 0 and TotalUnpaidPayableNotDueInterest = 90 + runAt("31 January 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(90.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // First day on Second Period, then TotalUnpaidPayableDueInterest = 90 and TotalUnpaidPayableNotDueInterest = 0 + runAt("1 February 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.valueOf(90.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // Second day on Second Period, then TotalUnpaidPayableDueInterest = 90 and TotalUnpaidPayableNotDueInterest = + // 2.344 + runAt("2 February 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.valueOf(90.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(2.344), loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // Third day on Second Period, then TotalUnpaidPayableDueInterest = 90 and TotalUnpaidPayableNotDueInterest = + // 4.688 + runAt("3 February 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.valueOf(90.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(4.688), loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // N day on Second Period, then TotalUnpaidPayableDueInterest = 90 and TotalUnpaidPayableNotDueInterest = 21.096 + runAt("10 February 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.valueOf(90.0).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(21.096).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // First day on Third Period, then TotalUnpaidPayableDueInterest = 90 + 70.32 and + // TotalUnpaidPayableNotDueInterest = 0 + runAt("2 March 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.valueOf(160.32).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // Second day on Third Period, then TotalUnpaidPayableDueInterest = 90 + 70.32 and + // TotalUnpaidPayableNotDueInterest = 0 + runAt("3 March 2024", () -> { + GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); + assertEquals(BigDecimal.valueOf(160.32).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(1.629), loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); + }); + + // Add Payment to pay the First installment, then TotalUnpaidPayableDueInterest = 70.32 and + // TotalUnpaidPayableNotDueInterest = 14.661 + runAt("11 March 2024", () -> { + addRepaymentForLoan(createdLoanId.get(), 340.00, "11 March 2024"); GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(createdLoanId.get()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedDueInterest().stripTrailingZeros()); - assertEquals(BigDecimal.ZERO, loanDetails.getSummary().getTotalUnpaidAccruedNotDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(70.32).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros()); + assertEquals(BigDecimal.valueOf(14.661).stripTrailingZeros(), + loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros()); }); }