CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-2312: Reverse of Accruals to adjust late deposits

Browse Source
This commit is contained in:
sayhaed
2025-09-10 10:14:15 +02:00
committed by Adam Saghy
parent 6aea428d87
commit 44e71bf171
2 changed files with 94 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccrualWritePlatformServiceImpl.java
+4 -3
View File
@@ -32,7 +32,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService; import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService;
import org.apache.fineract.infrastructure.core.domain.LocalDateInterval; import org.apache.fineract.infrastructure.core.domain.LocalDateInterval;
import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.infrastructure.core.service.MathUtil;
import org.apache.fineract.infrastructure.jobs.exception.JobExecutionException; import org.apache.fineract.infrastructure.jobs.exception.JobExecutionException;
import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
import org.apache.fineract.organisation.monetary.domain.Money; import org.apache.fineract.organisation.monetary.domain.Money;
@@ -165,12 +164,14 @@ public class SavingsAccrualWritePlatformServiceImpl implements SavingsAccrualWri
for (PostingPeriod period : allPostingPeriods) { for (PostingPeriod period : allPostingPeriods) {
LocalDate valueDate = period.getPeriodInterval().endDate(); LocalDate valueDate = period.getPeriodInterval().endDate();
List<LocalDate> matchingAccrualDates = reversedAccrualTransactionDates.stream() List<LocalDate> matchingAccrualDates = accrualTransactionDates.stream().filter(accrualDate -> accrualDate.equals(valueDate))
.toList();
List<LocalDate> matchingAccrualReverseDates = reversedAccrualTransactionDates.stream()
.filter(accrualDate -> accrualDate.equals(valueDate)).toList(); .filter(accrualDate -> accrualDate.equals(valueDate)).toList();
period.calculateInterest(compoundInterestValues); period.calculateInterest(compoundInterestValues);
final LocalDate endDate = period.getPeriodInterval().endDate(); final LocalDate endDate = period.getPeriodInterval().endDate();
if (!accrualTransactionDates.contains(period.getPeriodInterval().endDate()) if (!accrualTransactionDates.contains(period.getPeriodInterval().endDate())
&& (!MathUtil.isZero(period.closingBalance().getAmount()) || !matchingAccrualDates.isEmpty())) { || (!matchingAccrualReverseDates.isEmpty() && matchingAccrualDates.size() == matchingAccrualReverseDates.size())) {
String refNo = (refNoProvider != null) ? refNoProvider.apply(endDate) : null; String refNo = (refNoProvider != null) ? refNoProvider.apply(endDate) : null;
SavingsAccountTransaction savingsAccountTransaction = SavingsAccountTransaction.accrual(savingsAccount, SavingsAccountTransaction savingsAccountTransaction = SavingsAccountTransaction.accrual(savingsAccount,
savingsAccount.office(), period.getPeriodInterval().endDate(), period.getInterestEarned().abs(), false, refNo); savingsAccount.office(), period.getPeriodInterval().endDate(), period.getInterestEarned().abs(), false, refNo);
integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccrualIntegrationTest.java
+90 -54
View File
@@ -150,76 +150,112 @@ public class SavingsAccrualIntegrationTest {
} }
@Test @Test
public void testAccrualsAreReversedImmediatelyAfterBackdatedTransaction() { public void testAccrualsAreReversedAndRecalculatedAfterBackdatedTransaction() {
// --- ARRANGE --- runAt("12 August 2021", () -> {
final Account assetAccount = this.accountHelper.createAssetAccount(); // --- ARRANGE ---
final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); final Account assetAccount = this.accountHelper.createAssetAccount();
final Account incomeAccount = this.accountHelper.createIncomeAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount();
final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account incomeAccount = this.accountHelper.createIncomeAccount();
final String interestRate = "10.0"; final Account expenseAccount = this.accountHelper.createExpenseAccount();
final int daysToTest = 10; final String interestRate = "10.0";
final int daysUntilTransaction = 5; final int daysToTest = 10;
final int daysUntilTransaction = 5;
final SavingsProductHelper productHelper = new SavingsProductHelper().withInterestCompoundingPeriodTypeAsDaily() final SavingsProductHelper productHelper = new SavingsProductHelper().withInterestCompoundingPeriodTypeAsDaily()
.withInterestPostingPeriodTypeAsMonthly().withInterestCalculationPeriodTypeAsDailyBalance() .withInterestPostingPeriodTypeAsMonthly().withInterestCalculationPeriodTypeAsDailyBalance()
.withNominalAnnualInterestRate(new BigDecimal(interestRate)) .withNominalAnnualInterestRate(new BigDecimal(interestRate))
.withAccountingRuleAsAccrualBased(new Account[] { assetAccount, liabilityAccount, incomeAccount, expenseAccount }); .withAccountingRuleAsAccrualBased(new Account[] { assetAccount, liabilityAccount, incomeAccount, expenseAccount });
final Integer savingsProductId = SavingsProductHelper.createSavingsProduct(productHelper.build(), this.requestSpec, final Integer savingsProductId = SavingsProductHelper.createSavingsProduct(productHelper.build(), this.requestSpec,
this.responseSpec); this.responseSpec);
Assertions.assertNotNull(savingsProductId); Assertions.assertNotNull(savingsProductId);
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2020"); final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2020");
Assertions.assertNotNull(clientId); Assertions.assertNotNull(clientId);
final LocalDate startDate = LocalDate.now(Utils.getZoneIdOfTenant()).minusDays(daysToTest); final LocalDate today = LocalDate.of(2021, 8, 12);
final String startDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate); final LocalDate startDate = today.minusDays(daysToTest);
final String startDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate);
final Integer savingsAccountId = this.savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, savingsProductId, final Integer savingsAccountId = this.savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, savingsProductId,
SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startDateString); SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startDateString);
Assertions.assertNotNull(savingsAccountId); Assertions.assertNotNull(savingsAccountId);
this.savingsAccountHelper.approveSavingsOnDate(savingsAccountId, startDateString); this.savingsAccountHelper.approveSavingsOnDate(savingsAccountId, startDateString);
this.savingsAccountHelper.activateSavings(savingsAccountId, startDateString); this.savingsAccountHelper.activateSavings(savingsAccountId, startDateString);
this.savingsAccountHelper.depositToSavingsAccount(savingsAccountId, "10000", startDateString,
CommonConstants.RESPONSE_RESOURCE_ID);
this.savingsAccountHelper.depositToSavingsAccount(savingsAccountId, "10000", startDateString, CommonConstants.RESPONSE_RESOURCE_ID); // --- ACT ---
schedulerJobHelper.executeAndAwaitJob("Add Accrual Transactions For Savings");
schedulerJobHelper.executeAndAwaitJob("Add Accrual Transactions For Savings"); final LocalDate backdatedTransactionDate = startDate.plusDays(daysUntilTransaction);
LOG.info("Initial accruals for {} days have been generated.", daysToTest); final String backdatedTransactionDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US)
.format(backdatedTransactionDate);
this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsAccountId, "1000", backdatedTransactionDateString,
CommonConstants.RESPONSE_RESOURCE_ID);
// --- ACT --- schedulerJobHelper.executeAndAwaitJob("Add Accrual Transactions For Savings");
final LocalDate backdatedTransactionDate = startDate.plusDays(daysUntilTransaction);
final String backdatedTransactionDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US)
.format(backdatedTransactionDate);
LOG.info("Performing a single backdated withdrawal on {}. Expecting immediate reversal of subsequent accruals.", // --- ASSERT ---
backdatedTransactionDateString); List<HashMap> allTransactions = savingsAccountHelper.getSavingsTransactions(savingsAccountId);
this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsAccountId, "1000", backdatedTransactionDateString,
CommonConstants.RESPONSE_RESOURCE_ID);
// --- ASSERT --- Map<LocalDate, Map<String, Integer>> accrualsByDate = new HashMap<>();
List<HashMap> allTransactions = savingsAccountHelper.getSavingsTransactions(savingsAccountId);
boolean verifiedReversedTransaction = false; for (HashMap transaction : allTransactions) {
Map<String, Object> type = (Map<String, Object>) transaction.get("transactionType");
for (HashMap<String, Object> transaction : allTransactions) { if (type != null && Boolean.TRUE.equals(type.get("accrual"))) {
Map<String, Object> type = (Map<String, Object>) transaction.get("transactionType"); List<Number> dateArray = (List<Number>) transaction.get("date");
if (type != null && Boolean.TRUE.equals(type.get("accrual"))) { LocalDate transactionDate = LocalDate.of(dateArray.get(0).intValue(), dateArray.get(1).intValue(),
List<Number> dateArray = (List<Number>) transaction.get("date"); dateArray.get(2).intValue());
LocalDate transactionDate = LocalDate.of(dateArray.get(0).intValue(), dateArray.get(1).intValue(), boolean isReversed = Boolean.TRUE.equals(transaction.get("reversed"));
dateArray.get(2).intValue());
if (!transactionDate.isBefore(backdatedTransactionDate)) { accrualsByDate.putIfAbsent(transactionDate, new HashMap<>(Map.of("TOTAL", 0, "REVERSED", 0)));
Assertions.assertTrue(Boolean.TRUE.equals(transaction.get("reversed")), "Accrual on or after "
+ backdatedTransactionDate + " should be REVERSED. Transaction date: " + transactionDate); Map<String, Integer> counts = accrualsByDate.get(transactionDate);
verifiedReversedTransaction = true; counts.put("TOTAL", counts.get("TOTAL") + 1);
} else { if (isReversed) {
Assertions.assertFalse(Boolean.TRUE.equals(transaction.get("reversed")), counts.put("REVERSED", counts.get("REVERSED") + 1);
"Accrual before " + backdatedTransactionDate + " should NOT be reversed. Transaction date: " + transactionDate); }
} }
} }
}
Assertions.assertTrue(verifiedReversedTransaction, "Test failed because no reversed accrual transactions were found to verify."); for (Map.Entry<LocalDate, Map<String, Integer>> entry : accrualsByDate.entrySet()) {
LocalDate date = entry.getKey();
Map<String, Integer> counts = entry.getValue();
Integer total = counts.get("TOTAL");
Integer reversed = counts.get("REVERSED");
if (date.isBefore(backdatedTransactionDate)) {
Assertions.assertEquals(1, total, "There should be 1 accrual for the date " + date);
Assertions.assertEquals(0, reversed, "The accrual for the date " + date + " should not be reversed.");
} else {
Assertions.assertEquals(2, total, "There should be 2 accruals (original and new) for the date " + date);
Assertions.assertEquals(1, reversed, "There should be 1 reversed accrual for the date " + date);
}
}
Assertions.assertFalse(accrualsByDate.isEmpty(), "No accrual transactions were found to verify.");
BigDecimal expectedDailyInterestOn9k = new BigDecimal("9000").multiply(new BigDecimal("0.10")).divide(new BigDecimal("365"), 4,
RoundingMode.HALF_EVEN);
boolean newAccrualVerified = false;
for (HashMap transaction : allTransactions) {
Map<String, Object> type = (Map<String, Object>) transaction.get("transactionType");
if (type != null && Boolean.TRUE.equals(type.get("accrual")) && !Boolean.TRUE.equals(transaction.get("reversed"))) {
List<Number> dateArray = (List<Number>) transaction.get("date");
LocalDate transactionDate = LocalDate.of(dateArray.get(0).intValue(), dateArray.get(1).intValue(),
dateArray.get(2).intValue());
if (!transactionDate.isBefore(backdatedTransactionDate)) {
BigDecimal actualAmount = new BigDecimal(transaction.get("amount").toString()).setScale(4, RoundingMode.HALF_EVEN);
Assertions.assertEquals(0, expectedDailyInterestOn9k.compareTo(actualAmount), "The new accrual amount ("
+ actualAmount + ") does not match the expected (" + expectedDailyInterestOn9k + ")");
newAccrualVerified = true;
}
}
}
Assertions.assertTrue(newAccrualVerified, "Could not verify the mathematical calculation of a new accrual.");
});
} }
} }