Repayment schedule issue to add Multi Disbursement on same day

2022-03-11 00:57:58 +01:00
parent 2e66d4628a
commit add67b966d
5 changed files with 255 additions and 20 deletions
@@ -132,9 +132,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
            updateAmortization(mc, loanApplicationTerms, scheduleParams.getPeriodNumber(), scheduleParams.getOutstandingBalance());

            if (loanApplicationTerms.isMultiDisburseLoan()) {
-                // fetches the first tranche amount and also updates other
-                // tranche
-                // details to map
+                /* fetches the first tranche amount and also updates other tranche details to map */
                BigDecimal disburseAmt = getDisbursementAmount(loanApplicationTerms, scheduleParams.getPeriodStartDate(), periods,
                        chargesDueAtTimeOfDisbursement, scheduleParams.getDisburseDetailMap(), scheduleParams.applyInterestRecalculation());
                scheduleParams.setPrincipalToBeScheduled(Money.of(currency, disburseAmt));
@@ -1918,7 +1916,17 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
                principal = principal.add(disbursementData.amount());
            } else if (!excludePastUndisbursed || disbursementData.isDisbursed()
                    || !disbursementData.disbursementDate().isBefore(DateUtils.getLocalDateOfTenant())) {
-                disurseDetail.put(disbursementData.disbursementDate(), Money.of(currency, disbursementData.amount()));
+                /*
+                 * JW: sums up amounts by disbursal date in case of side-effect issues. Original assumed that there were
+                 * no duplicate disbursal dates and 'put' each amount into the map keyed by date
+                 */
+                Money prevsum = disurseDetail.get(disbursementData.disbursementDate());
+                BigDecimal sumToNow = BigDecimal.ZERO;
+                if (prevsum != null) {
+                    sumToNow = prevsum.getAmount();
+                }
+                sumToNow = sumToNow.add(disbursementData.amount());
+                disurseDetail.put(disbursementData.disbursementDate(), Money.of(currency, sumToNow));
            }
        }
        return principal;
@@ -1162,22 +1162,20 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
                    BigDecimal principal = BigDecimal.ZERO;
                    for (final DisbursementData data : disbursementData) {
                        if (fromDate.equals(this.disbursement.disbursementDate()) && data.disbursementDate().equals(fromDate)) {
-                            if (periods.size() == 0) {
-                                principal = principal.add(data.amount());
-                                LoanSchedulePeriodData periodData = null;
-                                if (data.getChargeAmount() == null) {
-                                    periodData = LoanSchedulePeriodData.disbursementOnlyPeriod(data.disbursementDate(), data.amount(),
-                                            disbursementChargeAmount, data.isDisbursed());
-                                } else {
-                                    periodData = LoanSchedulePeriodData.disbursementOnlyPeriod(data.disbursementDate(), data.amount(),
-                                            disbursementChargeAmount.add(data.getChargeAmount()).subtract(waivedChargeAmount),
-                                            data.isDisbursed());
-                                }
-                                if (periodData != null) {
-                                    periods.add(periodData);
-                                }
-                                this.outstandingLoanPrincipalBalance = this.outstandingLoanPrincipalBalance.add(data.amount());
+                            principal = principal.add(data.amount());
+                            LoanSchedulePeriodData periodData = null;
+                            if (data.getChargeAmount() == null) {
+                                periodData = LoanSchedulePeriodData.disbursementOnlyPeriod(data.disbursementDate(), data.amount(),
+                                        disbursementChargeAmount, data.isDisbursed());
+                            } else {
+                                periodData = LoanSchedulePeriodData.disbursementOnlyPeriod(data.disbursementDate(), data.amount(),
+                                        disbursementChargeAmount.add(data.getChargeAmount()).subtract(waivedChargeAmount),
+                                        data.isDisbursed());
                            }
+                            if (periodData != null) {
+                                periods.add(periodData);
+                            }
+                            this.outstandingLoanPrincipalBalance = this.outstandingLoanPrincipalBalance.add(data.amount());
                        } else if (data.isDueForDisbursement(fromDate, dueDate)) {
                            if (!excludePastUndisbursed || (excludePastUndisbursed && (data.isDisbursed()
                                    || !data.disbursementDate().isBefore(LocalDate.now(DateUtils.getDateTimeZoneOfTenant()))))) {
@@ -0,0 +1,222 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.integrationtests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Client Loan Integration Test for checking Loan Application Repayments Schedule, loan charges, penalties, loan
+ * repayments and verifying accounting transactions
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ClientLoanIntegrationMultipleDisbursementsTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ClientLoanIntegrationMultipleDisbursementsTest.class);
+
+    public static final String MINIMUM_OPENING_BALANCE = "1000.0";
+    public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
+
+    private ResponseSpecification responseSpec;
+    private RequestSpecification requestSpec;
+    private LoanTransactionHelper loanTransactionHelper;
+
+    @BeforeEach
+    public void setup() {
+        Utils.initializeRESTAssured();
+        this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
+        this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+        this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
+        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
+    }
+
+    private Integer createLoanProduct(final boolean multiDisburseLoan) {
+        LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
+        LoanProductTestBuilder builder = new LoanProductTestBuilder() //
+                .withPrincipal("12,000.00") //
+                .withNumberOfRepayments("4") //
+                .withRepaymentAfterEvery("1") //
+                .withRepaymentTypeAsMonth() //
+                .withinterestRatePerPeriod("1") //
+                .withInterestRateFrequencyTypeAsMonths() //
+                .withAmortizationTypeAsEqualInstallments() //
+                .withInterestTypeAsDecliningBalance() //
+                .withTranches(multiDisburseLoan);
+        if (multiDisburseLoan) {
+            builder = builder.withInterestCalculationPeriodTypeAsRepaymentPeriod(true);
+            builder = builder.withMaxTrancheCount("30");
+        }
+        final String loanProductJSON = builder.build(null);
+        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+    }
+
+    private Integer applyForLoanApplicationWithTranches(final Integer clientID, final Integer loanProductID, final String savingsId,
+            String principal, List<HashMap> tranches, String submitDate) {
+        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
+        final String loanApplicationJSON = new LoanApplicationTestBuilder() //
+                .withPrincipal(principal) //
+                .withLoanTermFrequency("4") //
+                .withLoanTermFrequencyAsMonths() //
+                .withNumberOfRepayments("4") //
+                .withRepaymentEveryAfter("1") //
+                .withRepaymentFrequencyTypeAsMonths() //
+                .withInterestRatePerPeriod("2") //
+                .withAmortizationTypeAsEqualInstallments() //
+                .withInterestTypeAsDecliningBalance() //
+                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
+                .withExpectedDisbursementDate(submitDate) //
+                .withTranches(tranches) //
+                .withSubmittedOnDate(submitDate) //
+                .build(clientID.toString(), loanProductID.toString(), savingsId);
+        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+    }
+
+    private HashMap createTrancheDetail(final String date, final String amount) {
+        HashMap detail = new HashMap();
+        detail.put("expectedDisbursementDate", date);
+        detail.put("principal", amount);
+
+        return detail;
+    }
+
+    /***
+     * Test case to verify repayment schedule shows all disbursals for tranche loans
+     */
+    @Test
+    public void checkThatAllMultiDisbursalsAppearOnLoanScheduleAndOutStandingBalanceIsZeroTest() {
+        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
+
+        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
+        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+
+        /***
+         * Create loan product with allowing multiple disbursals
+         */
+        boolean allowMultipleDisbursals = true;
+        final Integer loanProductID = createLoanProduct(allowMultipleDisbursals);
+        Assertions.assertNotNull(loanProductID);
+
+        /***
+         * Apply for loan application and verify loan status
+         */
+        final String savingsId = null;
+        final String principal = "12,000.00";
+
+        LOG.info("-----------------------------------10 Tranches--------------------------------------");
+        List<HashMap> tranches = new ArrayList<>();
+        tranches.add(createTrancheDetail("01 January 2021", "1"));
+        tranches.add(createTrancheDetail("02 January 2021", "2"));
+        tranches.add(createTrancheDetail("03 January 2021", "4"));
+        tranches.add(createTrancheDetail("04 January 2021", "8"));
+        tranches.add(createTrancheDetail("05 January 2021", "16"));
+        tranches.add(createTrancheDetail("06 January 2021", "32"));
+        tranches.add(createTrancheDetail("07 January 2021", "64"));
+        tranches.add(createTrancheDetail("08 January 2021", "128"));
+        tranches.add(createTrancheDetail("09 January 2021", "256"));
+        tranches.add(createTrancheDetail("10 January 2021", "512"));
+        String submitDate = "01 January 2021";
+
+        final Integer loanID = applyForLoanApplicationWithTranches(clientID, loanProductID, savingsId, principal, tranches, submitDate);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 January 2021", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE 8 LOANS -------------------------------------------");
+        // String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("12 January 2021", loanID, "1");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("12 January 2021", loanID, "2");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("12 January 2021", loanID, "4");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("13 January 2021", loanID, "8");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("14 January 2021", loanID, "16");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("14 January 2021", loanID, "32");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("15 January 2021", loanID, "64");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        loanStatusHashMap = this.loanTransactionHelper.disburseLoan("15 January 2021", loanID, "128");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        final int loanScheduleLineCount = loanSchedule.size();
+        final int expectedLoanScheduleLineCount = 9;
+        final int expectedDisbursals = 8;
+        final BigDecimal val255 = BigDecimal.valueOf(255.0);
+        final BigDecimal expectedTotalPrincipalDisbursed = val255;
+        final BigDecimal expectedPrincipalDue = val255;
+        final BigDecimal expectedPrincipalLoanBalanceOutstanding = BigDecimal.valueOf(0.0);
+
+        assertEquals(expectedLoanScheduleLineCount, loanScheduleLineCount, "Checking nine lines in schedule");
+
+        int disbursalCount = 0;
+        BigDecimal totalPrincipalDisbursed = BigDecimal.ZERO;
+        // First 8 lines should be disbursals
+        for (int i = 0; i < loanScheduleLineCount - 1; i++) {
+            final Integer period = (Integer) loanSchedule.get(i).get("period");
+            final BigDecimal principalDisbursed = BigDecimal
+                    .valueOf(Double.parseDouble(loanSchedule.get(i).get("principalDisbursed").toString()));
+
+            if (period == null) {
+                disbursalCount += 1;
+                totalPrincipalDisbursed = totalPrincipalDisbursed.add(principalDisbursed);
+            }
+            // LOG.info(loanSchedule.get(i).toString());
+        }
+        assertEquals(expectedDisbursals, disbursalCount, "Checking for eight disbursals");
+        assertEquals(expectedTotalPrincipalDisbursed, totalPrincipalDisbursed, "Checking Principal Disburse is 255");
+
+        final BigDecimal principalDue = BigDecimal.valueOf(Double.parseDouble(loanSchedule.get(8).get("principalDue").toString()));
+        assertEquals(expectedPrincipalDue, principalDue, "Checking Principal Due is 255");
+
+        final BigDecimal principalLoanBalanceOutstanding = BigDecimal
+                .valueOf(Double.parseDouble(loanSchedule.get(8).get("principalLoanBalanceOutstanding").toString()));
+        assertEquals(expectedPrincipalLoanBalanceOutstanding, principalLoanBalanceOutstanding,
+                "Checking Principal Loan Balance Outstanding is zero");
+
+    }
+
+}
@@ -93,7 +93,7 @@ public class LoanProductTestBuilder {

    private Boolean multiDisburseLoan = false;
    private final String outstandingLoanBalance = "35000";
-    private final String maxTrancheCount = "3";
+    private String maxTrancheCount = "3";

    private Boolean isInterestRecalculationEnabled = false;
    private String daysInYearType = "1";
@@ -513,4 +513,10 @@ public class LoanProductTestBuilder {
        this.fixedPrincipalPercentagePerInstallment = fixedPrincipalPercentagePerInstallment;
        return this;
    }
+
+    public LoanProductTestBuilder withMaxTrancheCount(String maxTrancheCount) {
+        this.maxTrancheCount = maxTrancheCount;
+        return this;
+    }
+
 }