diff options
Diffstat (limited to 'server')
3 files changed, 9 insertions, 9 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; | |||
| 9 | import java.util.Map; | 9 | import java.util.Map; |
| 10 | import market.guess.model.event.EventSummaryDTO; | 10 | import market.guess.model.event.EventSummaryDTO; |
| 11 | import market.guess.model.ledger.LedgerDTO; | 11 | import market.guess.model.ledger.LedgerDTO; |
| 12 | import 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; | |||
| 6 | import jakarta.servlet.http.HttpServletResponse; | 6 | import jakarta.servlet.http.HttpServletResponse; |
| 7 | import java.io.IOException; | 7 | import java.io.IOException; |
| 8 | import java.util.List; | 8 | import java.util.List; |
| 9 | import 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") |
| 15 | public final class UsersServlet extends HttpServlet { | 16 | public 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() |
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; | |||
| 15 | import org.apache.catalina.webresources.StandardRoot; | 15 | import org.apache.catalina.webresources.StandardRoot; |
| 16 | import org.apache.tomcat.util.scan.StandardJarScanner; | 16 | import org.apache.tomcat.util.scan.StandardJarScanner; |
| 17 | 17 | ||
| 18 | final class TestServer implements AutoCloseable { | 18 | public final class TestServer implements AutoCloseable { |
| 19 | private final Tomcat tomcat; | 19 | private final Tomcat tomcat; |
| 20 | private final StandardContext ctx; | 20 | private final StandardContext ctx; |
| 21 | final String api; | 21 | public final String api; |
| 22 | 22 | ||
| 23 | TestServer(Path base) throws Exception { | 23 | public TestServer(Path base) throws Exception { |
| 24 | tomcat = new Tomcat(); | 24 | tomcat = new Tomcat(); |
| 25 | tomcat.setBaseDir(base.toString()); | 25 | tomcat.setBaseDir(base.toString()); |
| 26 | tomcat.setPort(0); | 26 | tomcat.setPort(0); |
| @@ -47,7 +47,7 @@ final class TestServer implements AutoCloseable { | |||
| 47 | return Path.of(ctx.getWorkPath()); | 47 | return Path.of(ctx.getWorkPath()); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | static HttpClient client() { | 50 | public static HttpClient client() { |
| 51 | return HttpClient.newBuilder().cookieHandler(new CookieManager()).build(); | 51 | return HttpClient.newBuilder().cookieHandler(new CookieManager()).build(); |
| 52 | } | 52 | } |
| 53 | 53 | ||