Skip to content

Fetch trades and orders history #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fatemeh-i merged 12 commits into from
Jun 15, 2026
Merged

Fetch trades and orders history #685

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd1c3c3
Fixed a bug related to receiving messages when starting the service.
fatemeh-i Feb 24, 2026
88ea7e4
Merge branch 'dev' of https://github.com/opexdev/core into Fetch-trad…
fatemeh-i Feb 24, 2026
1f6699d
Inhance the log message
fatemeh-i Feb 24, 2026
69eb2f7
Develop new services to search on trades and orders
fatemeh-i Apr 26, 2026
309a0ca
Merge branch 'dev' of https://github.com/opexdev/core into Fetch-trad…
fatemeh-i Jun 6, 2026
17d6629
Clean the user history services
fatemeh-i Jun 9, 2026
8fc410e
Clean the user market services
fatemeh-i Jun 14, 2026
289cecf
Fix a mistake
fatemeh-i Jun 14, 2026
beedf58
Update market tests
fatemeh-i Jun 14, 2026
e898ed2
Replace create date with update date to pass tests!
fatemeh-i Jun 14, 2026
ce60bba
Consider missed orders in market queries
fatemeh-i Jun 14, 2026
bf6c5ad
Merge branch 'dev' of https://github.com/opexdev/core into Fetch-trad…
fatemeh-i Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
253 changes: 131 additions & 122 deletions ...ister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/dao/TradeRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,136 +30,145 @@ interface TradeRepository : ReactiveCrudRepository<TradeModel, Long> {

@Query(
"""
SELECT
t.symbol AS symbol,
t.base_asset AS baseAsset,
t.quote_asset AS quoteAsset,

t.trade_id AS id,
t.matched_price AS price,
t.matched_quantity AS quantity,

CASE
WHEN mo.side = 'BID'
THEN mo.quote_quantity
ELSE to2.quote_quantity
END AS quoteQuantity,

t.create_date ,

CASE
WHEN mo.side = 'BID'
THEN TRUE
ELSE FALSE
END AS isMakerBuyer,

NULL AS orderId,
NULL AS commission,
NULL AS commissionAsset,
NULL AS isBuyer,
NULL AS isMaker

FROM trades t

JOIN orders mo
ON mo.ouid = t.maker_ouid

JOIN orders to2
ON to2.ouid = t.taker_ouid

WHERE (:symbol IS NULL OR t.symbol = :symbol)

ORDER BY t.trade_date DESC
LIMIT :limit
"""
SELECT
t.symbol AS symbol,
t.base_asset AS baseAsset,
t.quote_asset AS quoteAsset,

t.trade_id AS id,
t.matched_price AS price,
t.matched_quantity AS quantity,

COALESCE(
CASE
WHEN mo.side = 'BID'
THEN mo.quote_quantity
ELSE to2.quote_quantity
END,
0
) AS quoteQuantity,

t.create_date AS createDate,

COALESCE(
CASE
WHEN mo.side = 'BID'
THEN TRUE
ELSE FALSE
END,
FALSE
) AS isMakerBuyer,

NULL AS ouid,
NULL AS commission,
NULL AS commissionAsset,
NULL AS isBuyer,
NULL AS isMaker

FROM trades t

LEFT JOIN orders mo
ON mo.ouid = t.maker_ouid

LEFT JOIN orders to2
ON to2.ouid = t.taker_ouid

WHERE (:symbol IS NULL OR t.symbol = :symbol)

ORDER BY t.trade_date DESC
LIMIT :limit
"""
)
fun findRecentMarketTrades(
@Param("symbol")
symbol: String?,

@Param("limit")
limit: Int
): Flux<TradeUserContextProjection>

@Query(
"""
SELECT
t.symbol AS symbol,

NULL AS baseAsset,
NULL AS quoteAsset,

t.trade_id AS id,

CASE
WHEN t.taker_uuid = :uuid
THEN t.taker_price
ELSE t.maker_price
END AS price,

t.matched_quantity AS quantity,

CASE
WHEN mo.side = 'BID'
THEN mo.quote_quantity
ELSE to2.quote_quantity
END AS quoteQuantity,

t.create_date ,

CASE
WHEN mo.side = 'BID'
THEN TRUE
ELSE FALSE
END AS isMakerBuyer,

CASE
WHEN t.taker_uuid = :uuid
THEN to2.ouid
ELSE mo.ouid
END AS ouid,

CASE
WHEN t.taker_uuid = :uuid
THEN t.taker_commission
ELSE t.maker_commission
END AS commission,

CASE
WHEN t.taker_uuid = :uuid
THEN t.taker_commission_asset
ELSE t.maker_commission_asset
END AS commissionAsset,

CASE
WHEN t.taker_uuid = :uuid
THEN to2.side = 'ASK'
ELSE mo.side = 'ASK'
END AS isBuyer,

CASE
WHEN t.maker_uuid = :uuid
THEN TRUE
ELSE FALSE
END AS isMaker

FROM trades t

JOIN orders mo
ON mo.ouid = t.maker_ouid

JOIN orders to2
ON to2.ouid = t.taker_ouid

WHERE :uuid IN (t.taker_uuid, t.maker_uuid)
AND (:fromTrade IS NULL OR t.id > :fromTrade)
AND (:symbol IS NULL OR t.symbol = :symbol)
AND (:startTime IS NULL OR t.trade_date >= :startTime)
AND (:endTime IS NULL OR t.trade_date < :endTime)

ORDER BY t.trade_date DESC
LIMIT :limit
"""
)

@Query("""
SELECT
t.symbol AS symbol,

NULL AS baseAsset,
NULL AS quoteAsset,

t.trade_id AS id,

CASE
WHEN t.taker_uuid = :uuid
THEN t.taker_price
ELSE t.maker_price
END AS price,

t.matched_quantity AS quantity,

COALESCE(
CASE
WHEN mo.side = 'BID'
THEN mo.quote_quantity
ELSE to2.quote_quantity
END,
0
) AS quoteQuantity,

t.create_date AS createDate,

COALESCE(
CASE
WHEN mo.side = 'BID'
THEN TRUE
ELSE FALSE
END,
FALSE
) AS isMakerBuyer,

CASE
WHEN t.taker_uuid = :uuid
THEN to2.ouid
ELSE mo.ouid
END AS ouid,

CASE
WHEN t.taker_uuid = :uuid
THEN t.taker_commission
ELSE t.maker_commission
END AS commission,

CASE
WHEN t.taker_uuid = :uuid
THEN t.taker_commission_asset
ELSE t.maker_commission_asset
END AS commissionAsset,

CASE
WHEN t.taker_uuid = :uuid
THEN (to2.side = 'ASK')
ELSE (mo.side = 'ASK')
END AS isBuyer,

(t.maker_uuid = :uuid) AS isMaker

FROM trades t

LEFT JOIN orders mo
ON mo.ouid = t.maker_ouid

LEFT JOIN orders to2
ON to2.ouid = t.taker_ouid

WHERE :uuid IN (t.taker_uuid, t.maker_uuid)
AND (:fromTrade IS NULL OR t.trade_id > :fromTrade)
AND (:symbol IS NULL OR t.symbol = :symbol)
AND (:startTime IS NULL OR t.trade_date >= :startTime)
AND (:endTime IS NULL OR t.trade_date < :endTime)

ORDER BY t.trade_date DESC
LIMIT :limit
"""
)
fun findTradesWithUserContext(
@Param("uuid")
uuid: String,
Expand Down
Loading