9 files changed, 391 insertions, 8 deletions

diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/EventMapperV2.java b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/EventMapperV2.java
index bcdce94..dc13d16 100644
--- a/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/EventMapperV2.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/EventMapperV2.java
@@ -18,6 +18,10 @@ public final class EventMapperV2 implements Mapper<GMEvent, Event> {
 
   @Override
   public Event toDomain(GMEvent source) {
+    return toDomain(source, "");
+  }
+
+  public Event toDomain(GMEvent source, String marketMaker) {
     var options = getOptions(source);
 
     return new Event(
@@ -30,7 +34,7 @@ public final class EventMapperV2 implements Mapper<GMEvent, Event> {
         getMechanism(source, options.size()),
         EventStatus.DRAFT,
         options,
-        "");
+        marketMaker != null ? marketMaker : "");
   }
 
   private static String getEventKey(GMEvent event) {
diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java
new file mode 100644
index 0000000..7ca141f
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java
@@ -0,0 +1,119 @@
+package market.guess.service.catalog.infrastructure.provider.v2;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import market.guess.api.CatalogContext;
+import market.guess.api.LoadResult;
+import market.guess.api.Result;
+import market.guess.service.catalog.infrastructure.mapper.v2.EventMapperV2;
+import market.guess.service.catalog.infrastructure.provider.Loader;
+import market.guess.service.catalog.infrastructure.repository.EventRepository;
+import market.guess.service.catalog.infrastructure.repository.UserRepository;
+import market.guess.service.catalog.model.v2.Event;
+import market.guess.service.catalog.model.v2.GMEvent;
+import market.guess.service.catalog.model.v2.GMUser;
+import market.guess.service.catalog.model.v2.GuessMarket;
+import market.guess.service.domain.User;
+
+public final class XMLLoaderV2 implements Loader {
+  private final JAXBContext contextV2;
+  private final EventRepository eventRepository;
+  private final UserRepository userRepository;
+  private final EventMapperV2 mapperV2;
+  private final XMLValidatorV2 validatorV2;
+
+  public XMLLoaderV2(
+      EventRepository eventRepository,
+      UserRepository userRepository,
+      EventMapperV2 mapperV2,
+      XMLValidatorV2 validatorV2) {
+    this.eventRepository = eventRepository;
+    this.userRepository = userRepository;
+    this.mapperV2 = mapperV2;
+    this.validatorV2 = validatorV2;
+    try {
+      this.contextV2 = JAXBContext.newInstance(GuessMarket.class);
+    } catch (JAXBException e) {
+      throw new IllegalStateException("Failed to initialize JAXB context: " + e.getMessage(), e);
+    }
+  }
+
+  @Override
+  public Result<LoadResult> load(Path path) {
+    if (path == null) {
+      return Result.error("INVALID_PATH", "File path cannot be null.");
+    }
+
+    if (!Files.isRegularFile(path)) {
+      return Result.error("FILE_NOT_FOUND", "No such file: " + path);
+    }
+
+    if (path.getFileName() == null
+        || !path.getFileName().toString().toLowerCase().endsWith(".xml")) {
+      return Result.error("NOT_XML", "The file must have a .xml extension.");
+    }
+
+    try (var stream = Files.newInputStream(path)) {
+      var seed = (GuessMarket) contextV2.createUnmarshaller().unmarshal(stream);
+
+      var validation = validatorV2.validate(seed);
+      if (!validation.isSuccess()) {
+        return Result.error(validation.getMessage(), validation.getDetails());
+      }
+
+      // Map market makers
+      Map<Integer, String> mmByEventId = new HashMap<>();
+      for (GMUser u : seed.getGMUsers().getGMUser()) {
+        if (u.getGMMarketMaker() != null && u.getGMMarketMaker().getEvent() != null) {
+          for (Event mmEvent : u.getGMMarketMaker().getEvent()) {
+            mmByEventId.put(mmEvent.getId(), u.getName());
+          }
+        }
+      }
+
+      var domainEvents = new ArrayList<market.guess.service.domain.Event>();
+      for (GMEvent e : seed.getGMEvents().getGMEvent()) {
+        String mm = mmByEventId.getOrDefault(e.getId(), "");
+        domainEvents.add(mapperV2.toDomain(e, mm));
+      }
+
+      var domainUsers = new ArrayList<User>();
+      for (GMUser u : seed.getGMUsers().getGMUser()) {
+        domainUsers.add(new User(u.getName(), new BigDecimal(u.getInitialCash())));
+      }
+
+      // Ingestion succeeds atomically: update repositories
+      eventRepository.clear();
+      userRepository.clear();
+
+      for (var u : domainUsers) {
+        userRepository.add(u);
+      }
+
+      for (var e : domainEvents) {
+        eventRepository.add(e);
+      }
+
+      return Result.ok(new LoadResult(path.toString(), eventRepository.getAll().size()));
+    } catch (JAXBException e) {
+      var cause =
+          e.getLinkedException() != null ? e.getLinkedException().getMessage() : e.getMessage();
+      return Result.error(
+          "XML_PARSE_ERROR",
+          "The XML file is malformed or invalid: " + (cause != null ? cause : e.getMessage()));
+    } catch (Exception e) {
+      return Result.error("UNREADABLE", "The file could not be read: " + e.getMessage());
+    }
+  }
+
+  @Override
+  public Result<LoadResult> seed(CatalogContext context) {
+    throw new UnsupportedOperationException("Unimplemented method 'seed'");
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLValidatorV2.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLValidatorV2.java
new file mode 100644
index 0000000..0146025
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLValidatorV2.java
@@ -0,0 +1,219 @@
+package market.guess.service.catalog.infrastructure.provider.v2;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import market.guess.api.Result;
+import market.guess.service.catalog.model.v2.Event;
+import market.guess.service.catalog.model.v2.GMEvent;
+import market.guess.service.catalog.model.v2.GMLMSR;
+import market.guess.service.catalog.model.v2.GMOrderBook;
+import market.guess.service.catalog.model.v2.GMUser;
+import market.guess.service.catalog.model.v2.GuessMarket;
+
+public final class XMLValidatorV2 {
+  private static final int MIN_COMMISSION = 0;
+  private static final int MAX_COMMISSION = 90;
+
+  public Result<Void> validate(GuessMarket seed) {
+    if (seed == null) {
+      return Result.error("INVALID_XML", "The XML file contains no data.");
+    }
+
+    if (seed.getGMEvents() == null || seed.getGMEvents().getGMEvent() == null) {
+      return Result.error("INVALID_XML", "The XML file contains no GM-events element.");
+    }
+
+    var events = seed.getGMEvents().getGMEvent();
+    if (events.isEmpty()) {
+      return Result.error("EMPTY_EVENTS", "The XML file does not contain any events.");
+    }
+
+    var seenEventIds = new HashSet<Integer>();
+
+    for (GMEvent e : events) {
+      // 1. Event ID must be positive integer (> 0)
+      if (e.getId() <= 0) {
+        return Result.error(
+            "INVALID_ID", "Event ID must be a positive integer (> 0), found: " + e.getId());
+      }
+      if (!seenEventIds.add(e.getId())) {
+        return Result.error(
+            "DUPLICATE_ID",
+            "Event ID " + e.getId() + " appears more than once. Every event ID must be unique.");
+      }
+
+      // 2. Event name must not be empty
+      if (e.getName() == null || e.getName().isBlank()) {
+        return Result.error("MISSING_NAME", "Event ID " + e.getId() + " has an empty name.");
+      }
+
+      // 3. Event description must not be empty
+      if (e.getDescription() == null || e.getDescription().isBlank()) {
+        return Result.error(
+            "MISSING_DESCRIPTION", "Event ID " + e.getId() + " has an empty description.");
+      }
+
+      // 4. Commission validation
+      if (e.getCommission() == null) {
+        return Result.error(
+            "MISSING_COMMISSION", "Event ID " + e.getId() + " is missing commission.");
+      }
+      var pct = e.getCommission().getValue();
+      if (pct < MIN_COMMISSION || pct > MAX_COMMISSION) {
+        return Result.error(
+            "COMMISSION_OUT_OF_RANGE",
+            "Event ID "
+                + e.getId()
+                + " commission is "
+                + pct
+                + "%. It must be between "
+                + MIN_COMMISSION
+                + "% and "
+                + MAX_COMMISSION
+                + "%.");
+      }
+
+      var type = e.getCommission().getType();
+      if (type == null
+          || (!type.equalsIgnoreCase("on-close") && !type.equalsIgnoreCase("on-purchase"))) {
+        return Result.error(
+            "INVALID_COMMISSION_TYPE",
+            "Event ID "
+                + e.getId()
+                + " has invalid commission type '"
+                + type
+                + "'. Must be 'on-close' or 'on-purchase'.");
+      }
+
+      // 5. GM-options validation (at least 2 options)
+      if (e.getGMOptions() == null || e.getGMOptions().getGMOption() == null) {
+        return Result.error("MISSING_OPTIONS", "Event ID " + e.getId() + " is missing GM-options.");
+      }
+      var options = e.getGMOptions().getGMOption();
+      if (options.size() < 2) {
+        return Result.error(
+            "INVALID_OPTIONS_COUNT",
+            "Event ID "
+                + e.getId()
+                + " must have at least 2 options, but found "
+                + options.size()
+                + ".");
+      }
+      var seenOptions = new HashSet<String>();
+      for (String opt : options) {
+        if (opt == null || opt.trim().isEmpty()) {
+          return Result.error(
+              "EMPTY_OPTION", "Event ID " + e.getId() + " has an empty option name.");
+        }
+        if (!seenOptions.add(opt.trim().toLowerCase())) {
+          return Result.error(
+              "DUPLICATE_OPTION",
+              "Event ID " + e.getId() + " has duplicate option names: '" + opt.trim() + "'.");
+        }
+      }
+
+      // 6. GM-method validation (LMSR or Order Book)
+      if (e.getGMMethod() == null) {
+        return Result.error("MISSING_METHOD", "Event ID " + e.getId() + " is missing GM-method.");
+      }
+      if (e.getGMMethod().getGMLMSR() instanceof GMLMSR lmsr) {
+        if (lmsr.getB() <= 0) {
+          return Result.error(
+              "INVALID_LIQUIDITY",
+              "Event ID "
+                  + e.getId()
+                  + " has invalid liquidity b="
+                  + lmsr.getB()
+                  + ". b must be a positive integer (> 0).");
+        }
+      } else if (e.getGMMethod().getGMOrderBook() instanceof GMOrderBook ob) {
+        if (ob.getD() <= 0) {
+          return Result.error(
+              "INVALID_DENOMINATOR",
+              "Event ID "
+                  + e.getId()
+                  + " has invalid denominator d="
+                  + ob.getD()
+                  + ". d must be a positive integer (> 0).");
+        }
+        if (ob.getInitial() < 0) {
+          return Result.error(
+              "INVALID_INITIAL",
+              "Event ID "
+                  + e.getId()
+                  + " has invalid initial inventory: "
+                  + ob.getInitial()
+                  + ". Must be >= 0.");
+        }
+      } else {
+        return Result.error(
+            "INVALID_METHOD",
+            "Event ID " + e.getId() + " has unknown or missing trading method.");
+      }
+    }
+
+    // 7. Users validation
+    if (seed.getGMUsers() == null || seed.getGMUsers().getGMUser() == null) {
+      return Result.error("MISSING_USERS", "The XML file contains no GM-users element.");
+    }
+    var users = seed.getGMUsers().getGMUser();
+    if (users.isEmpty()) {
+      return Result.error("EMPTY_USERS", "The XML file does not contain any users.");
+    }
+
+    var seenUserNames = new HashSet<String>();
+    var mmByEventId = new HashMap<Integer, String>();
+    for (GMUser u : users) {
+      if (u.getName() == null || u.getName().isBlank()) {
+        return Result.error("MISSING_USER_NAME", "A user has an empty name.");
+      }
+      if (!seenUserNames.add(u.getName().trim().toLowerCase())) {
+        return Result.error(
+            "DUPLICATE_USER", "Duplicate user name found: '" + u.getName().trim() + "'.");
+      }
+      if (u.getInitialCash() <= 0) {
+        return Result.error(
+            "INVALID_INITIAL_CASH",
+            "User '"
+                + u.getName()
+                + "' initial cash must be greater than 0, found: "
+                + u.getInitialCash());
+      }
+      if (u.getGMMarketMaker() != null && u.getGMMarketMaker().getEvent() != null) {
+        for (Event mmEvent : u.getGMMarketMaker().getEvent()) {
+          if (!seenEventIds.contains(mmEvent.getId())) {
+            return Result.error(
+                "UNKNOWN_MM_EVENT",
+                "Market maker '"
+                    + u.getName()
+                    + "' references non-existent event ID "
+                    + mmEvent.getId());
+          }
+          var previous = mmByEventId.putIfAbsent(mmEvent.getId(), u.getName());
+          if (previous != null) {
+            return Result.error(
+                "DUPLICATE_MM",
+                "Event ID "
+                    + mmEvent.getId()
+                    + " has more than one market maker: '"
+                    + previous
+                    + "' and '"
+                    + u.getName()
+                    + "'. Every event needs exactly one.");
+          }
+        }
+      }
+    }
+
+    // 8. Every event has exactly one market maker (duplicates were rejected above)
+    for (GMEvent e : events) {
+      if (!mmByEventId.containsKey(e.getId())) {
+        return Result.error(
+            "MISSING_MM",
+            "Event ID " + e.getId() + " has no market maker. Every event needs exactly one.");
+      }
+    }
+
+    return Result.ok();
+  }
+}
diff --git a/service/src/main/java/market/guess/service/domain/Order.java b/service/src/main/java/market/guess/service/domain/Order.java
index 9d54020..89f9fcc 100644
--- a/service/src/main/java/market/guess/service/domain/Order.java
+++ b/service/src/main/java/market/guess/service/domain/Order.java
@@ -3,4 +3,16 @@ package market.guess.service.domain;
 import java.math.BigDecimal;
 import java.time.Instant;
 
-public record Order(Instant at, Event event, Market market, BigDecimal price, long quantity) {}
+public record Order(
+    Instant at,
+    Event event,
+    Market market,
+    String side,
+    BigDecimal price,
+    long quantity,
+    String userName) {
+
+  public Order(Instant at, Event event, Market market, BigDecimal price, long quantity) {
+    this(at, event, market, "BUY", price, quantity, null);
+  }
+}
diff --git a/service/src/main/java/market/guess/service/domain/Trade.java b/service/src/main/java/market/guess/service/domain/Trade.java
index 271582b..ac53b01 100644
--- a/service/src/main/java/market/guess/service/domain/Trade.java
+++ b/service/src/main/java/market/guess/service/domain/Trade.java
@@ -11,7 +11,20 @@ public record Trade(
     String marketName,
     long quantity,
     BigDecimal sharesCost,
-    BigDecimal commission) {
+    BigDecimal commission,
+    String sellerUserName) {
+
+  public Trade(
+      int id,
+      Instant at,
+      String buyerUserName,
+      String marketKey,
+      String marketName,
+      long quantity,
+      BigDecimal sharesCost,
+      BigDecimal commission) {
+    this(id, at, buyerUserName, marketKey, marketName, quantity, sharesCost, commission, null);
+  }
 
   public BigDecimal totalPaid() {
     return sharesCost.add(commission);
diff --git a/service/src/main/java/market/guess/service/domain/User.java b/service/src/main/java/market/guess/service/domain/User.java
index 86ba5af..18f751e 100644
--- a/service/src/main/java/market/guess/service/domain/User.java
+++ b/service/src/main/java/market/guess/service/domain/User.java
@@ -30,4 +30,8 @@ public final class User {
   public Ledger getLedger() {
     return account;
   }
+
+  public boolean isBlocked() {
+    return account.getBalance().signum() < 0;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/ledger/Ledger.java b/service/src/main/java/market/guess/service/ledger/Ledger.java
index 72bf387..0a6f66f 100644
--- a/service/src/main/java/market/guess/service/ledger/Ledger.java
+++ b/service/src/main/java/market/guess/service/ledger/Ledger.java
@@ -9,6 +9,7 @@ import market.guess.service.helpers.BigDecimalOptions;
 public final class Ledger {
   private final String owner;
   private BigDecimal balance;
+  private boolean blocked;
   private final List<LedgerEntry> entries = new ArrayList<>();
 
   public Ledger(String owner, BigDecimal initialBalance) {
@@ -25,6 +26,10 @@ public final class Ledger {
     return balance;
   }
 
+  public boolean isBlocked() {
+    return blocked;
+  }
+
   public List<LedgerEntry> getEntries() {
     return Collections.unmodifiableList(entries);
   }
diff --git a/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java b/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java
index 22e5332..9241265 100644
--- a/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java
+++ b/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java
@@ -16,12 +16,19 @@ public final class LocalMatchingEngine implements MatchingEngine {
   @Override
   public List<Trade> match(Order order) {
     var mechanism = order.event().getMechanism();
-    return mechanism.buy(order.event(), order.market(), clock.instant(), order.quantity());
+    return mechanism.placeOrder(
+        order.event(),
+        order.market(),
+        order.userName(),
+        order.side(),
+        clock.instant(),
+        order.quantity(),
+        order.price());
   }
 
   @Override
-  public boolean cancelOrder() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'cancelOrder'");
+  public boolean cancelOrder(Order order) {
+    var mechanism = order.event().getMechanism();
+    return mechanism.cancel();
   }
 }
diff --git a/service/src/main/java/market/guess/service/matching/MatchingEngine.java b/service/src/main/java/market/guess/service/matching/MatchingEngine.java
index a8fc0c4..5a6e450 100644
--- a/service/src/main/java/market/guess/service/matching/MatchingEngine.java
+++ b/service/src/main/java/market/guess/service/matching/MatchingEngine.java
@@ -7,5 +7,5 @@ import market.guess.service.domain.Trade;
 public interface MatchingEngine {
   List<Trade> match(Order order);
 
-  boolean cancelOrder();
+  boolean cancelOrder(Order order);
 }