You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2023/01/25 11:26:40 UTC
[fineract] branch develop updated: FINERACT-1678: FineractContext had wrong dates when a cron job got triggered (test)
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new b5b33b1b9 FINERACT-1678: FineractContext had wrong dates when a cron job got triggered (test)
b5b33b1b9 is described below
commit b5b33b1b95e11f42a42213b6fa420e8dcf208f53
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Wed Jan 25 11:16:16 2023 +0100
FINERACT-1678: FineractContext had wrong dates when a cron job got triggered (test)
---
.../integrationtests/SchedulerJobsTestResults.java | 76 +++++++++++++++++++++-
.../common/SchedulerJobHelper.java | 12 +++-
2 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
index 69d2d3ed9..a13f64f2b 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
@@ -38,6 +38,7 @@ import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Calendar;
@@ -46,7 +47,10 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
+import org.apache.fineract.client.models.BusinessDateRequest;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
+import org.apache.fineract.client.models.PostClientsResponse;
+import org.apache.fineract.client.models.PutJobsJobIDRequest;
import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
import org.apache.fineract.integrationtests.common.BusinessDateHelper;
import org.apache.fineract.integrationtests.common.ClientHelper;
@@ -101,8 +105,10 @@ public class SchedulerJobsTestResults {
private LoanTransactionHelper loanTransactionHelper;
private AccountHelper accountHelper;
private JournalEntryHelper journalEntryHelper;
-
+ private ClientHelper clientHelper;
private TimeZone systemTimeZone;
+ private DateTimeFormatter dateFormatter = new DateTimeFormatterBuilder().appendPattern("dd MMMM yyyy").toFormatter();
+ private BusinessDateHelper businessDateHelper;
@BeforeEach
public void setup() {
@@ -114,7 +120,8 @@ public class SchedulerJobsTestResults {
this.accountHelper = new AccountHelper(requestSpec, responseSpec);
this.journalEntryHelper = new JournalEntryHelper(requestSpec, responseSpec);
schedulerJobHelper = new SchedulerJobHelper(requestSpec);
-
+ clientHelper = new ClientHelper(requestSpec, responseSpec);
+ this.businessDateHelper = new BusinessDateHelper();
this.systemTimeZone = TimeZone.getTimeZone(Utils.TENANT_TIME_ZONE);
}
@@ -962,6 +969,71 @@ public class SchedulerJobsTestResults {
validateNumberForEqualExcludePrecision(String.valueOf(balance), String.valueOf(summary.get("accountBalance")));
}
+ @Test
+ public void businessDateIsCorrectForCronJob() throws InterruptedException {
+ this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
+ try {
+ GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
+ businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+ .date("2022.09.04").dateFormat("yyyy.MM.dd").locale("en"));
+
+ final Account assetAccount = this.accountHelper.createAssetAccount();
+ final Account assetFeeAndPenaltyAccount = this.accountHelper.createAssetAccount();
+ final Account incomeAccount = this.accountHelper.createIncomeAccount();
+ final Account expenseAccount = this.accountHelper.createExpenseAccount();
+ final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
+
+ Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
+ ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
+
+ final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
+ .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
+ .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsFlat()
+ .withAccountingRulePeriodicAccrual(new Account[] { assetAccount, incomeAccount, expenseAccount, overpaymentAccount })
+ .withDaysInMonth("30").withDaysInYear("365").withMoratorium("0", "0")
+ .withFeeAndPenaltyAssetAccount(assetFeeAndPenaltyAccount).build(null);
+ final Integer loanProductID = this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+
+ final PostClientsResponse client = clientHelper.createClient(ClientHelper.defaultClientCreationRequest());
+
+ Integer loanId = applyForLoanApplication(client.getClientId().toString(), loanProductID.toString(), null, "02 September 2022");
+
+ this.loanTransactionHelper.approveLoan("02 September 2022", loanId);
+ this.loanTransactionHelper.disburseLoan("03 September 2022", loanId, "1000", null);
+
+ this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0/5 * * * * ?"));
+
+ businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+ .date("2022.09.05").dateFormat("yyyy.MM.dd").locale("en"));
+
+ LocalDate targetDate = LocalDate.of(2022, 9, 5);
+ String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
+
+ this.loanTransactionHelper.addChargesForLoan(loanId, LoanTransactionHelper
+ .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10", null));
+
+ Thread.sleep(6000);
+ GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanId);
+ assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(1).getDate());
+
+ businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+ .date("2022.09.06").dateFormat("yyyy.MM.dd").locale("en"));
+
+ targetDate = LocalDate.of(2022, 9, 6);
+ penaltyCharge1AddedDate = dateFormatter.format(targetDate);
+
+ this.loanTransactionHelper.addChargesForLoan(loanId, LoanTransactionHelper
+ .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10", null));
+
+ Thread.sleep(6000);
+ loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanId);
+ assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(2).getDate());
+ } finally {
+ this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0 2 0 1/1 * ? *"));
+ GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
+ }
+ }
+
private Integer createSavingsProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
final String minOpeningBalance) {
SavingsProductHelper savingsProductHelper = new SavingsProductHelper();
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
index 1488485bf..ba554031f 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
@@ -20,7 +20,6 @@ package org.apache.fineract.integrationtests.common;
import static java.time.Instant.now;
import static org.awaitility.Awaitility.await;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
@@ -40,11 +39,14 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.function.Function;
import java.util.stream.Collectors;
+import org.apache.fineract.client.models.PutJobsJobIDRequest;
import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
+import org.apache.fineract.integrationtests.client.IntegrationTest;
+import org.hamcrest.MatcherAssert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SchedulerJobHelper {
+public class SchedulerJobHelper extends IntegrationTest {
private static final Logger LOG = LoggerFactory.getLogger(SchedulerJobHelper.class);
private final RequestSpecification requestSpec;
@@ -108,6 +110,10 @@ public class SchedulerJobHelper {
return response;
}
+ public void updateSchedulerJob(long jobId, PutJobsJobIDRequest request) {
+ ok(fineract().jobs.updateJobDetail(jobId, request));
+ }
+
private static String updateSchedulerJobAsJSON(final boolean active) {
final Map<String, String> map = new HashMap<>();
map.put("active", Boolean.toString(active));
@@ -191,7 +197,7 @@ public class SchedulerJobHelper {
});
// Verify triggerType
- assertThat(finalLastRunHistory.get("triggerType"), is("application"));
+ MatcherAssert.assertThat(finalLastRunHistory.get("triggerType"), is("application"));
// Verify status & propagate jobRunErrorMessage and/or jobRunErrorLog
// (if any)