From 246c1ab5ffce1a1bb3c0534868b29f6e4c862a62 Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 9 Oct 2026 10:18:41 +0300 Subject: account: let users deposit cash into their account Exercise 3 replaces the fixed initial cash of Exercise 2 with accounts that users top up themselves. Add AccountContext.deposit, which credits a DEPOSIT entry through LedgerContext so it carries a timestamp and a running balance like every other ledger movement, and return the updated account. The amount crosses the api boundary as a string, like all money values. Reject anything that is not a positive number with at most two decimal places instead of rounding it, so a user is never credited a different amount than they asked for. A deposit can bring a negative account back above zero, which lifts the block. --- .../guess/service/ledger/LocalAccountContext.java | 32 +++++++++++- .../java/market/guess/service/DepositTest.java | 60 ++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 service/src/test/java/market/guess/service/DepositTest.java (limited to 'service') diff --git a/service/src/main/java/market/guess/service/ledger/LocalAccountContext.java b/service/src/main/java/market/guess/service/ledger/LocalAccountContext.java index 84d23b4..489ed33 100644 --- a/service/src/main/java/market/guess/service/ledger/LocalAccountContext.java +++ b/service/src/main/java/market/guess/service/ledger/LocalAccountContext.java @@ -1,20 +1,25 @@ package market.guess.service.ledger; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import market.guess.api.AccountContext; import market.guess.api.Result; import market.guess.model.ledger.LedgerDTO; import market.guess.model.ledger.LedgerEntryDTO; +import market.guess.model.ledger.LedgerType; import market.guess.service.catalog.infrastructure.repository.UserRepository; import market.guess.service.domain.User; +import market.guess.service.helpers.BigDecimalOptions; import market.guess.service.helpers.InstantOptions; public final class LocalAccountContext implements AccountContext { private final UserRepository users; + private final LedgerContext ledger; - public LocalAccountContext(UserRepository users) { + public LocalAccountContext(UserRepository users, LedgerContext ledger) { this.users = users; + this.ledger = ledger; } @Override @@ -32,6 +37,31 @@ public final class LocalAccountContext implements AccountContext { return Result.ok(toDTO(opt.get())); } + @Override + public Result deposit(String owner, String amount) { + var user = users.get(owner); + if (user.isEmpty()) { + return Result.error("ACCOUNT_NOT_FOUND", "Account not found: " + owner); + } + + BigDecimal value; + try { + value = new BigDecimal(amount.trim()); + } catch (NullPointerException | NumberFormatException e) { + return Result.error("INVALID_AMOUNT", "Deposit amount must be a number, got: " + amount); + } + if (value.signum() <= 0) { + return Result.error("INVALID_AMOUNT", "Deposit amount must be greater than 0."); + } + if (value.stripTrailingZeros().scale() > 2) { + return Result.error("INVALID_AMOUNT", "Deposit amount can have at most 2 decimal places."); + } + + ledger.credit( + user.get().getLedger(), LedgerType.DEPOSIT, BigDecimalOptions.toMoney(value), "Deposit"); + return Result.ok(toDTO(user.get())); + } + private LedgerDTO toDTO(User user) { var ledger = user.getLedger(); var entries = new ArrayList(); diff --git a/service/src/test/java/market/guess/service/DepositTest.java b/service/src/test/java/market/guess/service/DepositTest.java new file mode 100644 index 0000000..048e07d --- /dev/null +++ b/service/src/test/java/market/guess/service/DepositTest.java @@ -0,0 +1,60 @@ +package market.guess.service; + +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 java.time.Clock; +import market.guess.model.ledger.LedgerType; +import market.guess.service.catalog.infrastructure.repository.InMemoryUserRepository; +import market.guess.service.domain.User; +import market.guess.service.ledger.LedgerContext; +import market.guess.service.ledger.LocalAccountContext; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class DepositTest { + private InMemoryUserRepository userRepo; + private LocalAccountContext accounts; + + @BeforeEach + void setUp() { + userRepo = new InMemoryUserRepository(); + userRepo.add(new User("alice", 100)); + accounts = new LocalAccountContext(userRepo, new LedgerContext(userRepo, Clock.systemUTC())); + } + + @Test + void depositCreditsBalanceAndRecordsEntry() { + var res = accounts.deposit("Alice", "250.5"); + assertTrue(res.isSuccess(), res.getDetails()); + assertEquals("350.50", res.getData().balance()); + + var entry = res.getData().entries().getLast(); + assertEquals(LedgerType.DEPOSIT, entry.type()); + assertEquals("250.50", entry.amount()); + assertEquals("350.50", entry.balanceAfter()); + } + + @Test + void depositUnblocksNegativeAccount() { + var ledger = new LedgerContext(userRepo, Clock.systemUTC()); + ledger.debit("alice", LedgerType.COMMISSION, new java.math.BigDecimal("150"), "fee"); + assertTrue(userRepo.get("alice").orElseThrow().isBlocked()); + + accounts.deposit("alice", "60"); + assertFalse(userRepo.get("alice").orElseThrow().isBlocked()); + } + + @Test + void rejectsInvalidDeposits() { + for (var bad : new String[] {"0", "-5", "abc", "", "1.005", null}) { + var res = accounts.deposit("alice", bad); + assertFalse(res.isSuccess(), "should reject: " + bad); + assertEquals("INVALID_AMOUNT", res.getMessage()); + } + assertEquals("ACCOUNT_NOT_FOUND", accounts.deposit("nobody", "10").getMessage()); + assertEquals("100.00", accounts.getAccount("alice").getData().balance()); + assertTrue(accounts.getAccount("alice").getData().entries().isEmpty()); + } +} -- cgit v1.2.3