diff options
| -rw-r--r-- | api/src/main/java/market/guess/api/Commission.java | 3 | ||||
| -rw-r--r-- | api/src/main/java/market/guess/api/CommissionTiming.java (renamed from api/src/main/java/market/guess/api/CommissionChargeType.java) | 2 | ||||
| -rw-r--r-- | api/src/main/java/market/guess/api/EventDTO.java | 9 | ||||
| -rw-r--r-- | api/src/main/java/market/guess/api/EventSummaryDTO.java | 15 | ||||
| -rw-r--r-- | api/src/main/java/market/guess/api/GuessMarketContext.java | 2 | ||||
| -rw-r--r-- | api/src/main/java/market/guess/api/MechanismType.java | 6 | ||||
| -rw-r--r-- | api/src/main/java/market/guess/api/TradeRowDTO.java | 4 | ||||
| -rw-r--r-- | engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java | 19 |
8 files changed, 30 insertions, 30 deletions
diff --git a/api/src/main/java/market/guess/api/Commission.java b/api/src/main/java/market/guess/api/Commission.java deleted file mode 100644 index 96cab8a..0000000 --- a/api/src/main/java/market/guess/api/Commission.java +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | package market.guess.api; | ||
| 2 | |||
| 3 | public record Commission(CommissionChargeType type, int percentage) {} | ||
diff --git a/api/src/main/java/market/guess/api/CommissionChargeType.java b/api/src/main/java/market/guess/api/CommissionTiming.java index 75e409b..29861e3 100644 --- a/api/src/main/java/market/guess/api/CommissionChargeType.java +++ b/api/src/main/java/market/guess/api/CommissionTiming.java | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | package market.guess.api; | 1 | package market.guess.api; |
| 2 | 2 | ||
| 3 | public enum CommissionChargeType { | 3 | public enum CommissionTiming { |
| 4 | ON_CLOSE, | 4 | ON_CLOSE, |
| 5 | ON_PURCHASE | 5 | ON_PURCHASE |
| 6 | } | 6 | } |
diff --git a/api/src/main/java/market/guess/api/EventDTO.java b/api/src/main/java/market/guess/api/EventDTO.java deleted file mode 100644 index 2b2bc63..0000000 --- a/api/src/main/java/market/guess/api/EventDTO.java +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | package market.guess.api; | ||
| 2 | |||
| 3 | public record EventDTO( | ||
| 4 | int id, | ||
| 5 | String name, | ||
| 6 | String description, | ||
| 7 | int commission, | ||
| 8 | CommissionChargeType commissionChargeType, | ||
| 9 | EventStatus status) {} | ||
diff --git a/api/src/main/java/market/guess/api/EventSummaryDTO.java b/api/src/main/java/market/guess/api/EventSummaryDTO.java new file mode 100644 index 0000000..361656b --- /dev/null +++ b/api/src/main/java/market/guess/api/EventSummaryDTO.java | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | package market.guess.api; | ||
| 2 | |||
| 3 | import java.util.List; | ||
| 4 | |||
| 5 | public record EventSummaryDTO( | ||
| 6 | String eventKey, | ||
| 7 | int displayId, | ||
| 8 | String name, | ||
| 9 | String description, | ||
| 10 | int commissionPercent, | ||
| 11 | CommissionTiming commissionTiming, | ||
| 12 | MechanismType mechanism, | ||
| 13 | EventStatus status, | ||
| 14 | List<String> optionNames, | ||
| 15 | String accountBalance) {} | ||
diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java index 2d7af4c..d3954cd 100644 --- a/api/src/main/java/market/guess/api/GuessMarketContext.java +++ b/api/src/main/java/market/guess/api/GuessMarketContext.java | |||
| @@ -7,7 +7,7 @@ public interface GuessMarketContext { | |||
| 7 | 7 | ||
| 8 | void SaveChangesAsync(); | 8 | void SaveChangesAsync(); |
| 9 | 9 | ||
| 10 | List<EventDTO> GetAllEventsAsync(); | 10 | List<EventSummaryDTO> GetAllEventsAsync(); |
| 11 | 11 | ||
| 12 | void GetEventInfoByIdAsync(); | 12 | void GetEventInfoByIdAsync(); |
| 13 | 13 | ||
diff --git a/api/src/main/java/market/guess/api/MechanismType.java b/api/src/main/java/market/guess/api/MechanismType.java new file mode 100644 index 0000000..f478041 --- /dev/null +++ b/api/src/main/java/market/guess/api/MechanismType.java | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | package market.guess.api; | ||
| 2 | |||
| 3 | public enum MechanismType { | ||
| 4 | LMSR, | ||
| 5 | ORDER_BOOK | ||
| 6 | } | ||
diff --git a/api/src/main/java/market/guess/api/TradeRowDTO.java b/api/src/main/java/market/guess/api/TradeRowDTO.java new file mode 100644 index 0000000..7331bb1 --- /dev/null +++ b/api/src/main/java/market/guess/api/TradeRowDTO.java | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | package market.guess.api; | ||
| 2 | |||
| 3 | public record TradeRowDTO( | ||
| 4 | String at, String userName, String optionName, long quantity, String pricePaid) {} | ||
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 cf0923b..000e2a7 100644 --- a/engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java +++ b/engine/src/main/java/market/guess/engine/provider/LocalGuessMarketContext.java | |||
| @@ -4,9 +4,7 @@ import jakarta.xml.bind.JAXBContext; | |||
| 4 | import jakarta.xml.bind.Marshaller; | 4 | import jakarta.xml.bind.Marshaller; |
| 5 | import java.io.File; | 5 | import java.io.File; |
| 6 | import java.util.List; | 6 | import java.util.List; |
| 7 | import market.guess.api.CommissionChargeType; | 7 | import market.guess.api.EventSummaryDTO; |
| 8 | import market.guess.api.EventDTO; | ||
| 9 | import market.guess.api.EventStatus; | ||
| 10 | import market.guess.api.GuessMarketContext; | 8 | import market.guess.api.GuessMarketContext; |
| 11 | import market.guess.api.LoadResultDTO; | 9 | import market.guess.api.LoadResultDTO; |
| 12 | import market.guess.api.ProblemDTO; | 10 | import market.guess.api.ProblemDTO; |
| @@ -47,19 +45,8 @@ public class LocalGuessMarketContext implements GuessMarketContext { | |||
| 47 | } | 45 | } |
| 48 | 46 | ||
| 49 | @Override | 47 | @Override |
| 50 | public List<EventDTO> GetAllEventsAsync() { | 48 | public List<EventSummaryDTO> GetAllEventsAsync() { |
| 51 | var events = context.getGMEvents(); | 49 | throw new UnsupportedOperationException("Unimplemented method 'GetEventInfoByIdAsync'"); |
| 52 | return events.getGMEvent().stream() | ||
| 53 | .map( | ||
| 54 | o -> | ||
| 55 | new EventDTO( | ||
| 56 | o.getId(), | ||
| 57 | String.join(" ", o.getName()), | ||
| 58 | o.getDescription(), | ||
| 59 | o.getComision().getValue(), | ||
| 60 | CommissionChargeType.ON_CLOSE, | ||
| 61 | EventStatus.ACTIVE)) | ||
| 62 | .toList(); | ||
| 63 | } | 50 | } |
| 64 | 51 | ||
| 65 | @Override | 52 | @Override |