-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FINERACT-2020:Added currency field to LoanAccountSummaryData, also ad…
…ded integration test and swagger documentation
- Loading branch information
Showing
4 changed files
with
192 additions
and
3 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
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
151 changes: 151 additions & 0 deletions
151
...test/java/org/apache/fineract/integrationtests/LoanAccountsContainsCurrencyFieldTest.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,151 @@ | ||
| /** | ||
| * 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 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.time.LocalDate; | ||
| import java.time.ZoneId; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.util.Set; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.fineract.client.models.GetClientsClientIdAccountsResponse; | ||
| import org.apache.fineract.client.models.GetClientsLoanAccounts; | ||
| import org.apache.fineract.client.models.PostClientsResponse; | ||
| import org.apache.fineract.integrationtests.common.ClientHelper; | ||
| import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper; | ||
| import org.apache.fineract.integrationtests.common.Utils; | ||
| import org.apache.fineract.integrationtests.common.accounting.Account; | ||
| import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder; | ||
| import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder; | ||
| import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Slf4j | ||
| public class LoanAccountsContainsCurrencyFieldTest { | ||
|
|
||
| private ResponseSpecification responseSpec; | ||
| private RequestSpecification requestSpec; | ||
| private LoanTransactionHelper loanTransactionHelper; | ||
| private static final String principalAmount = "1200.00"; | ||
| private static final String NONE = "1"; | ||
| private static final Logger LOG = LoggerFactory.getLogger(LoanAccountsContainsCurrencyFieldTest.class); | ||
|
|
||
| @BeforeEach | ||
| public void setup() { | ||
| Utils.initializeRESTAssured(); | ||
| requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build(); | ||
| requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey()); | ||
| responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build(); | ||
|
|
||
| loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetClientLoanAccountsUsingExternalIdContainsCurrency() { | ||
|
|
||
| // Get today's date | ||
| LocalDate today = LocalDate.now(ZoneId.systemDefault()); | ||
|
|
||
| // Define a custom date formatter | ||
| DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd MMMM yyyy"); | ||
|
|
||
| // Format today's date using the custom formatter | ||
| String formattedDate = today.format(formatter); | ||
|
|
||
| // given | ||
| GlobalConfigurationHelper.manageConfigurations(requestSpec, responseSpec, | ||
| GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true); | ||
| final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON, | ||
| null); | ||
| // when | ||
| final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload); | ||
| final String clientExternalId = clientResponse.getResourceExternalId(); | ||
| final long clientId = clientResponse.getClientId(); | ||
|
|
||
| GlobalConfigurationHelper.manageConfigurations(requestSpec, responseSpec, | ||
| GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, false); | ||
|
|
||
| Integer loanProductId = createLoanProduct(false, NONE); | ||
|
|
||
| // Create Loan Account | ||
| final Integer loanId = createLoanAccount(loanTransactionHelper, String.valueOf(clientId), String.valueOf(loanProductId), | ||
| formattedDate); | ||
|
|
||
| GetClientsClientIdAccountsResponse clientAccountsResponse = ClientHelper.getClientAccounts(requestSpec, responseSpec, | ||
| clientExternalId); | ||
|
|
||
| if (clientAccountsResponse.getLoanAccounts() == null) { | ||
| // Handle the case where getClientAccounts returned null | ||
| throw new IllegalStateException("getClientAccounts returned null"); | ||
| } | ||
|
|
||
| final Set<GetClientsLoanAccounts> loanAccounts = clientAccountsResponse.getLoanAccounts(); | ||
|
|
||
| // Assert if loanAccounts contains a loan account with "currency" field | ||
| boolean containsCurrency = false; | ||
| if (loanAccounts != null) { | ||
| containsCurrency = loanAccounts.stream().anyMatch(account -> account.getCurrency() != null); | ||
| } | ||
|
|
||
| // Perform assertion | ||
| assert containsCurrency; | ||
|
|
||
| } | ||
|
|
||
| private Integer createLoanAccount(final LoanTransactionHelper loanTransactionHelper, final String clientId, final String loanProductId, | ||
| final String operationDate) { | ||
| final String loanApplicationJSON = new LoanApplicationTestBuilder().withPrincipal(principalAmount).withLoanTermFrequency("1") | ||
| .withLoanTermFrequencyAsMonths().withNumberOfRepayments("1").withRepaymentEveryAfter("1") | ||
| .withRepaymentFrequencyTypeAsMonths().withInterestRatePerPeriod("0").withInterestTypeAsFlatBalance() | ||
| .withAmortizationTypeAsEqualPrincipalPayments().withInterestCalculationPeriodTypeSameAsRepaymentPeriod() | ||
| .withExpectedDisbursementDate("03 September 2022").withSubmittedOnDate("01 September 2022").withLoanType("individual") | ||
| .build(clientId, loanProductId, null); | ||
| final Integer loanId = loanTransactionHelper.getLoanId(loanApplicationJSON); | ||
| loanTransactionHelper.approveLoan(operationDate, principalAmount, loanId, null); | ||
| return loanId; | ||
| } | ||
|
|
||
| private Integer createLoanProduct(final boolean multiDisburseLoan, final String accountingRule, final Account... accounts) { | ||
| 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) // | ||
| .withAccounting(accountingRule, accounts); | ||
| if (multiDisburseLoan) { | ||
| builder = builder.withInterestCalculationPeriodTypeAsRepaymentPeriod(true); | ||
| } | ||
| final String loanProductJSON = builder.build(null); | ||
| return loanTransactionHelper.getLoanProductId(loanProductJSON); | ||
| } | ||
|
|
||
| } |