adamsaghy commented on code in PR #4299: URL: https://github.com/apache/fineract/pull/4299#discussion_r1946174484
########## integration-tests/src/test/java/org/apache/fineract/integrationtests/AccrualsOnLoanClosureTest.java: ########## @@ -0,0 +1,176 @@ +/** + * 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.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants.CHARGE_ACCRUAL_DATE; +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.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +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.PostLoansLoanIdChargesRequest; +import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; +import org.apache.fineract.client.models.PutGlobalConfigurationsRequest; +import org.apache.fineract.integrationtests.common.ClientHelper; +import org.apache.fineract.integrationtests.common.Utils; +import org.apache.fineract.integrationtests.common.charges.ChargesHelper; +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; + +@Slf4j +public class AccrualsOnLoanClosureTest extends BaseLoanIntegrationTest { + + private DateTimeFormatter dateFormatter = new DateTimeFormatterBuilder().appendPattern("dd MMMM yyyy").toFormatter(); + + private static final String disbursementDate = "22 April 2024"; + private static final String chargeDate = "24 April 2024"; + private static final String repaymentDate = "25 April 2024"; + private static final Double disbursementAmount = 800.0; + private static final Double repaymentAmount = 820.0; + private static final Double chargeAmount = 20.0; + private static final Integer expectedNumberOfAccruals = 1; + + private ResponseSpecification responseSpec; + private RequestSpecification requestSpec; + private ClientHelper clientHelper; + private LoanTransactionHelper loanTransactionHelper; + private static Long loanId; + private static Integer penalty; + private static String penaltyCharge1AddedDate; + + @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(createOnePeriod30DaysLongNoInterestPeriodicAccrualProduct()); + + loanId = applyAndApproveLoan(client.getClientId(), loanProduct.getResourceId(), disbursementDate, disbursementAmount); + Assertions.assertNotNull(loanId); + disburseLoan(loanId, BigDecimal.valueOf(disbursementAmount), disbursementDate); + + penalty = ChargesHelper.createCharges(requestSpec, responseSpec, + ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "20", true)); + + LocalDate targetDate = LocalDate.of(2024, 4, 24); + penaltyCharge1AddedDate = dateFormatter.format(targetDate); + } + + @Test + public void testAccrualCreatedOnLoanClosure() { + runAt(chargeDate, () -> Review Comment: You might wanna include all the steps that to be executed on the wanted business date. This way some actions are executed on a particular business date and some are executed as with current, calendar date. Example: ``` runAt(repaymentDate, () -> loanTransactionHelper.makeLoanRepayment(loanId, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy") .transactionDate(repaymentDate).locale("en").transactionAmount(repaymentAmount))); ``` This is executed on the provided "repaymentDate", but `GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);` is not.... Example: ``` runAt(repaymentDate, () -> { loanTransactionHelper.makeLoanRepayment(loanId, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy") .transactionDate(repaymentDate).locale("en").transactionAmount(repaymentAmount)); logLoanTransactions(loanId); GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId); logInstallmentsOfLoanDetails(loanDetails); List<GetLoansLoanIdTransactions> accrualTransactions = loanDetails.getTransactions().stream() .filter(transaction -> transaction.getType().getCode().equals("loanTransactionType.accrual")).toList(); assertFalse(accrualTransactions.isEmpty(), "Expected accrual transaction on loan closure"); assertEquals(expectedNumberOfAccruals, accrualTransactions.size(), "Incorrect number of accruals"); }); ``` Above all the steps are executed on the same provided current date -- 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]
