adamsaghy commented on code in PR #4885: URL: https://github.com/apache/fineract/pull/4885#discussion_r2259853551
########## integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccrualAccountingIntegrationTest.java: ########## @@ -0,0 +1,208 @@ +/** + * 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.math.BigDecimal; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import org.apache.fineract.integrationtests.common.ClientHelper; +import org.apache.fineract.integrationtests.common.CommonConstants; +import org.apache.fineract.integrationtests.common.SchedulerJobHelper; +import org.apache.fineract.integrationtests.common.Utils; +import org.apache.fineract.integrationtests.common.accounting.Account; +import org.apache.fineract.integrationtests.common.accounting.AccountHelper; +import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper; +import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper; +import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper; +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; + +public class SavingsAccrualAccountingIntegrationTest { + + private static final Logger LOG = LoggerFactory.getLogger(SavingsAccrualAccountingIntegrationTest.class); + private ResponseSpecification responseSpec; + private RequestSpecification requestSpec; + private SavingsAccountHelper savingsAccountHelper; + private SchedulerJobHelper schedulerJobHelper; + private JournalEntryHelper journalEntryHelper; + private AccountHelper accountHelper; + + @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.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); + this.schedulerJobHelper = new SchedulerJobHelper(this.requestSpec); + this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec); + this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec); + } + + @Test + public void testPositiveAccrualPostsCorrectJournalEntries() { + // --- ARRANGE --- + LOG.info("------------------------- INITIATING POSITIVE ACCRUAL ACCOUNTING TEST -------------------------"); + final int daysToSubtract = 10; + + // 1. Create GL accounts + final Account assetAccount = this.accountHelper.createAssetAccount(); + final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); + final Account incomeAccount = this.accountHelper.createIncomeAccount(); + final Account expenseAccount = this.accountHelper.createExpenseAccount(); + + // 2. Create savings product + final String interestRate = "10.0"; + final Integer savingsProductId = this.savingsAccountHelper.createSavingsProductWithAccrualAccounting(assetAccount, liabilityAccount, + incomeAccount, expenseAccount, interestRate); + Assertions.assertNotNull(savingsProductId, "Failed to create savings product."); + + // 3. Create client and savings account + final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2020"); + final LocalDate startDate = LocalDate.now(Utils.getZoneIdOfTenant()).minusDays(daysToSubtract); + final String startDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate); + final Integer savingsAccountId = this.savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, savingsProductId, + SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startDateString); + this.savingsAccountHelper.approveSavingsOnDate(savingsAccountId, startDateString); + this.savingsAccountHelper.activateSavings(savingsAccountId, startDateString); + this.savingsAccountHelper.depositToSavingsAccount(savingsAccountId, "1000", startDateString, CommonConstants.RESPONSE_RESOURCE_ID); + + // --- ACT --- + schedulerJobHelper.executeAndAwaitJob("Add Accrual Transactions For Savings"); + + // --- ASSERT --- + List<HashMap> accrualTransactions = getAccrualTransactions(savingsAccountId); + Assertions.assertFalse(accrualTransactions.isEmpty(), "No accrual transactions were found."); + + Number firstTransactionIdNumber = (Number) accrualTransactions.get(0).get("id"); + ArrayList<HashMap> journalEntries = journalEntryHelper.getJournalEntriesByTransactionId("S" + firstTransactionIdNumber.intValue()); + Assertions.assertFalse(journalEntries.isEmpty(), "No journal entries found for positive accrual."); + + boolean debitFound = false; + boolean creditFound = false; + for (Map<String, Object> entry : journalEntries) { + String entryType = (String) ((HashMap) entry.get("entryType")).get("value"); + Integer accountId = ((Number) entry.get("glAccountId")).intValue(); + if ("DEBIT".equals(entryType) && accountId.equals(expenseAccount.getAccountID())) { + debitFound = true; + } + if ("CREDIT".equals(entryType) && accountId.equals(liabilityAccount.getAccountID())) { + creditFound = true; + } + } + + Assertions.assertTrue(debitFound, "DEBIT to Expense Account not found for positive accrual."); + Assertions.assertTrue(creditFound, "CREDIT to Liability Account not found for positive accrual."); + } + + @Test + public void testNegativeAccrualPostsCorrectJournalEntries() { Review Comment: This test is not really testing whether the amounts are correct. Would you make sure it is testing whether the relevant transactions were created with the proper amount and accounting entries and portion allocation? -- 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: commits-unsubscr...@fineract.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
