From cf13d4608acfb2d81ec0056717e561bb40f991a2 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 11 Oct 2026 12:20:47 +0300 Subject: server: add account, deposit and user directory endpoints Give each logged-in user their own account view and a view of everyone else, as the spec asks: - GET /api/user/account returns the caller's balance, blocked flag and every ledger row (trades, fees, payouts, deposits). - POST /api/user/deposit (form field "amount") tops the account up through AccountContext.deposit, so its validation and DEPOSIT ledger entry are the same as in the engine. Bad amounts get 400. - GET /api/users lists every account with its name, balance and whether it makes any market, the three facts the spec requires about other users, plus whether it is logged in right now, which the login registry already knows. Accounts outlive their sessions, so the list includes users who are currently logged out. A test drives two clients through a whole market: one deposits, uploads and opens an event, the other deposits and buys, the first resolves it, and the winner's balance rises by exactly one per winning share. --- .../java/market/guess/server/AccountServlet.java | 25 +++++++++++++++ .../java/market/guess/server/DepositServlet.java | 25 +++++++++++++++ .../main/java/market/guess/server/Sessions.java | 4 +++ .../java/market/guess/server/UsersServlet.java | 36 ++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 server/src/main/java/market/guess/server/AccountServlet.java create mode 100644 server/src/main/java/market/guess/server/DepositServlet.java create mode 100644 server/src/main/java/market/guess/server/UsersServlet.java (limited to 'server/src/main/java') diff --git a/server/src/main/java/market/guess/server/AccountServlet.java b/server/src/main/java/market/guess/server/AccountServlet.java new file mode 100644 index 0000000..503e914 --- /dev/null +++ b/server/src/main/java/market/guess/server/AccountServlet.java @@ -0,0 +1,25 @@ +package market.guess.server; + +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** GET /api/user/account: the logged-in user's balance, blocked flag and every ledger row. */ +@WebServlet("/api/user/account") +public final class AccountServlet extends HttpServlet { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { + var user = Sessions.requireUser(req, res); + if (user == null) { + return; + } + var result = ServerEngine.from(getServletContext()).accounts().getAccount(user); + if (!result.isSuccess()) { + Json.error(res, HttpServletResponse.SC_NOT_FOUND, "ACCOUNT_NOT_FOUND", result.getMessage()); + return; + } + Json.send(res, HttpServletResponse.SC_OK, result.getData()); + } +} diff --git a/server/src/main/java/market/guess/server/DepositServlet.java b/server/src/main/java/market/guess/server/DepositServlet.java new file mode 100644 index 0000000..e2a94eb --- /dev/null +++ b/server/src/main/java/market/guess/server/DepositServlet.java @@ -0,0 +1,25 @@ +package market.guess.server; + +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet("/api/user/deposit") +public final class DepositServlet extends HttpServlet { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { + var user = Sessions.requireUser(req, res); + if (user == null) { + return; + } + var result = + ServerEngine.from(getServletContext()).accounts().deposit(user, req.getParameter("amount")); + if (!result.isSuccess()) { + Json.error(res, HttpServletResponse.SC_BAD_REQUEST, result); + return; + } + Json.send(res, HttpServletResponse.SC_OK, result.getData()); + } +} diff --git a/server/src/main/java/market/guess/server/Sessions.java b/server/src/main/java/market/guess/server/Sessions.java index 7a99dfa..c6d6ee5 100644 --- a/server/src/main/java/market/guess/server/Sessions.java +++ b/server/src/main/java/market/guess/server/Sessions.java @@ -55,6 +55,10 @@ public final class Sessions { } } + public boolean isOnline(String name) { + return active.containsKey(name.toLowerCase()); + } + public static String requireUser(HttpServletRequest req, HttpServletResponse res) throws IOException { var user = currentUser(req); diff --git a/server/src/main/java/market/guess/server/UsersServlet.java b/server/src/main/java/market/guess/server/UsersServlet.java new file mode 100644 index 0000000..511ede2 --- /dev/null +++ b/server/src/main/java/market/guess/server/UsersServlet.java @@ -0,0 +1,36 @@ +package market.guess.server; + +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * GET /api/users: every account on the server with the facts the spec asks to show about other + * users (name, balance, whether they are a Market Maker), plus whether they are logged in now. + */ +@WebServlet("/api/users") +public final class UsersServlet extends HttpServlet { + record UserRow(String username, String balance, boolean marketMaker, boolean online) {} + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { + if (Sessions.requireUser(req, res) == null) { + return; + } + var engine = ServerEngine.from(getServletContext()); + var rows = + engine.users().getAll().stream() + .map( + u -> + new UserRow( + u.getName(), + u.getLedger().getBalance().toPlainString(), + engine.events().getAll().stream() + .anyMatch(e -> u.getName().equalsIgnoreCase(e.getMarketMaker())), + engine.sessions().isOnline(u.getName()))) + .toList(); + Json.send(res, HttpServletResponse.SC_OK, rows); + } +} -- cgit v1.2.3