From da1683eccff72b5d4745fe7f5eaac42d700e7989 Mon Sep 17 00:00:00 2001 From: Kostya Date: Mon, 12 Oct 2026 11:50:31 +0300 Subject: 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. --- server/src/main/java/market/guess/server/SyncServlet.java | 3 ++- server/src/main/java/market/guess/server/UsersServlet.java | 7 +++---- server/src/test/java/market/guess/server/TestServer.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'server/src') 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; import java.util.Map; import market.guess.model.event.EventSummaryDTO; import market.guess.model.ledger.LedgerDTO; +import market.guess.model.ledger.UserSummaryDTO; /** * 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 { boolean changed, long version, List events, - List users, + List users, LedgerDTO account) {} @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; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import market.guess.model.ledger.UserSummaryDTO; /** * 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; */ @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) { @@ -23,11 +22,11 @@ public final class UsersServlet extends HttpServlet { Json.send(res, HttpServletResponse.SC_OK, rows(ServerEngine.from(getServletContext()))); } - static List rows(ServerEngine engine) { + static List rows(ServerEngine engine) { return engine.users().getAll().stream() .map( u -> - new UserRow( + new UserSummaryDTO( u.getName(), u.getLedger().getBalance().toPlainString(), engine.events().getAll().stream() diff --git a/server/src/test/java/market/guess/server/TestServer.java b/server/src/test/java/market/guess/server/TestServer.java index 1ab87ae..c6e3f71 100644 --- a/server/src/test/java/market/guess/server/TestServer.java +++ b/server/src/test/java/market/guess/server/TestServer.java @@ -15,12 +15,12 @@ import org.apache.catalina.webresources.DirResourceSet; import org.apache.catalina.webresources.StandardRoot; import org.apache.tomcat.util.scan.StandardJarScanner; -final class TestServer implements AutoCloseable { +public final class TestServer implements AutoCloseable { private final Tomcat tomcat; private final StandardContext ctx; - final String api; + public final String api; - TestServer(Path base) throws Exception { + public TestServer(Path base) throws Exception { tomcat = new Tomcat(); tomcat.setBaseDir(base.toString()); tomcat.setPort(0); @@ -47,7 +47,7 @@ final class TestServer implements AutoCloseable { return Path.of(ctx.getWorkPath()); } - static HttpClient client() { + public static HttpClient client() { return HttpClient.newBuilder().cookieHandler(new CookieManager()).build(); } -- cgit v1.2.3