mirror of
https://github.com/c9s/bbgo.git
synced 2024-09-20 08:11:08 +00:00
use OrderByType
This commit is contained in:
parent
592cdede66
commit
ce76ad3c03
|
@ -339,7 +339,7 @@ func (e *Exchange) queryClosedOrdersByTime(ctx context.Context, symbol string, s
|
||||||
|
|
||||||
for _, maxOrder := range maxOrders {
|
for _, maxOrder := range maxOrders {
|
||||||
if maxOrder.CreatedAt.Time().Before(since) {
|
if maxOrder.CreatedAt.Time().Before(since) {
|
||||||
break
|
continue
|
||||||
}
|
}
|
||||||
order, err2 := toGlobalOrder(maxOrder)
|
order, err2 := toGlobalOrder(maxOrder)
|
||||||
if err2 != nil {
|
if err2 != nil {
|
||||||
|
|
|
@ -17,6 +17,15 @@ const (
|
||||||
WalletTypeMargin WalletType = "m"
|
WalletTypeMargin WalletType = "m"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type OrderByType string
|
||||||
|
|
||||||
|
const (
|
||||||
|
OrderByAsc OrderByType = "asc"
|
||||||
|
OrderByDesc OrderByType = "desc"
|
||||||
|
OrderByAscUpdatedAt OrderByType = "asc_updated_at"
|
||||||
|
OrderByDescUpdatedAt OrderByType = "desc_updated_at"
|
||||||
|
)
|
||||||
|
|
||||||
type OrderStateToQuery int
|
type OrderStateToQuery int
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
@ -20,8 +20,8 @@ type GetWalletClosedOrdersRequest struct {
|
||||||
|
|
||||||
walletType WalletType `param:"walletType,slug,required"`
|
walletType WalletType `param:"walletType,slug,required"`
|
||||||
|
|
||||||
market string `param:"market,required"`
|
market string `param:"market,required"`
|
||||||
timestamp *time.Time `param:"timestamp,milliseconds,omitempty"`
|
timestamp *time.Time `param:"timestamp,milliseconds,omitempty"`
|
||||||
orderBy *string `param:"order_by,omitempty" validValues:"asc,desc,asc_updated_at,desc_updated_at"`
|
orderBy *OrderByType `param:"order_by,omitempty"`
|
||||||
limit *uint `param:"limit,omitempty"`
|
limit *uint `param:"limit,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ func (g *GetWalletClosedOrdersRequest) Timestamp(timestamp time.Time) *GetWallet
|
||||||
return g
|
return g
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GetWalletClosedOrdersRequest) OrderBy(orderBy string) *GetWalletClosedOrdersRequest {
|
func (g *GetWalletClosedOrdersRequest) OrderBy(orderBy max.OrderByType) *GetWalletClosedOrdersRequest {
|
||||||
g.orderBy = &orderBy
|
g.orderBy = &orderBy
|
||||||
return g
|
return g
|
||||||
}
|
}
|
||||||
|
@ -78,17 +78,6 @@ func (g *GetWalletClosedOrdersRequest) GetParameters() (map[string]interface{},
|
||||||
if g.orderBy != nil {
|
if g.orderBy != nil {
|
||||||
orderBy := *g.orderBy
|
orderBy := *g.orderBy
|
||||||
|
|
||||||
// TEMPLATE check-valid-values
|
|
||||||
switch orderBy {
|
|
||||||
case "asc", "desc":
|
|
||||||
params["order_by"] = orderBy
|
|
||||||
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("order_by value %v is invalid", orderBy)
|
|
||||||
|
|
||||||
}
|
|
||||||
// END TEMPLATE check-valid-values
|
|
||||||
|
|
||||||
// assign parameter of orderBy
|
// assign parameter of orderBy
|
||||||
params["order_by"] = orderBy
|
params["order_by"] = orderBy
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
|
|
||||||
// create type alias
|
// create type alias
|
||||||
type WalletType = maxapi.WalletType
|
type WalletType = maxapi.WalletType
|
||||||
|
type OrderByType = maxapi.OrderByType
|
||||||
type OrderType = maxapi.OrderType
|
type OrderType = maxapi.OrderType
|
||||||
|
|
||||||
type Order = maxapi.Order
|
type Order = maxapi.Order
|
||||||
|
|
Loading…
Reference in New Issue
Block a user