forked from apache/fineract
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FINERACT-1981: Consolidated accrual activity created instead of indiv…
…idual ones
- Loading branch information
Showing
3 changed files
with
161 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
...n-tests/src/test/java/org/apache/fineract/integrationtests/MultiActivityAccrualsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /** | ||
| * 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 static org.junit.jupiter.api.Assertions.assertFalse; | ||
|
|
||
| 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.List; | ||
| import org.apache.fineract.client.models.GetLoansLoanIdResponse; | ||
| import org.apache.fineract.client.models.GetLoansLoanIdTransactions; | ||
| import org.apache.fineract.client.models.PostClientsResponse; | ||
| import org.apache.fineract.client.models.PostLoanProductsResponse; | ||
| import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; | ||
| import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse; | ||
| import org.apache.fineract.integrationtests.common.ClientHelper; | ||
| import org.apache.fineract.integrationtests.common.Utils; | ||
| 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; | ||
|
|
||
| public class MultiActivityAccrualsTest extends BaseLoanIntegrationTest { | ||
|
|
||
| private static final String disbursementDate = "9 August 2024"; | ||
| private static final String repaymentDate = "9 December 2024"; | ||
| private static final Double fullRepaymentAmount = 700.0; | ||
| private static final Integer expectedNumberOfAccruals = 1; | ||
| private static final Integer expectedNumberOfActivityAccruals = 4; | ||
|
|
||
| private ResponseSpecification responseSpec; | ||
| private RequestSpecification requestSpec; | ||
| private ClientHelper clientHelper; | ||
| private LoanTransactionHelper loanTransactionHelper; | ||
| private static Long loanId; | ||
|
|
||
| @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); | ||
| this.clientHelper = new ClientHelper(this.requestSpec, this.responseSpec); | ||
|
|
||
| PostClientsResponse client = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()); | ||
| PostLoanProductsResponse loanProduct = loanProductHelper | ||
| .createLoanProduct(create4IProgressive().currencyCode("USD").enableAccrualActivityPosting(true)); | ||
|
|
||
| loanId = applyAndApproveProgressiveLoan(client.getClientId(), loanProduct.getResourceId(), disbursementDate, 600.0, 9.99, 4, null); | ||
| Assertions.assertNotNull(loanId); | ||
| disburseLoan(loanId, BigDecimal.valueOf(600), disbursementDate); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultiAccrualActivityCreated() { | ||
| runAt(repaymentDate, () -> { | ||
|
|
||
| final PostLoansLoanIdTransactionsResponse repaymentTransaction = loanTransactionHelper.makeLoanRepayment(loanId, | ||
| new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").transactionDate(repaymentDate).locale("en") | ||
| .transactionAmount(fullRepaymentAmount)); | ||
|
|
||
| GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId); | ||
|
|
||
| List<GetLoansLoanIdTransactions> accrualTransactional = loanDetails.getTransactions().stream() | ||
| .filter(transaction -> transaction.getType().getCode().equals("loanTransactionType.accrual")).toList(); | ||
|
|
||
| List<GetLoansLoanIdTransactions> accrualActivityTransactional = loanDetails.getTransactions().stream() | ||
| .filter(transaction -> transaction.getType().getCode().equals("loanTransactionType.accrualActivity")).toList(); | ||
|
|
||
| assertFalse(accrualTransactional.isEmpty()); | ||
| assertEquals(expectedNumberOfAccruals, accrualTransactional.size()); | ||
| assertFalse(accrualActivityTransactional.isEmpty()); | ||
| assertEquals(expectedNumberOfActivityAccruals, accrualActivityTransactional.size()); | ||
|
|
||
| verifyTransactions(loanId, // | ||
| transaction(600.0, "Disbursement", "09 August 2024", 600.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), | ||
| transaction(20.00, "Accrual", "09 December 2024", 0, 0, 20.00, 0, 0, 0.0, 0.0), | ||
| transaction(5.0, "Accrual Activity", "09 September 2024", 0, 0, 5.0, 0, 0, 0.0, 0.0), | ||
| transaction(5.0, "Accrual Activity", "09 October 2024", 0, 0, 5.0, 0, 0, 0.0, 0.0), | ||
| transaction(5.0, "Accrual Activity", "09 November 2024", 0, 0, 5.0, 0, 0, 0.0, 0.0), | ||
| transaction(5.0, "Accrual Activity", "09 December 2024", 0, 0, 5.0, 0, 0, 0.0, 0.0), | ||
| transaction(700.00, "Repayment", "09 December 2024", 0, 600.00, 20.0, 0, 0, 0.0, 80.0)); | ||
| }); | ||
| } | ||
| } |