Skip to content

fix trade history problem #556

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
AmirRajabii merged 1 commit into from
Jul 15, 2025
Merged

fix trade history problem #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/Trade.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package co.nilin.opex.api.core.inout

import java.math.BigDecimal
import java.time.LocalDateTime
import java.util.*

data class Trade(
Expand All @@ -12,7 +13,7 @@ data class Trade(
val quoteQuantity: BigDecimal,
val commission: BigDecimal,
val commissionAsset: String,
val time: Date,
val time: LocalDateTime,
val isBuyer: Boolean,
val isMaker: Boolean,
val isBestMatch: Boolean,
Expand Down
3 changes: 2 additions & 1 deletion ...ts/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/data/TradeResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package co.nilin.opex.api.ports.binance.data

import com.fasterxml.jackson.annotation.JsonInclude
import java.math.BigDecimal
import java.time.LocalDateTime
import java.util.*

@JsonInclude(JsonInclude.Include.NON_NULL)
Expand All @@ -15,7 +16,7 @@ data class TradeResponse(
val quoteQty: BigDecimal,
val commission: BigDecimal,
val commissionAsset: String,
val time: Date,
val time: LocalDateTime,
val isBuyer: Boolean,
val isMaker: Boolean,
val isBestMatch: Boolean
Expand Down
2 changes: 1 addition & 1 deletion ...pex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserHistoryController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class UserHistoryController(
@CurrentSecurityContext securityContext: SecurityContext,
): List<Trade> {
return marketUserDataProxy.getTradeHistory(
securityContext.authentication.name, symbol, startTime, endTime, direction, limit ?: 10, offset ?: 10
securityContext.authentication.name, symbol, startTime, endTime, direction, limit ?: 10, offset ?: 0
)
}

Expand Down
3 changes: 2 additions & 1 deletion market/market-core/src/main/kotlin/co/nilin/opex/market/core/inout/Trade.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package co.nilin.opex.market.core.inout

import java.math.BigDecimal
import java.time.LocalDateTime
import java.util.*

// User trade data
Expand All @@ -13,7 +14,7 @@ data class Trade(
val quoteQuantity: BigDecimal,
val commission: BigDecimal,
val commissionAsset: String,
val time: Date,
val time: LocalDateTime,
val isBuyer: Boolean,
val isMaker: Boolean,
val isBestMatch: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion ...postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/impl/UserQueryHandlerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class UserQueryHandlerImpl(
if (isMakerBuyer) makerOrder.quoteQuantity!! else takerOrder.quoteQuantity!!,
if (it.takerUuid == uuid) it.takerCommission!! else it.makerCommission!!,
if (it.takerUuid == uuid) it.takerCommissionAsset!! else it.makerCommissionAsset!!,
Date.from(it.createDate.atZone(ZoneId.systemDefault()).toInstant()),
it.createDate,
if (it.takerUuid == uuid)
OrderDirection.ASK == takerOrder.direction
else
Expand Down
Loading