From 843820ea9f357220d69f3795f3289ee41eed355c Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 23 Aug 2026 14:05:29 +0000 Subject: model: relocate market DTOs out of the flat api package Move AccountDTO/MarketDTO/MarketStateDTO/PurchaseReceiptDTO/TradeRowDTO out of the catch-all api package into model.market (and LedgerDTO into model.ledger), matching the existing model.event convention so DTOs live next to the domain they describe rather than in the interface package. Relocate LedgerMapper from mapper.v2 to infrastructure.adapter to match the module's established package layout, and update all call sites and imports accordingly. Also register the ui-desktop module in the build tooling: add it to MODULES, add openjfx to the shipped runtime libs, and generalize package.sh so each executable module (ui-console, ui-desktop) gets its own Main-Class/Class-Path manifest and run script instead of special-casing ui-console. Fold long Class-Path manifest lines at 72 bytes per the JAR spec, since adding ui-desktop's dependencies pushed the line past the limit. --- api/src/main/java/market/guess/api/AccountDTO.java | 7 ------- api/src/main/java/market/guess/api/GuessMarketContext.java | 1 + api/src/main/java/market/guess/api/MarketDTO.java | 3 --- api/src/main/java/market/guess/api/MarketStateDTO.java | 11 ----------- api/src/main/java/market/guess/api/PurchaseReceiptDTO.java | 10 ---------- api/src/main/java/market/guess/api/TradeRowDTO.java | 4 ---- .../main/java/market/guess/model/event/EventDetailDTO.java | 4 ++-- api/src/main/java/market/guess/model/ledger/LedgerDTO.java | 6 ++++++ api/src/main/java/market/guess/model/market/MarketDTO.java | 3 +++ .../main/java/market/guess/model/market/MarketStateDTO.java | 11 +++++++++++ .../java/market/guess/model/market/PurchaseReceiptDTO.java | 10 ++++++++++ api/src/main/java/market/guess/model/market/TradeRowDTO.java | 4 ++++ 12 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 api/src/main/java/market/guess/api/AccountDTO.java delete mode 100644 api/src/main/java/market/guess/api/MarketDTO.java delete mode 100644 api/src/main/java/market/guess/api/MarketStateDTO.java delete mode 100644 api/src/main/java/market/guess/api/PurchaseReceiptDTO.java delete mode 100644 api/src/main/java/market/guess/api/TradeRowDTO.java create mode 100644 api/src/main/java/market/guess/model/ledger/LedgerDTO.java create mode 100644 api/src/main/java/market/guess/model/market/MarketDTO.java create mode 100644 api/src/main/java/market/guess/model/market/MarketStateDTO.java create mode 100644 api/src/main/java/market/guess/model/market/PurchaseReceiptDTO.java create mode 100644 api/src/main/java/market/guess/model/market/TradeRowDTO.java (limited to 'api/src/main/java/market/guess') diff --git a/api/src/main/java/market/guess/api/AccountDTO.java b/api/src/main/java/market/guess/api/AccountDTO.java deleted file mode 100644 index 134c88b..0000000 --- a/api/src/main/java/market/guess/api/AccountDTO.java +++ /dev/null @@ -1,7 +0,0 @@ -package market.guess.api; - -import java.util.List; -import market.guess.model.ledger.LedgerEntryDTO; - -public record AccountDTO( - String owner, String balance, boolean blocked, List entries) {} diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java index e11defb..4edb437 100644 --- a/api/src/main/java/market/guess/api/GuessMarketContext.java +++ b/api/src/main/java/market/guess/api/GuessMarketContext.java @@ -2,6 +2,7 @@ package market.guess.api; import java.math.BigDecimal; import market.guess.model.event.EventDetailDTO; +import market.guess.model.market.PurchaseReceiptDTO; public interface GuessMarketContext { Result placeOrder( diff --git a/api/src/main/java/market/guess/api/MarketDTO.java b/api/src/main/java/market/guess/api/MarketDTO.java deleted file mode 100644 index b7c48a2..0000000 --- a/api/src/main/java/market/guess/api/MarketDTO.java +++ /dev/null @@ -1,3 +0,0 @@ -package market.guess.api; - -public record MarketDTO(String key, String name, String price, String volume) {} diff --git a/api/src/main/java/market/guess/api/MarketStateDTO.java b/api/src/main/java/market/guess/api/MarketStateDTO.java deleted file mode 100644 index da2fff0..0000000 --- a/api/src/main/java/market/guess/api/MarketStateDTO.java +++ /dev/null @@ -1,11 +0,0 @@ -package market.guess.api; - -import java.util.List; -import market.guess.model.event.MechanismType; - -public record MarketStateDTO( - String eventKey, - MechanismType mechanism, - List markets, - String accountBalance, - String commissionCollected) {} diff --git a/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java b/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java deleted file mode 100644 index 02e8007..0000000 --- a/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package market.guess.api; - -import java.util.List; - -public record PurchaseReceiptDTO( - List trades, - String sharesCost, - String commissionPaid, - String totalPaid, - MarketStateDTO stateAfter) {} diff --git a/api/src/main/java/market/guess/api/TradeRowDTO.java b/api/src/main/java/market/guess/api/TradeRowDTO.java deleted file mode 100644 index 68d159a..0000000 --- a/api/src/main/java/market/guess/api/TradeRowDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package market.guess.api; - -public record TradeRowDTO( - String at, String userName, String optionName, String quantity, String pricePaid) {} diff --git a/api/src/main/java/market/guess/model/event/EventDetailDTO.java b/api/src/main/java/market/guess/model/event/EventDetailDTO.java index 9f59b53..f5c4edf 100644 --- a/api/src/main/java/market/guess/model/event/EventDetailDTO.java +++ b/api/src/main/java/market/guess/model/event/EventDetailDTO.java @@ -1,8 +1,8 @@ package market.guess.model.event; import java.util.List; -import market.guess.api.MarketStateDTO; -import market.guess.api.TradeRowDTO; +import market.guess.model.market.MarketStateDTO; +import market.guess.model.market.TradeRowDTO; public record EventDetailDTO( EventSummaryDTO summary, diff --git a/api/src/main/java/market/guess/model/ledger/LedgerDTO.java b/api/src/main/java/market/guess/model/ledger/LedgerDTO.java new file mode 100644 index 0000000..d527c12 --- /dev/null +++ b/api/src/main/java/market/guess/model/ledger/LedgerDTO.java @@ -0,0 +1,6 @@ +package market.guess.model.ledger; + +import java.util.List; + +public record LedgerDTO( + String owner, String balance, boolean blocked, List entries) {} diff --git a/api/src/main/java/market/guess/model/market/MarketDTO.java b/api/src/main/java/market/guess/model/market/MarketDTO.java new file mode 100644 index 0000000..6b31375 --- /dev/null +++ b/api/src/main/java/market/guess/model/market/MarketDTO.java @@ -0,0 +1,3 @@ +package market.guess.model.market; + +public record MarketDTO(String key, String name, String price, String volume) {} diff --git a/api/src/main/java/market/guess/model/market/MarketStateDTO.java b/api/src/main/java/market/guess/model/market/MarketStateDTO.java new file mode 100644 index 0000000..3e9b967 --- /dev/null +++ b/api/src/main/java/market/guess/model/market/MarketStateDTO.java @@ -0,0 +1,11 @@ +package market.guess.model.market; + +import java.util.List; +import market.guess.model.event.MechanismType; + +public record MarketStateDTO( + String eventKey, + MechanismType mechanism, + List markets, + String accountBalance, + String commissionCollected) {} diff --git a/api/src/main/java/market/guess/model/market/PurchaseReceiptDTO.java b/api/src/main/java/market/guess/model/market/PurchaseReceiptDTO.java new file mode 100644 index 0000000..0341542 --- /dev/null +++ b/api/src/main/java/market/guess/model/market/PurchaseReceiptDTO.java @@ -0,0 +1,10 @@ +package market.guess.model.market; + +import java.util.List; + +public record PurchaseReceiptDTO( + List trades, + String sharesCost, + String commissionPaid, + String totalPaid, + MarketStateDTO stateAfter) {} diff --git a/api/src/main/java/market/guess/model/market/TradeRowDTO.java b/api/src/main/java/market/guess/model/market/TradeRowDTO.java new file mode 100644 index 0000000..d3053b3 --- /dev/null +++ b/api/src/main/java/market/guess/model/market/TradeRowDTO.java @@ -0,0 +1,4 @@ +package market.guess.model.market; + +public record TradeRowDTO( + String at, String userName, String optionName, String quantity, String pricePaid) {} -- cgit v1.2.3