11 files changed, 38 insertions, 40 deletions

diff --git a/api/src/main/java/market/guess/api/AccountDTO.java b/api/src/main/java/market/guess/api/AccountDTO.java
index 8e7123e..134c88b 100644
--- a/api/src/main/java/market/guess/api/AccountDTO.java
+++ b/api/src/main/java/market/guess/api/AccountDTO.java
@@ -1,6 +1,7 @@
 package market.guess.api;
 
 import java.util.List;
+import market.guess.model.ledger.LedgerEntryDTO;
 
 public record AccountDTO(
     String owner, String balance, boolean blocked, List<LedgerEntryDTO> entries) {}
diff --git a/api/src/main/java/market/guess/api/CatalogContext.java b/api/src/main/java/market/guess/api/CatalogContext.java
index 7e80042..c980ba8 100644
--- a/api/src/main/java/market/guess/api/CatalogContext.java
+++ b/api/src/main/java/market/guess/api/CatalogContext.java
@@ -2,6 +2,8 @@ package market.guess.api;
 
 import java.nio.file.Path;
 import java.util.List;
+import market.guess.model.event.EventDetailDTO;
+import market.guess.model.event.EventSummaryDTO;
 
 public interface CatalogContext {
   Result<LoadResultDTO> loadEvents(Path path);
@@ -9,4 +11,8 @@ public interface CatalogContext {
   Result<List<EventSummaryDTO>> getAllEvents();
 
   Result<EventDetailDTO> getEvent(String eventKey);
+
+  Result<Void> saveState(Path path);
+
+  Result<LoadResultDTO> restoreState(Path path);
 }
diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java
index 4eee37e..7ec7323 100644
--- a/api/src/main/java/market/guess/api/GuessMarketContext.java
+++ b/api/src/main/java/market/guess/api/GuessMarketContext.java
@@ -1,16 +1,10 @@
 package market.guess.api;
 
-import java.nio.file.Path;
+import market.guess.model.event.EventDetailDTO;
 
 public interface GuessMarketContext {
   Result<PurchaseReceiptDTO> buyShares(
       String userName, String eventKey, String optionKey, int quantity);
 
-  Result<EventDetailDTO> closeEvent(String userName, String eventKey, String winningOptionKey);
-
-  Result<AccountDTO> account(String userName);
-
-  Result<Void> saveState(Path path);
-
-  Result<LoadResultDTO> restoreState(Path path);
+  Result<EventDetailDTO> settleEvent(String userName, String eventKey, String winningOptionKey);
 }
diff --git a/api/src/main/java/market/guess/api/LoadResultDTO.java b/api/src/main/java/market/guess/api/LoadResultDTO.java
index 8cae3c0..95c23e7 100644
--- a/api/src/main/java/market/guess/api/LoadResultDTO.java
+++ b/api/src/main/java/market/guess/api/LoadResultDTO.java
@@ -1,15 +1,3 @@
 package market.guess.api;
 
-import java.util.List;
-
-public record LoadResultDTO(
-    boolean success, String source, int eventsLoaded, List<ProblemDTO> issues) {
-
-  public static LoadResultDTO success(String sourceLabel, int eventsLoaded) {
-    return new LoadResultDTO(true, sourceLabel, eventsLoaded, List.of());
-  }
-
-  public static LoadResultDTO failure(String sourceLabel, List<ProblemDTO> problems) {
-    return new LoadResultDTO(false, sourceLabel, 0, List.copyOf(problems));
-  }
-}
+public record LoadResultDTO(String source, int eventsLoaded) {}
diff --git a/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java b/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java
index bd5b2f7..e98a080 100644
--- a/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java
+++ b/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java
@@ -1,10 +1,5 @@
 package market.guess.api;
 
-public record PurchaseReceiptDTO(
-    String eventKey,
-    String optionName,
-    long quantity,
-    String sharesCost,
-    String commission,
-    String totalPaid,
-    MarketStateDTO stateAfter) {}
+import java.util.List;
+
+public record PurchaseReceiptDTO(List<TradeRowDTO> trades, MarketStateDTO stateAfter) {}
diff --git a/api/src/main/java/market/guess/api/Result.java b/api/src/main/java/market/guess/api/Result.java
index 15ac5db..ff66761 100644
--- a/api/src/main/java/market/guess/api/Result.java
+++ b/api/src/main/java/market/guess/api/Result.java
@@ -5,30 +5,36 @@ import java.time.Instant;
 public final class Result<T> {
   private final boolean success;
   private final String message;
+  private final String details;
   private final T data;
   private final Instant timeStamp;
 
-  private Result(boolean success, String message, T data) {
+  private Result(boolean success, String message, String details, T data) {
     this.success = success;
     this.message = message;
     this.data = data;
+    this.details = details;
     this.timeStamp = Instant.now();
   }
 
   public static <T> Result<T> ok() {
-    return new Result<T>(true, "Operation successful", null);
+    return new Result<T>(true, "Operation successful", "", null);
   }
 
   public static <T> Result<T> ok(T data) {
-    return new Result<>(true, "Operation successful", data);
+    return new Result<>(true, "Operation successful", "", data);
   }
 
-  public static <T> Result<T> error(String message, T data) {
-    return new Result<>(false, message, data);
+  public static <T> Result<T> error(String message, String details, T data) {
+    return new Result<>(false, message, details, data);
+  }
+
+  public static <T> Result<T> error(String message, String details) {
+    return error(message, details, null);
   }
 
   public static <T> Result<T> error(String message) {
-    return new Result<>(false, message, null);
+    return error(message, null, null);
   }
 
   public boolean isSuccess() {
@@ -39,6 +45,10 @@ public final class Result<T> {
     return message;
   }
 
+  public String getDetails() {
+    return details;
+  }
+
   public T getData() {
     return data;
   }
diff --git a/api/src/main/java/market/guess/api/EventDetailDTO.java b/api/src/main/java/market/guess/model/event/EventDetailDTO.java
index 893f153..e45458b 100644
--- a/api/src/main/java/market/guess/api/EventDetailDTO.java
+++ b/api/src/main/java/market/guess/model/event/EventDetailDTO.java
@@ -1,6 +1,8 @@
-package market.guess.api;
+package market.guess.model.event;
 
 import java.util.List;
+import market.guess.api.MarketStateDTO;
+import market.guess.api.TradeRowDTO;
 
 public record EventDetailDTO(
     EventSummaryDTO summary,
diff --git a/api/src/main/java/market/guess/api/EventStatus.java b/api/src/main/java/market/guess/model/event/EventStatus.java
index 6580157..c6460f9 100644
--- a/api/src/main/java/market/guess/api/EventStatus.java
+++ b/api/src/main/java/market/guess/model/event/EventStatus.java
@@ -1,4 +1,4 @@
-package market.guess.api;
+package market.guess.model.event;
 
 public enum EventStatus {
   DRAFT,
diff --git a/api/src/main/java/market/guess/api/EventSummaryDTO.java b/api/src/main/java/market/guess/model/event/EventSummaryDTO.java
index d185103..1595f81 100644
--- a/api/src/main/java/market/guess/api/EventSummaryDTO.java
+++ b/api/src/main/java/market/guess/model/event/EventSummaryDTO.java
@@ -1,6 +1,8 @@
-package market.guess.api;
+package market.guess.model.event;
 
 import java.util.List;
+import market.guess.api.CommissionTiming;
+import market.guess.api.MechanismType;
 
 public record EventSummaryDTO(
     String key,
diff --git a/api/src/main/java/market/guess/api/LedgerEntryDTO.java b/api/src/main/java/market/guess/model/ledger/LedgerEntryDTO.java
index b8f994c..733ad03 100644
--- a/api/src/main/java/market/guess/api/LedgerEntryDTO.java
+++ b/api/src/main/java/market/guess/model/ledger/LedgerEntryDTO.java
@@ -1,4 +1,4 @@
-package market.guess.api;
+package market.guess.model.ledger;
 
 public record LedgerEntryDTO(
     long seq, String at, LedgerType type, String amount, String balanceAfter, String note) {}
diff --git a/api/src/main/java/market/guess/api/LedgerType.java b/api/src/main/java/market/guess/model/ledger/LedgerType.java
index 3402b84..b1fe15b 100644
--- a/api/src/main/java/market/guess/api/LedgerType.java
+++ b/api/src/main/java/market/guess/model/ledger/LedgerType.java
@@ -1,4 +1,4 @@
-package market.guess.api;
+package market.guess.model.ledger;
 
 public enum LedgerType {
   SUBSIDY,