From 44a40345435690dbf7fec924a66d2f07979753d6 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:07:12 +0000 Subject: [PATCH] bug: fix exact-balance funds check and inclusive end day in date-range history Co-Authored-By: Grace Juan --- .../bankapp/service/AccountService.java | 4 +- .../bankapp/service/AccountServiceTest.java | 86 +++++++++++++++++++ 2 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/example/bankapp/service/AccountServiceTest.java diff --git a/src/main/java/com/example/bankapp/service/AccountService.java b/src/main/java/com/example/bankapp/service/AccountService.java index ba1a81ea..900a8460 100644 --- a/src/main/java/com/example/bankapp/service/AccountService.java +++ b/src/main/java/com/example/bankapp/service/AccountService.java @@ -68,7 +68,7 @@ public void deposit(Account account, BigDecimal amount) { * Returns true when the account balance is at least {@code amount}. */ public boolean hasSufficientFunds(Account account, BigDecimal amount) { - return account.getBalance().compareTo(amount) > 0; + return account.getBalance().compareTo(amount) >= 0; } public void withdraw(Account account, BigDecimal amount) { @@ -97,7 +97,7 @@ public List getTransactionHistory(Account account) { */ public List getTransactionHistory(Account account, LocalDate from, LocalDate to) { LocalDateTime start = from.atStartOfDay(); - LocalDateTime end = to.atStartOfDay(); + LocalDateTime end = to.plusDays(1).atStartOfDay(); return transactionRepository.findByAccountId(account.getId()).stream() .filter(t -> !t.getTimestamp().isBefore(start) && t.getTimestamp().isBefore(end)) .sorted(Comparator.comparing(Transaction::getTimestamp)) diff --git a/src/test/java/com/example/bankapp/service/AccountServiceTest.java b/src/test/java/com/example/bankapp/service/AccountServiceTest.java new file mode 100644 index 00000000..949dffd0 --- /dev/null +++ b/src/test/java/com/example/bankapp/service/AccountServiceTest.java @@ -0,0 +1,86 @@ +package com.example.bankapp.service; + +import com.example.bankapp.model.Account; +import com.example.bankapp.model.Transaction; +import com.example.bankapp.repository.AccountRepository; +import com.example.bankapp.repository.TransactionRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class AccountServiceTest { + + @Mock + private AccountRepository accountRepository; + + @Mock + private TransactionRepository transactionRepository; + + @InjectMocks + private AccountService accountService; + + private Account accountWithBalance(String balance) { + Account account = new Account(); + account.setId(1L); + account.setUsername("alice"); + account.setBalance(new BigDecimal(balance)); + return account; + } + + @Test + void hasSufficientFundsIsTrueWhenBalanceEqualsAmount() { + Account account = accountWithBalance("100.00"); + + assertTrue(accountService.hasSufficientFunds(account, new BigDecimal("100.00"))); + assertFalse(accountService.hasSufficientFunds(account, new BigDecimal("100.01"))); + } + + @Test + void withdrawingTheFullBalanceSucceeds() { + Account account = accountWithBalance("100.00"); + + accountService.withdraw(account, new BigDecimal("100.00")); + + assertEquals(0, account.getBalance().compareTo(BigDecimal.ZERO)); + } + + @Test + void dateRangeHistoryIncludesTransactionsOnTheEndDay() { + Account account = accountWithBalance("0"); + Transaction beforeRange = new Transaction(BigDecimal.ONE, "Deposit", LocalDateTime.of(2026, 11, 9, 23, 59), account); + Transaction onStartDay = new Transaction(BigDecimal.ONE, "Deposit", LocalDateTime.of(2026, 11, 10, 0, 0), account); + Transaction onEndDay = new Transaction(BigDecimal.ONE, "Deposit", LocalDateTime.of(2026, 11, 12, 15, 30), account); + Transaction afterRange = new Transaction(BigDecimal.ONE, "Deposit", LocalDateTime.of(2026, 11, 13, 0, 0), account); + when(transactionRepository.findByAccountId(1L)) + .thenReturn(List.of(afterRange, onEndDay, beforeRange, onStartDay)); + + List result = accountService.getTransactionHistory( + account, LocalDate.of(2026, 11, 10), LocalDate.of(2026, 11, 12)); + + assertEquals(List.of(onStartDay, onEndDay), result); + } + + @Test + void singleDayRangeReturnsThatDaysTransactions() { + Account account = accountWithBalance("0"); + Transaction midday = new Transaction(BigDecimal.ONE, "Deposit", LocalDateTime.of(2026, 11, 10, 12, 0), account); + when(transactionRepository.findByAccountId(1L)).thenReturn(List.of(midday)); + + LocalDate day = LocalDate.of(2026, 11, 10); + + assertEquals(List.of(midday), accountService.getTransactionHistory(account, day, day)); + } +}