18 files changed, 47 insertions, 50 deletions

diff --git a/api/src/main/java/market/guess/api/AccountDTO.java b/api/src/main/java/market/guess/api/AccountDTO.java
new file mode 100644
index 0000000..8e7123e
--- /dev/null
+++ b/api/src/main/java/market/guess/api/AccountDTO.java
@@ -0,0 +1,6 @@
+package market.guess.api;
+
+import java.util.List;
+
+public record AccountDTO(
+    String owner, String balance, boolean blocked, List<LedgerEntryDTO> entries) {}
diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java
index 12ffbeb..2d7af4c 100644
--- a/api/src/main/java/market/guess/api/GuessMarketContext.java
+++ b/api/src/main/java/market/guess/api/GuessMarketContext.java
@@ -1,10 +1,9 @@
 package market.guess.api;
 
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 public interface GuessMarketContext {
-  CompletableFuture<LoadResultDTO> LoadAsync();
+  LoadResultDTO LoadAsync();
 
   void SaveChangesAsync();
 
diff --git a/api/src/main/java/market/guess/api/GuessMarketEngine.java b/api/src/main/java/market/guess/api/GuessMarketEngine.java
deleted file mode 100644
index b6d44a4..0000000
--- a/api/src/main/java/market/guess/api/GuessMarketEngine.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package market.guess.api;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface GuessMarketEngine {
-  CompletableFuture<LoadResultDTO> loadEvents();
-}
diff --git a/api/src/main/java/market/guess/api/LedgerEntryDTO.java b/api/src/main/java/market/guess/api/LedgerEntryDTO.java
new file mode 100644
index 0000000..b8f994c
--- /dev/null
+++ b/api/src/main/java/market/guess/api/LedgerEntryDTO.java
@@ -0,0 +1,4 @@
+package market.guess.api;
+
+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/api/LedgerType.java
new file mode 100644
index 0000000..3402b84
--- /dev/null
+++ b/api/src/main/java/market/guess/api/LedgerType.java
@@ -0,0 +1,10 @@
+package market.guess.api;
+
+public enum LedgerType {
+  SUBSIDY,
+  PURCHASE,
+  COMMISSION,
+  PAYOUT,
+  REFUND,
+  DEPOSIT
+}
diff --git a/api/src/main/java/market/guess/api/LoadResultDTO.java b/api/src/main/java/market/guess/api/LoadResultDTO.java
index cf3630b..8cae3c0 100644
--- a/api/src/main/java/market/guess/api/LoadResultDTO.java
+++ b/api/src/main/java/market/guess/api/LoadResultDTO.java
@@ -1,3 +1,15 @@
 package market.guess.api;
 
-public record LoadResultDTO() {}
+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));
+  }
+}
diff --git a/api/src/main/java/market/guess/api/ProblemDTO.java b/api/src/main/java/market/guess/api/ProblemDTO.java
new file mode 100644
index 0000000..682372b
--- /dev/null
+++ b/api/src/main/java/market/guess/api/ProblemDTO.java
@@ -0,0 +1,3 @@
+package market.guess.api;
+
+public record ProblemDTO(String code, String humanizedMessage, String location) {}
diff --git a/engine/src/main/java/market/guess/engine/LocalGuessMarketService.java b/engine/src/main/java/market/guess/engine/LocalGuessMarketService.java
deleted file mode 100644
index dafbef6..0000000
--- a/engine/src/main/java/market/guess/engine/LocalGuessMarketService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package market.guess.engine;
-
-import java.util.concurrent.CompletableFuture;
-import market.guess.api.GuessMarketContext;
-import market.guess.api.GuessMarketEngine;
-import market.guess.api.LoadResultDTO;
-
-public class LocalGuessMarketService implements GuessMarketEngine {
-  private final GuessMarketContext context;
-
-  public LocalGuessMarketService(GuessMarketContext context) {
-    super();
-    this.context = context;
-  }
-
-  @Override
-  public CompletableFuture<LoadResultDTO> loadEvents() {
-    return context.LoadAsync();
-  }
-}
diff --git a/engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java b/engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java
index 628038d..cf0923b 100644
--- a/engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java
+++ b/engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java
@@ -4,30 +4,31 @@ import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.Marshaller;
 import java.io.File;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import market.guess.api.CommissionChargeType;
 import market.guess.api.EventDTO;
 import market.guess.api.EventStatus;
 import market.guess.api.GuessMarketContext;
 import market.guess.api.LoadResultDTO;
+import market.guess.api.ProblemDTO;
 import market.guess.engine.model.GuessMarket;
 
 public class LocalGuessMarketContext implements GuessMarketContext {
   private GuessMarket context;
 
   @Override
-  public CompletableFuture<LoadResultDTO> LoadAsync() {
+  public LoadResultDTO LoadAsync() {
+    var file = new File("test-data/ex-1/multiple.xml");
     try {
-      var file = new File("test-data/ex-1/multiple.xml");
       var ctx = JAXBContext.newInstance(GuessMarket.class);
       var unmarshaller = ctx.createUnmarshaller();
 
       context = (GuessMarket) unmarshaller.unmarshal(file);
-
+      return LoadResultDTO.success(file.getPath(), context.getGMEvents().getGMEvent().size());
     } catch (Exception e) {
       e.printStackTrace();
+      return LoadResultDTO.failure(
+          file.getPath(), List.of(new ProblemDTO("LOAD_FAILED", e.getMessage(), file.getPath())));
     }
-    return CompletableFuture.completedFuture(new LoadResultDTO());
   }
 
   @Override
diff --git a/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProvider.java b/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProvider.java
index 71de3be..38b02a9 100644
--- a/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProvider.java
+++ b/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProvider.java
@@ -1,7 +1,6 @@
 package market.guess.ui.console;
 
 import java.util.Scanner;
-import market.guess.InputProvider;
 
 public class ConsoleInputProvider implements InputProvider {
   private final Scanner scanner = new Scanner(System.in);
diff --git a/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProviderFactory.java b/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProviderFactory.java
index d122549..a7433b7 100644
--- a/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProviderFactory.java
+++ b/ui-console/src/main/java/market/guess/ui/console/ConsoleInputProviderFactory.java
@@ -1,8 +1,5 @@
 package market.guess.ui.console;
 
-import market.guess.InputProvider;
-import market.guess.InputProviderFactory;
-
 public class ConsoleInputProviderFactory implements InputProviderFactory {
 
   @Override
diff --git a/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProvider.java b/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProvider.java
index eb9f31b..84017ac 100644
--- a/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProvider.java
+++ b/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProvider.java
@@ -1,7 +1,5 @@
 package market.guess.ui.console;
 
-import market.guess.OutputProvider;
-
 public class ConsoleOutputProvider implements OutputProvider {
 
   @Override
diff --git a/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProviderFactory.java b/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProviderFactory.java
index 6db91fc..3665df3 100644
--- a/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProviderFactory.java
+++ b/ui-console/src/main/java/market/guess/ui/console/ConsoleOutputProviderFactory.java
@@ -1,8 +1,5 @@
 package market.guess.ui.console;
 
-import market.guess.OutputProvider;
-import market.guess.OutputProviderFactory;
-
 public class ConsoleOutputProviderFactory implements OutputProviderFactory {
 
   @Override
diff --git a/api/src/main/java/market/guess/InputProvider.java b/ui-console/src/main/java/market/guess/ui/console/InputProvider.java
index be7372b..3579b4a 100644
--- a/api/src/main/java/market/guess/InputProvider.java
+++ b/ui-console/src/main/java/market/guess/ui/console/InputProvider.java
@@ -1,4 +1,4 @@
-package market.guess;
+package market.guess.ui.console;
 
 public interface InputProvider extends AutoCloseable {
   int nextInt();
diff --git a/api/src/main/java/market/guess/InputProviderFactory.java b/ui-console/src/main/java/market/guess/ui/console/InputProviderFactory.java
index 6801103..dcbb1c6 100644
--- a/api/src/main/java/market/guess/InputProviderFactory.java
+++ b/ui-console/src/main/java/market/guess/ui/console/InputProviderFactory.java
@@ -1,4 +1,4 @@
-package market.guess;
+package market.guess.ui.console;
 
 public interface InputProviderFactory {
   InputProvider create();
diff --git a/ui-console/src/main/java/market/guess/ui/console/Menu.java b/ui-console/src/main/java/market/guess/ui/console/Menu.java
index a5217a4..4bf8929 100644
--- a/ui-console/src/main/java/market/guess/ui/console/Menu.java
+++ b/ui-console/src/main/java/market/guess/ui/console/Menu.java
@@ -1,7 +1,5 @@
 package market.guess.ui.console;
 
-import market.guess.OutputProvider;
-import market.guess.OutputProviderFactory;
 import org.picocontainer.Startable;
 
 public class Menu implements Startable {
diff --git a/api/src/main/java/market/guess/OutputProvider.java b/ui-console/src/main/java/market/guess/ui/console/OutputProvider.java
index 774408e..57ff001 100644
--- a/api/src/main/java/market/guess/OutputProvider.java
+++ b/ui-console/src/main/java/market/guess/ui/console/OutputProvider.java
@@ -1,4 +1,4 @@
-package market.guess;
+package market.guess.ui.console;
 
 public interface OutputProvider {
   void print(Object object);
diff --git a/api/src/main/java/market/guess/OutputProviderFactory.java b/ui-console/src/main/java/market/guess/ui/console/OutputProviderFactory.java
index b4eb7f5..6d6601f 100644
--- a/api/src/main/java/market/guess/OutputProviderFactory.java
+++ b/ui-console/src/main/java/market/guess/ui/console/OutputProviderFactory.java
@@ -1,4 +1,4 @@
-package market.guess;
+package market.guess.ui.console;
 
 public interface OutputProviderFactory {
   OutputProvider create();