aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main
diff options
context:
space:
mode:
authorKostya <mail@sartin.in>2026-10-12 11:50:31 +0300
committerKostya <mail@sartin.in>2026-10-12 11:51:00 +0300
commitda1683eccff72b5d4745fe7f5eaac42d700e7989 (patch)
tree7377659eb33f10782bf74a15189c5985ec8ad0ee /server/src/main
parent3a734b84705ccb8174e9cf24b74d7a3c3b2c1beb (diff)
downloadguess-market-da1683eccff72b5d4745fe7f5eaac42d700e7989.tar.gz
guess-market-da1683eccff72b5d4745fe7f5eaac42d700e7989.tar.xz
guess-market-da1683eccff72b5d4745fe7f5eaac42d700e7989.zip
api: share the user directory row with clients
The row GET /api/users and /api/sync send for each user was a record private to UsersServlet, so a client had nothing to deserialize it into. Move it to the api module as UserSummaryDTO. Make TestServer public as well, so client modules can test against a real embedded server.
Diffstat (limited to 'server/src/main')
-rw-r--r--server/src/main/java/market/guess/server/SyncServlet.java3
-rw-r--r--server/src/main/java/market/guess/server/UsersServlet.java7
2 files changed, 5 insertions, 5 deletions
diff --git a/server/src/main/java/market/guess/server/SyncServlet.java b/server/src/main/java/market/guess/server/SyncServlet.java
index 5d41481..f00703a 100644
--- a/server/src/main/java/market/guess/server/SyncServlet.java
+++ b/server/src/main/java/market/guess/server/SyncServlet.java
@@ -9,6 +9,7 @@ import java.util.List;
9import java.util.Map; 9import java.util.Map;
10import market.guess.model.event.EventSummaryDTO; 10import market.guess.model.event.EventSummaryDTO;
11import market.guess.model.ledger.LedgerDTO; 11import market.guess.model.ledger.LedgerDTO;
12import market.guess.model.ledger.UserSummaryDTO;
12 13
13/** 14/**
14 * GET /api/sync?since={version}: what a polling client needs to refresh. If nothing changed since 15 * GET /api/sync?since={version}: what a polling client needs to refresh. If nothing changed since
@@ -22,7 +23,7 @@ public final class SyncServlet extends HttpServlet {
22 boolean changed, 23 boolean changed,
23 long version, 24 long version,
24 List<EventSummaryDTO> events, 25 List<EventSummaryDTO> events,
25 List<UsersServlet.UserRow> users, 26 List<UserSummaryDTO> users,
26 LedgerDTO account) {} 27 LedgerDTO account) {}
27 28
28 @Override 29 @Override
diff --git a/server/src/main/java/market/guess/server/UsersServlet.java b/server/src/main/java/market/guess/server/UsersServlet.java
index d919892..8f8c0f8 100644
--- a/server/src/main/java/market/guess/server/UsersServlet.java
+++ b/server/src/main/java/market/guess/server/UsersServlet.java
@@ -6,6 +6,7 @@ import jakarta.servlet.http.HttpServletRequest;
6import jakarta.servlet.http.HttpServletResponse; 6import jakarta.servlet.http.HttpServletResponse;
7import java.io.IOException; 7import java.io.IOException;
8import java.util.List; 8import java.util.List;
9import market.guess.model.ledger.UserSummaryDTO;
9 10
10/** 11/**
11 * GET /api/users: every account on the server with the facts the spec asks to show about other 12 * GET /api/users: every account on the server with the facts the spec asks to show about other
@@ -13,8 +14,6 @@ import java.util.List;
13 */ 14 */
14@WebServlet("/api/users") 15@WebServlet("/api/users")
15public final class UsersServlet extends HttpServlet { 16public final class UsersServlet extends HttpServlet {
16 record UserRow(String username, String balance, boolean marketMaker, boolean online) {}
17
18 @Override 17 @Override
19 protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { 18 protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException {
20 if (Sessions.requireUser(req, res) == null) { 19 if (Sessions.requireUser(req, res) == null) {
@@ -23,11 +22,11 @@ public final class UsersServlet extends HttpServlet {
23 Json.send(res, HttpServletResponse.SC_OK, rows(ServerEngine.from(getServletContext()))); 22 Json.send(res, HttpServletResponse.SC_OK, rows(ServerEngine.from(getServletContext())));
24 } 23 }
25 24
26 static List<UserRow> rows(ServerEngine engine) { 25 static List<UserSummaryDTO> rows(ServerEngine engine) {
27 return engine.users().getAll().stream() 26 return engine.users().getAll().stream()
28 .map( 27 .map(
29 u -> 28 u ->
30 new UserRow( 29 new UserSummaryDTO(
31 u.getName(), 30 u.getName(),
32 u.getLedger().getBalance().toPlainString(), 31 u.getLedger().getBalance().toPlainString(),
33 engine.events().getAll().stream() 32 engine.events().getAll().stream()