From 1cb67cec8951553fdb5969d947e49f2288f3847f Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 11 Oct 2026 10:35:20 +0300 Subject: server: add event and order endpoints Expose the market to logged-in clients: - GET /api/events lists every event, GET /api/events/{name} returns one event's details, order books, trades and participants. - POST /api/events/{name}/open and /resolve (form field "option") open and settle an event. The engine's openEvent does not know who is asking, so the servlet checks the caller is the event's Market Maker and answers 403 otherwise, for both actions. - POST /api/orders places a buy or sell order as the logged-in user, never as a name the client sends. Events are addressed by their URL-encoded name, which is their identity in v3. Request input is checked before it reaches the engine. The engine treats any side other than SELL as a buy, takes any quantity, and Event.getOption throws on an unknown key, so all of these would have turned client mistakes into wrong trades or 500 errors. Above all, settling on an unknown winning option would close the event and pay nobody. The servlets reject these as 400s. Login is checked inside each servlet through Sessions.requireUser rather than in a second filter: the order of annotation-registered filters is unspecified, and an auth filter running before CorsFilter would send 401s without CORS headers, which browsers report as network errors. --- .../java/market/guess/server/EventsServlet.java | 122 +++++++++++++++++ .../java/market/guess/server/OrdersServlet.java | 75 +++++++++++ .../main/java/market/guess/server/Sessions.java | 11 ++ .../java/market/guess/server/UploadServlet.java | 3 +- .../test/java/market/guess/server/EventsTest.java | 145 +++++++++++++++++++++ 5 files changed, 354 insertions(+), 2 deletions(-) create mode 100644 server/src/main/java/market/guess/server/EventsServlet.java create mode 100644 server/src/main/java/market/guess/server/OrdersServlet.java create mode 100644 server/src/test/java/market/guess/server/EventsTest.java (limited to 'server/src') diff --git a/server/src/main/java/market/guess/server/EventsServlet.java b/server/src/main/java/market/guess/server/EventsServlet.java new file mode 100644 index 0000000..0697bb0 --- /dev/null +++ b/server/src/main/java/market/guess/server/EventsServlet.java @@ -0,0 +1,122 @@ +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; +import market.guess.service.domain.Event; + +/** + * Events, addressed by name (URL-encoded): + * + * + */ +@WebServlet(urlPatterns = {"/api/events", "/api/events/*"}) +public final class EventsServlet extends HttpServlet { + private static final String OPEN = "/open"; + private static final String RESOLVE = "/resolve"; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { + if (Sessions.requireUser(req, res) == null) { + return; + } + var engine = ServerEngine.from(getServletContext()); + var path = req.getPathInfo(); + if (path == null || path.equals("/")) { + Json.send(res, HttpServletResponse.SC_OK, engine.catalog().getAllEvents().getData()); + return; + } + + var event = engine.events().get(path.substring(1)); + if (event.isEmpty()) { + notFound(res, path.substring(1)); + return; + } + Json.send( + res, + HttpServletResponse.SC_OK, + engine.catalog().getEvent(event.get().getEventKey()).getData()); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { + var user = Sessions.requireUser(req, res); + if (user == null) { + return; + } + var path = req.getPathInfo() == null ? "" : req.getPathInfo(); + var action = path.endsWith(OPEN) ? OPEN : path.endsWith(RESOLVE) ? RESOLVE : null; + if (action == null || path.length() <= action.length() + 1) { + Json.error( + res, + HttpServletResponse.SC_NOT_FOUND, + "UNKNOWN_ACTION", + "Use POST /api/events/{name}/open or /resolve."); + return; + } + + var engine = ServerEngine.from(getServletContext()); + var name = path.substring(1, path.length() - action.length()); + var found = engine.events().get(name); + if (found.isEmpty()) { + notFound(res, name); + return; + } + var event = found.get(); + if (!user.equalsIgnoreCase(event.getMarketMaker())) { + Json.error( + res, + HttpServletResponse.SC_FORBIDDEN, + "NOT_MARKET_MAKER", + "Only " + event.getMarketMaker() + ", the Market Maker, can do that."); + return; + } + + if (action.equals(OPEN)) { + var result = engine.catalog().openEvent(event.getEventKey()); + if (!result.isSuccess()) { + Json.error(res, HttpServletResponse.SC_CONFLICT, "CANNOT_OPEN", result.getMessage()); + return; + } + Json.send(res, HttpServletResponse.SC_OK, result.getData()); + return; + } + + var option = req.getParameter("option"); + if (!hasOption(event, option)) { + Json.error( + res, + HttpServletResponse.SC_BAD_REQUEST, + "UNKNOWN_OPTION", + "Choose the winning option by its key, e.g. " + event.getEventKey() + ":0."); + return; + } + var result = engine.market().settleEvent(user, event.getEventKey(), option); + if (!result.isSuccess()) { + Json.error( + res, HttpServletResponse.SC_CONFLICT, "CANNOT_RESOLVE", "Only an active event can be resolved."); + return; + } + Json.send(res, HttpServletResponse.SC_OK, result.getData()); + } + + static boolean hasOption(Event event, String key) { + try { + return key != null && event.getOption(key) != null; + } catch (IllegalArgumentException e) { + return false; + } + } + + private static void notFound(HttpServletResponse res, String name) throws IOException { + Json.error( + res, HttpServletResponse.SC_NOT_FOUND, "EVENT_NOT_FOUND", "No event named '" + name + "'."); + } +} diff --git a/server/src/main/java/market/guess/server/OrdersServlet.java b/server/src/main/java/market/guess/server/OrdersServlet.java new file mode 100644 index 0000000..90ea262 --- /dev/null +++ b/server/src/main/java/market/guess/server/OrdersServlet.java @@ -0,0 +1,75 @@ +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; +import java.math.BigDecimal; + +/** + * POST /api/orders, form fields {@code event} (name), {@code option} (key), {@code side} (BUY or + * SELL), {@code price}, {@code quantity}. Always trades as the logged-in user. + */ +@WebServlet("/api/orders") +public final class OrdersServlet extends HttpServlet { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { + var user = Sessions.requireUser(req, res); + if (user == null) { + return; + } + + var side = req.getParameter("side"); + if (!"BUY".equalsIgnoreCase(side) && !"SELL".equalsIgnoreCase(side)) { + badRequest(res, "INVALID_SIDE", "Side must be BUY or SELL."); + return; + } + BigDecimal price; + long quantity; + try { + price = new BigDecimal(req.getParameter("price").trim()); + quantity = Long.parseLong(req.getParameter("quantity").trim()); + } catch (NullPointerException | NumberFormatException e) { + badRequest(res, "INVALID_ORDER", "Price must be a number and quantity a whole number."); + return; + } + if (quantity <= 0) { + badRequest(res, "INVALID_QUANTITY", "Quantity must be at least 1."); + return; + } + + var engine = ServerEngine.from(getServletContext()); + var event = engine.events().get(String.valueOf(req.getParameter("event"))); + if (event.isEmpty()) { + Json.error( + res, HttpServletResponse.SC_NOT_FOUND, "EVENT_NOT_FOUND", "No such event."); + return; + } + if (!EventsServlet.hasOption(event.get(), req.getParameter("option"))) { + badRequest(res, "UNKNOWN_OPTION", "No such option in this event."); + return; + } + + var result = + engine + .market() + .placeOrder( + user, + event.get().getEventKey(), + req.getParameter("option"), + side.toUpperCase(), + price, + quantity); + if (!result.isSuccess()) { + badRequest(res, "ORDER_REJECTED", result.getMessage()); + return; + } + Json.send(res, HttpServletResponse.SC_OK, result.getData()); + } + + private static void badRequest(HttpServletResponse res, String code, String message) + throws IOException { + Json.error(res, HttpServletResponse.SC_BAD_REQUEST, code, message); + } +} diff --git a/server/src/main/java/market/guess/server/Sessions.java b/server/src/main/java/market/guess/server/Sessions.java index ae9d530..7a99dfa 100644 --- a/server/src/main/java/market/guess/server/Sessions.java +++ b/server/src/main/java/market/guess/server/Sessions.java @@ -1,7 +1,9 @@ package market.guess.server; import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; +import java.io.IOException; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import market.guess.api.Result; @@ -53,6 +55,15 @@ public final class Sessions { } } + public static String requireUser(HttpServletRequest req, HttpServletResponse res) + throws IOException { + var user = currentUser(req); + if (user == null) { + Json.error(res, HttpServletResponse.SC_UNAUTHORIZED, "NOT_LOGGED_IN", "Please log in first."); + } + return user; + } + public static String currentUser(HttpServletRequest req) { var session = req.getSession(false); return session == null ? null : (String) session.getAttribute(USER); diff --git a/server/src/main/java/market/guess/server/UploadServlet.java b/server/src/main/java/market/guess/server/UploadServlet.java index 5fe69ad..c3d5a73 100644 --- a/server/src/main/java/market/guess/server/UploadServlet.java +++ b/server/src/main/java/market/guess/server/UploadServlet.java @@ -27,9 +27,8 @@ public final class UploadServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { - var user = Sessions.currentUser(req); + var user = Sessions.requireUser(req, res); if (user == null) { - Json.error(res, HttpServletResponse.SC_UNAUTHORIZED, "NOT_LOGGED_IN", "Please log in first."); return; } diff --git a/server/src/test/java/market/guess/server/EventsTest.java b/server/src/test/java/market/guess/server/EventsTest.java new file mode 100644 index 0000000..b21d438 --- /dev/null +++ b/server/src/test/java/market/guess/server/EventsTest.java @@ -0,0 +1,145 @@ +package market.guess.server; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.net.URLEncoder; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class EventsTest { + @TempDir static Path base; + static TestServer server; + static HttpClient mm; + static HttpClient trader; + + @BeforeAll + static void start() throws Exception { + server = new TestServer(base); + mm = loggedIn(server, "Maya"); + trader = loggedIn(server, "Tom"); + assertEquals(200, upload(server, mm, "multiple.xml").statusCode()); + } + + @AfterAll + static void stop() throws Exception { + server.close(); + } + + static HttpClient loggedIn(TestServer server, String name) throws Exception { + var client = TestServer.client(); + assertEquals(200, server.post(client, "/login", "username", name).statusCode()); + return client; + } + + static HttpResponse upload(TestServer server, HttpClient client, String sample) + throws Exception { + var boundary = "gm-test-boundary"; + var head = + "--" + + boundary + + "\r\nContent-Disposition: form-data; name=\"file\"; filename=\"" + + sample + + "\"\r\n\r\n"; + var body = + head + + Files.readString(Path.of("test-data/ex-3", sample)) + + "\r\n--" + + boundary + + "--\r\n"; + var req = + server + .request("/upload") + .header("Content-Type", "multipart/form-data; boundary=" + boundary) + .POST(HttpRequest.BodyPublishers.ofString(body)) + .build(); + return client.send(req, HttpResponse.BodyHandlers.ofString()); + } + + static String path(String eventName) { + return "/events/" + URLEncoder.encode(eventName, StandardCharsets.UTF_8).replace("+", "%20"); + } + + @Test + void listsAndDetailsEventsByName() throws Exception { + var list = server.get(trader, "/events"); + assertEquals(200, list.statusCode()); + assertTrue(list.body().contains("\"name\":\"World Cap Winner\""), list.body()); + assertTrue(list.body().contains("\"marketMaker\":\"Maya\""), list.body()); + + var detail = server.get(trader, path("Will it rain tomorrow ?")); + assertEquals(200, detail.statusCode(), detail.body()); + assertTrue(detail.body().contains("\"status\":\"DRAFT\""), detail.body()); + + assertEquals(404, server.get(trader, path("No Such Event")).statusCode()); + assertEquals(401, server.get(TestServer.client(), "/events").statusCode()); + } + + @Test + void onlyTheMarketMakerOpensAndResolves() throws Exception { + var cup = path("World Cap Winner"); + var notMm = server.post(trader, cup + "/open"); + assertEquals(403, notMm.statusCode()); + assertTrue(notMm.body().contains("NOT_MARKET_MAKER"), notMm.body()); + assertEquals(403, server.post(trader, cup + "/resolve", "option", "World Cap Winner:0").statusCode()); + + var broke = server.post(mm, cup + "/open"); + assertEquals(409, broke.statusCode()); + assertTrue(broke.body().contains("CANNOT_OPEN"), broke.body()); + + var notActive = server.post(mm, cup + "/resolve", "option", "World Cap Winner:0"); + assertEquals(409, notActive.statusCode()); + + var unknownWinner = server.post(mm, cup + "/resolve", "option", "World Cap Winner:7"); + assertEquals(400, unknownWinner.statusCode()); + assertTrue(unknownWinner.body().contains("UNKNOWN_OPTION"), unknownWinner.body()); + + assertEquals(404, server.post(mm, cup + "/close").statusCode()); + } + + @Test + void rejectsMalformedOrders() throws Exception { + var event = "World Cap Winner"; + var option = "World Cap Winner:0"; + assertEquals( + 400, + server + .post(trader, "/orders", "event", event, "option", option, "side", "HOLD", "price", "0.5", "quantity", "1") + .statusCode()); + assertEquals( + 400, + server + .post(trader, "/orders", "event", event, "option", option, "side", "BUY", "price", "x", "quantity", "1") + .statusCode()); + assertEquals( + 400, + server + .post(trader, "/orders", "event", event, "option", option, "side", "BUY", "price", "0.5", "quantity", "0") + .statusCode()); + assertEquals( + 404, + server + .post(trader, "/orders", "event", "Nope", "option", option, "side", "BUY", "price", "0.5", "quantity", "1") + .statusCode()); + + var badOption = + server.post( + trader, "/orders", "event", event, "option", "Brazil", "side", "BUY", "price", "0.5", "quantity", "1"); + assertEquals(400, badOption.statusCode()); + assertTrue(badOption.body().contains("UNKNOWN_OPTION"), badOption.body()); + + var notOpen = + server.post( + trader, "/orders", "event", event, "option", option, "side", "BUY", "price", "0.5", "quantity", "1"); + assertEquals(400, notOpen.statusCode()); + assertTrue(notOpen.body().contains("ORDER_REJECTED"), notOpen.body()); + } +} -- cgit v1.2.3