This is an automated email from the ASF dual-hosted git repository. adamsaghy pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit ec49707c26c5403a1c939f5e1eba522cb300087b Merge: f421aa97e0 01a7b875fb Author: Adam Saghy <[email protected]> AuthorDate: Mon Oct 26 23:57:21 2026 +0000 Merge pull request #6500 FINERACT-2851: Savings hold/release transactions incorrectly affect transaction running balance .../interoperation/service/InteropServiceImpl.java | 6 +- ...countWritePlatformServiceJpaRepositoryImpl.java | 11 ---- ...tWritePlatformServiceJpaRepositoryImplTest.java | 3 + .../portfolio/savings/domain/SavingsAccount.java | 4 +- .../SavingsAccountInterestPostingServiceImpl.java | 6 +- .../fineract/integrationtests/BatchApiTest.java | 2 +- .../SavingsAccountRecalculateBalanceTest.java | 65 ++++++++++++++++++++-- .../SavingsInterestPostingJobIntegrationTest.java | 20 +++++++ 8 files changed, 92 insertions(+), 25 deletions(-) diff --cc fineract-provider/src/test/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImplTest.java index b81c32b1a1,92f723cfa8..f2abf39236 --- a/fineract-provider/src/test/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImplTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImplTest.java @@@ -24,8 -24,8 +24,9 @@@ import static org.assertj.core.api.Asse import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyLong; + import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --cc integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java index 02917e0bfa,7cd9bac59b..88c2a4a01a --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java @@@ -110,38 -104,54 +110,58 @@@ public class SavingsInterestPostingJobI @Test public void testSavingsDailyOverdraftInterestPostingJob() { - final Long savingsId = createActiveSavings(START_DATE, overdraftDailyPostingProduct()); + businessDateHelper.runAt(POSTING_JOB_BUSINESS_DATE.toString(), () -> { + final Long savingsId = createActiveSavings(START_DATE, overdraftDailyPostingProduct()); - withdraw(savingsId, DEPOSIT_AMOUNT, START_DATE); - schedulerHelper.executeAndAwaitJob(POST_INTEREST_JOB_NAME); + withdraw(savingsId, DEPOSIT_AMOUNT, START_DATE); + schedulerHelper.executeAndAwaitJob(POST_INTEREST_JOB_NAME); - final List<SavingsAccountTransactionData> transactions = savingsTransactionHelper.getTransactions(savingsId); - final SavingsAccountTransactionData interestPosting = transactions.get(transactions.size() - 2); + final List<SavingsAccountTransactionData> transactions = savingsTransactionHelper.getTransactions(savingsId); + final SavingsAccountTransactionData interestPosting = transactions.get(transactions.size() - 2); - SavingsTestValidators.verifyAmount(new BigDecimal("2.7397"), interestPosting.getAmount(), - "Equality check for overdatft interest posted amount"); - assertEquals(LocalDate.of(2022, Month.APRIL, 11), interestPosting.getDate(), - "Date check for overdraft Interest Posting transaction"); + SavingsTestValidators.verifyAmount(new BigDecimal("2.7397"), interestPosting.getAmount(), + "Equality check for overdatft interest posted amount"); + assertEquals(LocalDate.of(2022, Month.APRIL, 11), interestPosting.getDate(), + "Date check for overdraft Interest Posting transaction"); + }); } + @Test + public void testHoldOnOverdrawnAccountIsNotReversedByInterestPostingJob() { + final Long savingsId = createActiveSavings(START_DATE, overdraftDailyPostingProduct()); + + withdraw(savingsId, "100", START_DATE); + final Long holdTransactionId = savingsTransactionHelper.holdAmount(savingsId, "50", START_DATE, "manual hold").getResourceId(); + assertNotNull(holdTransactionId); + + schedulerHelper.executeAndAwaitJob(POST_INTEREST_JOB_NAME); + + final SavingsAccountTransactionData holdTransaction = savingsTransactionHelper.getTransaction(savingsId, holdTransactionId); + assertEquals(Boolean.FALSE, holdTransaction.getReversed(), "Interest posting must not reverse the hold transaction"); + SavingsTestValidators.verifyAmount(new BigDecimal("-100"), holdTransaction.getRunningBalance(), + "Hold running balance must remain equal to the ledger balance"); + assertEquals(0, + BigDecimal.ZERO + .compareTo(holdTransaction.getOverdraftAmount() == null ? BigDecimal.ZERO : holdTransaction.getOverdraftAmount()), + "Hold transaction must not carry an overdraft amount"); + } + @Test public void testAccountBalanceWithWithdrawalFeeAfterInterestPostingJob() { - final Long savingsId = createActiveDailyPostingSavingsWithWithdrawalFee(); + businessDateHelper.runAt(POSTING_JOB_BUSINESS_DATE.toString(), () -> { + final Long savingsId = createActiveDailyPostingSavingsWithWithdrawalFee(); - deposit(savingsId, "1000", CHARGE_START_DATE); - withdraw(savingsId, "100", CHARGE_START_DATE); - SavingsTestValidators.verifyAmount(new BigDecimal("800.0"), savingsHelper.getSavingsSummary(savingsId).getAccountBalance(), - "Verifying account balance is 800"); + deposit(savingsId, "1000", CHARGE_START_DATE); + withdraw(savingsId, "100", CHARGE_START_DATE); + SavingsTestValidators.verifyAmount(new BigDecimal("800.0"), savingsHelper.getSavingsSummary(savingsId).getAccountBalance(), + "Verifying account balance is 800"); - schedulerHelper.executeAndAwaitJob(POST_INTEREST_JOB_NAME); + schedulerHelper.executeAndAwaitJob(POST_INTEREST_JOB_NAME); - final List<SavingsAccountTransactionData> transactions = savingsTransactionHelper.getTransactions(savingsId); - SavingsTestValidators.verifyAmount(new BigDecimal("800.4384"), transactions.get(transactions.size() - 5).getRunningBalance(), - "Equality check for Balance"); + final List<SavingsAccountTransactionData> transactions = savingsTransactionHelper.getTransactions(savingsId); + SavingsTestValidators.verifyAmount(new BigDecimal("800.4384"), transactions.get(transactions.size() - 5).getRunningBalance(), + "Equality check for Balance"); + }); } @Test
