Skip to content

Commit

Permalink
revise commodity market info view
Browse files Browse the repository at this point in the history 
convert mean_price to singular column
  • Loading branch information
@Daniel-J-Mason
Daniel-J-Mason committed Jul 18, 2024
1 parent 4bcebd8 commit ef07b10
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 95 deletions.
4 changes: 1 addition & 3 deletions ...va/io/edpn/backend/trade/adapter/persistence/entity/MybatisCommodityMarketInfoEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ public class MybatisCommodityMarketInfoEntity {
private Double maxSellPrice;
private Double minSellPrice;
private Double avgSellPrice;
private Double minMeanPrice;
private Double maxMeanPrice;
private Double averageMeanPrice;
private Double meanPrice;
private Long totalStock;
private Long totalDemand;
private Integer totalStations;
Expand Down
8 changes: 2 additions & 6 deletions ...ckend/trade/adapter/persistence/entity/mapper/MybatisCommodityMarketInfoEntityMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ public CommodityMarketInfo map(MybatisCommodityMarketInfoEntity mybatisCommodity
mybatisCommodityMarketInfoEntity.getMaxSellPrice(),
mybatisCommodityMarketInfoEntity.getMinSellPrice(),
mybatisCommodityMarketInfoEntity.getAvgSellPrice(),
mybatisCommodityMarketInfoEntity.getMinMeanPrice(),
mybatisCommodityMarketInfoEntity.getMaxMeanPrice(),
mybatisCommodityMarketInfoEntity.getAverageMeanPrice(),
mybatisCommodityMarketInfoEntity.getMeanPrice(),
mybatisCommodityMarketInfoEntity.getTotalStock(),
mybatisCommodityMarketInfoEntity.getTotalDemand(),
mybatisCommodityMarketInfoEntity.getTotalStations(),
Expand All @@ -43,9 +41,7 @@ public MybatisCommodityMarketInfoEntity map(CommodityMarketInfo commodityMarketI
.maxSellPrice(commodityMarketInfo.maxSellPrice())
.minSellPrice(commodityMarketInfo.minSellPrice())
.avgSellPrice(commodityMarketInfo.avgSellPrice())
.minMeanPrice(commodityMarketInfo.minMeanPrice())
.maxMeanPrice(commodityMarketInfo.maxMeanPrice())
.averageMeanPrice(commodityMarketInfo.averageMeanPrice())
.meanPrice(commodityMarketInfo.meanPrice())
.totalStock(commodityMarketInfo.totalStock())
.totalDemand(commodityMarketInfo.totalDemand())
.totalStations(commodityMarketInfo.totalStations())
Expand Down
4 changes: 1 addition & 3 deletions ...pn/backend/trade/adapter/persistence/repository/MybatisCommodityMarketInfoRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ public interface MybatisCommodityMarketInfoRepository {
@Result(column="max_sell_price", property="maxSellPrice"),
@Result(column="min_sell_price", property="minSellPrice"),
@Result(column="avg_sell_price", property="avgSellPrice"),
@Result(column="min_mean_price", property="minMeanPrice"),
@Result(column="max_mean_price", property="maxMeanPrice"),
@Result(column="average_mean_price", property="averageMeanPrice"),
@Result(column="mean_price", property="meanPrice"),
@Result(column="total_stock", property="totalStock"),
@Result(column="total_demand", property="totalDemand"),
@Result(column="total_stations", property="totalStations"),
Expand Down
4 changes: 1 addition & 3 deletions ...rc/main/java/io/edpn/backend/trade/adapter/web/dto/object/RestCommodityMarketInfoDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ public record RestCommodityMarketInfoDto(
Double maxSellPrice,
Double minSellPrice,
Double avgSellPrice,
Double minMeanPrice,
Double maxMeanPrice,
Double averageMeanPrice,
Double meanPrice,
Long totalStock,
Long totalDemand,
Integer totalStations,
Expand Down
4 changes: 1 addition & 3 deletions ...io/edpn/backend/trade/adapter/web/dto/object/mapper/RestCommodityMarketInfoDtoMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ public RestCommodityMarketInfoDto map(CommodityMarketInfo commodityMarketInfo) {
commodityMarketInfo.maxSellPrice(),
commodityMarketInfo.minSellPrice(),
commodityMarketInfo.avgSellPrice(),
commodityMarketInfo.minMeanPrice(),
commodityMarketInfo.maxMeanPrice(),
commodityMarketInfo.averageMeanPrice(),
commodityMarketInfo.meanPrice(),
commodityMarketInfo.totalStock(),
commodityMarketInfo.totalDemand(),
commodityMarketInfo.totalStations(),
Expand Down
4 changes: 1 addition & 3 deletions trade-module/src/main/java/io/edpn/backend/trade/application/domain/CommodityMarketInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ public record CommodityMarketInfo(
Double maxSellPrice,
Double minSellPrice,
Double avgSellPrice,
Double minMeanPrice,
Double maxMeanPrice,
Double averageMeanPrice,
Double meanPrice,
Long totalStock,
Long totalDemand,
Integer totalStations,
Expand Down
114 changes: 40 additions & 74 deletions ...-module/src/main/resources/db/trademodule/changelog/create_commodity_market_info_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,80 +6,46 @@
<changeSet id="create_commodity_market_info_view" author="pveeckhout" runAlways="true">
<createView viewName="commodity_market_info_view" replaceIfExists="true">
<![CDATA[
WITH prices AS (SELECT commodity_id,
MAX(sell_price) AS max_sell_price,
MIN(nullif(buy_price, 0)) AS min_buy_price,
AVG(mean_price) AS avg_mean_price
FROM latest_market_datum
GROUP BY commodity_id),
distance_calculations AS (SELECT md_1.commodity_id,
md_1.station_id,
s.system_id,
md_1.buy_price,
md_1.sell_price,
ST_3DDistance(sys.coordinates_geom, ST_MakePoint(0, 0, 0)) AS distance_from_sol
FROM latest_market_datum md_1
JOIN prices p ON p.commodity_id = md_1.commodity_id
JOIN station s ON md_1.station_id = s.id
JOIN system sys ON s.system_id = sys.id
WHERE md_1.sell_price = p.max_sell_price
OR md_1.buy_price = p.min_buy_price),
stations_with_prices AS (SELECT dc.commodity_id,
dc.station_id,
dc.system_id,
dc.buy_price,
dc.sell_price,
row_number() OVER (PARTITION BY dc.commodity_id, dc.sell_price ORDER BY dc.distance_from_sol) AS rn_sell,
row_number() OVER (PARTITION BY dc.commodity_id, dc.buy_price ORDER BY dc.distance_from_sol) AS rn_buy
FROM distance_calculations dc),
highest_selling AS (SELECT commodity_id,
station_id AS highest_selling_station
FROM stations_with_prices
WHERE rn_sell = 1),
lowest_buying AS (SELECT commodity_id,
station_id AS lowest_buying_station
FROM stations_with_prices
WHERE rn_buy = 1),
min_max_stations as (SELECT COALESCE(hs.commodity_id, lb.commodity_id) AS commodity_id,
hs.highest_selling_station,
lb.lowest_buying_station
FROM highest_selling hs
FULL JOIN lowest_buying lb ON hs.commodity_id = lb.commodity_id),
buy_sell_counts AS (SELECT md.commodity_id,
COUNT(DISTINCT CASE WHEN md.buy_price IS NOT NULL AND md.buy_price != 0 THEN md.station_id END) AS stations_with_buy_price,
COUNT(DISTINCT CASE WHEN md.sell_price IS NOT NULL AND md.sell_price != 0 THEN md.station_id END) AS stations_with_sell_price,
COUNT(DISTINCT CASE WHEN md.buy_price < p.avg_mean_price THEN md.station_id END) AS stations_with_buy_price_lower_than_average,
COUNT(DISTINCT CASE WHEN md.sell_price > p.avg_mean_price THEN md.station_id END) AS stations_with_sell_price_higher_than_average
FROM latest_market_datum md
JOIN prices p ON p.commodity_id = md.commodity_id
GROUP BY md.commodity_id)
SELECT md.commodity_id,
MAX(NULLIF(md.buy_price, 0)) AS max_buy_price,
MIN(NULLIF(md.buy_price, 0)) AS minb_buy_price,
AVG(NULLIF(md.buy_price, 0)) AS avg_buy_price,
MAX(NULLIF(md.sell_price, 0)) AS max_sell_price,
MIN(NULLIF(md.sell_price, 0)) AS min_sell_price,
AVG(NULLIF(md.sell_price, 0)) AS avg_sell_price,
MIN(NULLIF(md.mean_price, 0)) AS min_mean_price,
MAX(NULLIF(md.mean_price, 0)) AS max_mean_price,
AVG(NULLIF(md.mean_price, 0)) AS average_mean_price,
SUM(md.stock) AS total_stock,
SUM(md.demand) AS total_demand,
COUNT(DISTINCT md.station_id) AS total_stations,
bsc.stations_with_buy_price,
bsc.stations_with_sell_price,
bsc.stations_with_buy_price_lower_than_average,
bsc.stations_with_sell_price_higher_than_average,
MIN((CASE WHEN mms.highest_selling_station IS NOT NULL THEN mms.highest_selling_station END) ::text)::UUID AS highest_selling_to_station,
MAX((CASE WHEN mms.lowest_buying_station IS NOT NULL THEN mms.lowest_buying_station END)::text) ::UUID AS lowest_buying_from_station
FROM latest_market_datum md
LEFT JOIN buy_sell_counts bsc ON md.commodity_id = bsc.commodity_id
LEFT JOIN min_max_stations mms ON md.commodity_id = mms.commodity_id
GROUP BY md.commodity_id,
bsc.stations_with_buy_price,
bsc.stations_with_sell_price,
bsc.stations_with_buy_price_lower_than_average,
bsc.stations_with_sell_price_higher_than_average;
with commodity_stats as (SELECT commodity_id,
MAX(buy_price) AS max_buy_price,
MIN(NULLIF(buy_price, 0)) AS min_buy_price,
AVG(NULLIF(buy_price, 0)) AS avg_buy_price,
MAX(sell_price) AS max_sell_price,
MIN(NULLIF(sell_price, 0)) AS min_sell_price,
AVG(NULLIF(sell_price, 0)) AS avg_sell_price,
AVG(mean_price) AS mean_price,
SUM(stock) AS total_stock,
SUM(demand) AS total_demand,
COUNT(station_id) AS total_stations,
COUNT(NULLIF(buy_price, 0)) AS stations_with_buy_price,
COUNT(NULLIF(sell_price, 0)) AS stations_with_sell_price,
SUM((buy_price < mean_price)::int) AS stations_with_buy_price_lower_than_average,
SUM((sell_price > mean_price)::int) AS stations_with_sell_price_higher_than_average
FROM latest_market_datum
inner join commodity on commodity_id = commodity.id
inner join station on latest_market_datum.station_id = station.id
where display_name is not null
and station.name NOT SIMILAR TO '[A-Za-z0-9]{3}-[A-Za-z0-9]{3}'
and commodity.is_rare = false
GROUP BY commodity_id)
select commodity_stats.*,
(select station_id
FROM latest_market_datum
where sell_price = commodity_stats.max_sell_price
LIMIT 1) as highest_selling_to_station,
(select station_id
FROM latest_market_datum
where buy_price = commodity_stats.min_buy_price
LIMIT 1) as lowest_buying_from_station
from commodity_stats;
]]>
</createView>
</changeSet>
Expand Down

0 comments on commit ef07b10

Please sign in to comment.