diff options
Diffstat (limited to 'server')
5 files changed, 202 insertions, 0 deletions
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 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.annotation.WebServlet; | ||
| 4 | import jakarta.servlet.http.HttpServlet; | ||
| 5 | import jakarta.servlet.http.HttpServletRequest; | ||
| 6 | import jakarta.servlet.http.HttpServletResponse; | ||
| 7 | import java.io.IOException; | ||
| 8 | |||
| 9 | /** GET /api/user/account: the logged-in user's balance, blocked flag and every ledger row. */ | ||
| 10 | @WebServlet("/api/user/account") | ||
| 11 | public final class AccountServlet extends HttpServlet { | ||
| 12 | @Override | ||
| 13 | protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { | ||
| 14 | var user = Sessions.requireUser(req, res); | ||
| 15 | if (user == null) { | ||
| 16 | return; | ||
| 17 | } | ||
| 18 | var result = ServerEngine.from(getServletContext()).accounts().getAccount(user); | ||
| 19 | if (!result.isSuccess()) { | ||
| 20 | Json.error(res, HttpServletResponse.SC_NOT_FOUND, "ACCOUNT_NOT_FOUND", result.getMessage()); | ||
| 21 | return; | ||
| 22 | } | ||
| 23 | Json.send(res, HttpServletResponse.SC_OK, result.getData()); | ||
| 24 | } | ||
| 25 | } | ||
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 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.annotation.WebServlet; | ||
| 4 | import jakarta.servlet.http.HttpServlet; | ||
| 5 | import jakarta.servlet.http.HttpServletRequest; | ||
| 6 | import jakarta.servlet.http.HttpServletResponse; | ||
| 7 | import java.io.IOException; | ||
| 8 | |||
| 9 | @WebServlet("/api/user/deposit") | ||
| 10 | public final class DepositServlet extends HttpServlet { | ||
| 11 | @Override | ||
| 12 | protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { | ||
| 13 | var user = Sessions.requireUser(req, res); | ||
| 14 | if (user == null) { | ||
| 15 | return; | ||
| 16 | } | ||
| 17 | var result = | ||
| 18 | ServerEngine.from(getServletContext()).accounts().deposit(user, req.getParameter("amount")); | ||
| 19 | if (!result.isSuccess()) { | ||
| 20 | Json.error(res, HttpServletResponse.SC_BAD_REQUEST, result); | ||
| 21 | return; | ||
| 22 | } | ||
| 23 | Json.send(res, HttpServletResponse.SC_OK, result.getData()); | ||
| 24 | } | ||
| 25 | } | ||
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 { | |||
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | public boolean isOnline(String name) { | ||
| 59 | return active.containsKey(name.toLowerCase()); | ||
| 60 | } | ||
| 61 | |||
| 58 | public static String requireUser(HttpServletRequest req, HttpServletResponse res) | 62 | public static String requireUser(HttpServletRequest req, HttpServletResponse res) |
| 59 | throws IOException { | 63 | throws IOException { |
| 60 | var user = currentUser(req); | 64 | 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 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.annotation.WebServlet; | ||
| 4 | import jakarta.servlet.http.HttpServlet; | ||
| 5 | import jakarta.servlet.http.HttpServletRequest; | ||
| 6 | import jakarta.servlet.http.HttpServletResponse; | ||
| 7 | import java.io.IOException; | ||
| 8 | |||
| 9 | /** | ||
| 10 | * GET /api/users: every account on the server with the facts the spec asks to show about other | ||
| 11 | * users (name, balance, whether they are a Market Maker), plus whether they are logged in now. | ||
| 12 | */ | ||
| 13 | @WebServlet("/api/users") | ||
| 14 | public final class UsersServlet extends HttpServlet { | ||
| 15 | record UserRow(String username, String balance, boolean marketMaker, boolean online) {} | ||
| 16 | |||
| 17 | @Override | ||
| 18 | protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { | ||
| 19 | if (Sessions.requireUser(req, res) == null) { | ||
| 20 | return; | ||
| 21 | } | ||
| 22 | var engine = ServerEngine.from(getServletContext()); | ||
| 23 | var rows = | ||
| 24 | engine.users().getAll().stream() | ||
| 25 | .map( | ||
| 26 | u -> | ||
| 27 | new UserRow( | ||
| 28 | u.getName(), | ||
| 29 | u.getLedger().getBalance().toPlainString(), | ||
| 30 | engine.events().getAll().stream() | ||
| 31 | .anyMatch(e -> u.getName().equalsIgnoreCase(e.getMarketMaker())), | ||
| 32 | engine.sessions().isOnline(u.getName()))) | ||
| 33 | .toList(); | ||
| 34 | Json.send(res, HttpServletResponse.SC_OK, rows); | ||
| 35 | } | ||
| 36 | } | ||
diff --git a/server/src/test/java/market/guess/server/AccountTest.java b/server/src/test/java/market/guess/server/AccountTest.java new file mode 100644 index 0000000..0e094b8 --- /dev/null +++ b/server/src/test/java/market/guess/server/AccountTest.java | |||
| @@ -0,0 +1,112 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import static market.guess.server.EventsTest.loggedIn; | ||
| 4 | import static market.guess.server.EventsTest.path; | ||
| 5 | import static market.guess.server.EventsTest.upload; | ||
| 6 | import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| 7 | import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| 8 | import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| 9 | |||
| 10 | import com.google.gson.JsonObject; | ||
| 11 | import com.google.gson.JsonParser; | ||
| 12 | import java.math.BigDecimal; | ||
| 13 | import java.net.http.HttpClient; | ||
| 14 | import java.nio.file.Path; | ||
| 15 | import org.junit.jupiter.api.AfterAll; | ||
| 16 | import org.junit.jupiter.api.BeforeAll; | ||
| 17 | import org.junit.jupiter.api.Test; | ||
| 18 | import org.junit.jupiter.api.io.TempDir; | ||
| 19 | |||
| 20 | class AccountTest { | ||
| 21 | @TempDir static Path base; | ||
| 22 | static TestServer server; | ||
| 23 | |||
| 24 | @BeforeAll | ||
| 25 | static void start() throws Exception { | ||
| 26 | server = new TestServer(base); | ||
| 27 | } | ||
| 28 | |||
| 29 | @AfterAll | ||
| 30 | static void stop() throws Exception { | ||
| 31 | server.close(); | ||
| 32 | } | ||
| 33 | |||
| 34 | private static JsonObject account(HttpClient client) throws Exception { | ||
| 35 | var res = server.get(client, "/user/account"); | ||
| 36 | assertEquals(200, res.statusCode(), res.body()); | ||
| 37 | return JsonParser.parseString(res.body()).getAsJsonObject(); | ||
| 38 | } | ||
| 39 | |||
| 40 | private static BigDecimal balance(HttpClient client) throws Exception { | ||
| 41 | return new BigDecimal(account(client).get("balance").getAsString()); | ||
| 42 | } | ||
| 43 | |||
| 44 | private static JsonObject userRow(HttpClient client, String name) throws Exception { | ||
| 45 | for (var row : JsonParser.parseString(server.get(client, "/users").body()).getAsJsonArray()) { | ||
| 46 | if (row.getAsJsonObject().get("username").getAsString().equals(name)) { | ||
| 47 | return row.getAsJsonObject(); | ||
| 48 | } | ||
| 49 | } | ||
| 50 | throw new AssertionError(name + " not listed"); | ||
| 51 | } | ||
| 52 | |||
| 53 | @Test | ||
| 54 | void twoUsersTradeAnEventEndToEnd() throws Exception { | ||
| 55 | var maya = loggedIn(server, "Maya"); | ||
| 56 | var tom = loggedIn(server, "Tom"); | ||
| 57 | var event = "Mujtaba is Dead"; | ||
| 58 | var yes = event + ":0"; | ||
| 59 | |||
| 60 | var deposit = server.post(maya, "/user/deposit", "amount", "1000"); | ||
| 61 | assertEquals(200, deposit.statusCode(), deposit.body()); | ||
| 62 | assertEquals(new BigDecimal("1000.00"), balance(maya)); | ||
| 63 | assertTrue(account(maya).toString().contains("DEPOSIT")); | ||
| 64 | |||
| 65 | assertEquals(200, upload(server, maya, "small.xml").statusCode()); | ||
| 66 | assertTrue(userRow(tom, "Maya").get("marketMaker").getAsBoolean()); | ||
| 67 | assertFalse(userRow(tom, "Tom").get("marketMaker").getAsBoolean()); | ||
| 68 | |||
| 69 | assertEquals(200, server.post(maya, path(event) + "/open").statusCode()); | ||
| 70 | var afterSubsidy = balance(maya); | ||
| 71 | assertTrue(afterSubsidy.compareTo(new BigDecimal("1000")) < 0, "LMSR subsidy was not paid"); | ||
| 72 | |||
| 73 | server.post(tom, "/user/deposit", "amount", "100"); | ||
| 74 | var order = | ||
| 75 | server.post( | ||
| 76 | tom, "/orders", "event", event, "option", yes, "side", "BUY", "price", "1", "quantity", "10"); | ||
| 77 | assertEquals(200, order.statusCode(), order.body()); | ||
| 78 | var afterBuy = balance(tom); | ||
| 79 | assertTrue(afterBuy.compareTo(new BigDecimal("100")) < 0); | ||
| 80 | assertEquals(afterSubsidy, balance(maya)); | ||
| 81 | |||
| 82 | assertEquals(afterBuy.toPlainString(), userRow(maya, "Tom").get("balance").getAsString()); | ||
| 83 | |||
| 84 | var resolve = server.post(maya, path(event) + "/resolve", "option", yes); | ||
| 85 | assertEquals(200, resolve.statusCode(), resolve.body()); | ||
| 86 | assertEquals(afterBuy.add(new BigDecimal("10")), balance(tom)); | ||
| 87 | } | ||
| 88 | |||
| 89 | @Test | ||
| 90 | void depositValidationAndLogin() throws Exception { | ||
| 91 | var ana = loggedIn(server, "Ana"); | ||
| 92 | var bad = server.post(ana, "/user/deposit", "amount", "-5"); | ||
| 93 | assertEquals(400, bad.statusCode()); | ||
| 94 | assertTrue(bad.body().contains("INVALID_AMOUNT"), bad.body()); | ||
| 95 | assertEquals(400, server.post(ana, "/user/deposit").statusCode()); | ||
| 96 | assertEquals(BigDecimal.ZERO.setScale(2), balance(ana)); | ||
| 97 | |||
| 98 | var anon = TestServer.client(); | ||
| 99 | assertEquals(401, server.post(anon, "/user/deposit", "amount", "5").statusCode()); | ||
| 100 | assertEquals(401, server.get(anon, "/user/account").statusCode()); | ||
| 101 | assertEquals(401, server.get(anon, "/users").statusCode()); | ||
| 102 | } | ||
| 103 | |||
| 104 | @Test | ||
| 105 | void directoryShowsWhoIsOnline() throws Exception { | ||
| 106 | var watcher = loggedIn(server, "Wes"); | ||
| 107 | var leaver = loggedIn(server, "Lee"); | ||
| 108 | assertTrue(userRow(watcher, "Lee").get("online").getAsBoolean()); | ||
| 109 | server.post(leaver, "/logout"); | ||
| 110 | assertFalse(userRow(watcher, "Lee").get("online").getAsBoolean()); | ||
| 111 | } | ||
| 112 | } | ||