From d7888020d680820baae03f2605f78c42c213e691 Mon Sep 17 00:00:00 2001 From: jakaarl Date: Sat, 21 Oct 2023 14:37:04 +0300 Subject: [PATCH 1/2] Added missing approach settlement fields. Some station-related fields were missing. Also, pulled up Economy from Commodity, since it's used in ApproachSettlement as well. --- build.gradle | 2 +- .../application/dto/eddn/ApproachSettlementMessage.java | 9 +++++++-- .../application/dto/eddn/CommodityMessage.java | 5 +---- .../application/dto/eddn/Economy.java | 8 ++++++++ .../application/dto/eddn/Faction.java | 7 +++++++ 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java create mode 100644 src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java diff --git a/build.gradle b/build.gradle index 4409be0..e23deb1 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'io.edpn.backend' -version = '0.0.4-SNAPSHOT' +version = '0.0.5-SNAPSHOT' compileJava.options.encoding = 'UTF-8' repositories { diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java index fe18ec5..213282c 100644 --- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java @@ -21,7 +21,7 @@ public LocalDateTime messageTimeStamp() { public record Payload( @JsonProperty("SystemAddress") long systemAddress, - @JsonProperty("StarSystem")String starSystem, + @JsonProperty("StarSystem") String starSystem, @JsonProperty("StarPos") double[] starPos, @JsonProperty("MarketID") long marketId, @JsonProperty("horizons") boolean horizons, @@ -31,7 +31,12 @@ public record Payload( @JsonProperty("Name") String name, @JsonProperty("Latitude") long latitude, @JsonProperty("Longitude") long longitude, - @JsonProperty("timestamp") String timestamp + @JsonProperty("timestamp") String timestamp, + @JsonProperty("StationGovernment") String stationGovernment, + @JsonProperty("StationEconomies") Economy[] stationEconomies, + @JsonProperty("StationFaction") Faction stationFaction, + @JsonProperty("StationServices") String[] stationServices, + @JsonProperty("StationEconomy") String stationEconomy ) implements EddnMessage.Payload { @JsonProperty(value = "event", access = JsonProperty.Access.READ_ONLY) diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java index f1a97cc..8600a9f 100644 --- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java @@ -41,9 +41,6 @@ public record Commodity( @JsonProperty("statusFlags") String[] statusFlags ) {} - record Economy( - @JsonProperty("name") String name, - @JsonProperty("proportion") double proportion - ) {} } + } diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java new file mode 100644 index 0000000..05bb26d --- /dev/null +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java @@ -0,0 +1,8 @@ +package io.edpn.backend.messageprocessorlib.application.dto.eddn; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public record Economy( + @JsonProperty("name") String name, + @JsonProperty("proportion") double proportion +) {} diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java new file mode 100644 index 0000000..983d0fb --- /dev/null +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java @@ -0,0 +1,7 @@ +package io.edpn.backend.messageprocessorlib.application.dto.eddn; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public record Faction( + @JsonProperty("Name") String name +) {} From 96a62ea4a52da5c5a0a5b88b10e877acdec0ec1f Mon Sep 17 00:00:00 2001 From: jakaarl Date: Mon, 23 Oct 2023 20:26:22 +0300 Subject: [PATCH 2/2] Added StationAllegiance to approachsettlement. --- .../application/dto/eddn/ApproachSettlementMessage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java index 213282c..04bc26b 100644 --- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java @@ -33,6 +33,7 @@ public record Payload( @JsonProperty("Longitude") long longitude, @JsonProperty("timestamp") String timestamp, @JsonProperty("StationGovernment") String stationGovernment, + @JsonProperty("StationAllegiance") String stationAllegiance, @JsonProperty("StationEconomies") Economy[] stationEconomies, @JsonProperty("StationFaction") Faction stationFaction, @JsonProperty("StationServices") String[] stationServices,