refactor: binance api response

linstohu · Dec 25, 2023 · 1fefe3f · 1fefe3f
1 parent 1b53b38
commit 1fefe3f
Show file tree

Hide file tree

Showing 23 changed files with 704 additions and 376 deletions.
diff --git a/binance/usdmfutures/account/client.go b/binance/usdmfutures/account/client.go
diff --git a/binance/usdmfutures/account/types/account.go b/binance/usdmfutures/account/types/account.go
@@ -17,6 +17,13 @@
 
 package types
 
+import "github.com/linstohu/nexapi/utils"
+
+type GetAccountInfoResp struct {
+	Http *utils.ApiResponse
+	Body *Account
+}
+
 type Account struct {
 	FeeTier                     int    `json:"feeTier"`
 	CanTrade                    bool   `json:"canTrade"`

diff --git a/binance/usdmfutures/account/types/balance.go b/binance/usdmfutures/account/types/balance.go
@@ -17,6 +17,8 @@
 
 package types
 
+import "github.com/linstohu/nexapi/utils"
+
 type Balance struct {
 	AccountAlias       string `json:"accountAlias"`
 	Asset              string `json:"asset"`
@@ -28,3 +30,8 @@ type Balance struct {
 	MarginAvailable    bool   `json:"marginAvailable"`
 	UpdateTime         int64  `json:"updateTime"`
 }
+
+type GetBalanceResp struct {
+	Http *utils.ApiResponse
+	Body []*Balance
+}
diff --git a/binance/usdmfutures/account/types/leverage.go b/binance/usdmfutures/account/types/leverage.go
@@ -19,6 +19,7 @@ package types
 
 import (
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type ChangeLeverageParam struct {
@@ -32,6 +33,11 @@ type ChangeLeverageParams struct {
 }
 
 type ChangeLeverageResp struct {
+	Http *utils.ApiResponse
+	Body *ChangeLeverageAPIResp
+}
+
+type ChangeLeverageAPIResp struct {
 	Leverage         int    `json:"leverage"`
 	MaxNotionalValue string `json:"maxNotionalValue"`
 	Symbol           string `json:"symbol"`

diff --git a/binance/usdmfutures/account/types/margin.go b/binance/usdmfutures/account/types/margin.go
@@ -20,6 +20,7 @@ package types
 import (
 	umutils "github.com/linstohu/nexapi/binance/usdmfutures/utils"
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type ChangeMarginTypeParam struct {
@@ -45,6 +46,11 @@ type ModifyIsolatedPositionMarginParams struct {
 }
 
 type ModifyIsolatedPositionMarginResp struct {
+	Http *utils.ApiResponse
+	Body *ModifyIsolatedPositionMarginAPIResp
+}
+
+type ModifyIsolatedPositionMarginAPIResp struct {
 	Amount float64 `json:"amount"`
 	Code   int     `json:"code"`
 	Msg    string  `json:"msg"`

diff --git a/binance/usdmfutures/account/types/multi_asset.go b/binance/usdmfutures/account/types/multi_asset.go
@@ -19,6 +19,7 @@ package types
 
 import (
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type ChangeMultiAssetsModeParam struct {
@@ -31,5 +32,10 @@ type ChangeMultiAssetsModeParams struct {
 }
 
 type GetCurrentMultiAssetsModeResp struct {
+	Http *utils.ApiResponse
+	Body *GetCurrentMultiAssetsModeAPIResp
+}
+
+type GetCurrentMultiAssetsModeAPIResp struct {
 	MultiAssetsMargin bool `json:"multiAssetsMargin"`
 }
diff --git a/binance/usdmfutures/account/types/order.go b/binance/usdmfutures/account/types/order.go
@@ -20,6 +20,7 @@ package types
 import (
 	umutils "github.com/linstohu/nexapi/binance/usdmfutures/utils"
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type Order struct {
@@ -69,6 +70,16 @@ type NewOrderParams struct {
 	bnutils.DefaultParam
 }
 
+type OrderResp struct {
+	Http *utils.ApiResponse
+	Body *Order
+}
+
+type OrdersResp struct {
+	Http *utils.ApiResponse
+	Body []*Order
+}
+
 type GetOrderParam struct {
 	Symbol            string `url:"symbol" validate:"required"`
 	OrderID           int64  `url:"orderId,omitempty" validate:"omitempty"`

diff --git a/binance/usdmfutures/account/types/position.go b/binance/usdmfutures/account/types/position.go
@@ -19,6 +19,7 @@ package types
 
 import (
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type GetPositionParam struct {
@@ -30,6 +31,11 @@ type GetPositionParams struct {
 	bnutils.DefaultParam
 }
 
+type GetPositionResp struct {
+	Http *utils.ApiResponse
+	Body []*Position
+}
+
 type Position struct {
 	EntryPrice       string `json:"entryPrice"`
 	MarginType       string `json:"marginType"`

diff --git a/binance/usdmfutures/account/types/position_mode.go b/binance/usdmfutures/account/types/position_mode.go
@@ -19,6 +19,7 @@ package types
 
 import (
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type ChangePositionModeParam struct {
@@ -31,5 +32,10 @@ type ChangePositionModeParams struct {
 }
 
 type GetCurrentPositionModeResp struct {
+	Http *utils.ApiResponse
+	Body *GetCurrentPositionModeAPIResp
+}
+
+type GetCurrentPositionModeAPIResp struct {
 	DualSidePosition bool `json:"dualSidePosition"`
 }
diff --git a/binance/usdmfutures/account/types/response.go b/binance/usdmfutures/account/types/response.go
@@ -17,6 +17,13 @@
 
 package types
 
+import "github.com/linstohu/nexapi/utils"
+
+type DefaultResp struct {
+	Http *utils.ApiResponse
+	Body *Response
+}
+
 type Response struct {
 	Code    int    `json:"code"`
 	Message string `json:"msg"`

diff --git a/binance/usdmfutures/account/types/trade.go b/binance/usdmfutures/account/types/trade.go
@@ -19,6 +19,7 @@ package types
 
 import (
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
 type GetTradeListParam struct {
@@ -35,6 +36,11 @@ type GetTradeListParams struct {
 	bnutils.DefaultParam
 }
 
+type GetTradeListResp struct {
+	Http *utils.ApiResponse
+	Body []*Trade
+}
+
 type Trade struct {
 	Buyer           bool   `json:"buyer"`
 	Commission      string `json:"commission"`