refactor: rest api response

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

Hide file tree

Showing 55 changed files with 1,229 additions and 747 deletions.
diff --git a/binance/coinmfutures/account/client.go b/binance/coinmfutures/account/client.go
diff --git a/binance/coinmfutures/account/types/account.go b/binance/coinmfutures/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 {
 	Assets []struct {
 		Asset                  string `json:"asset"`

diff --git a/binance/coinmfutures/account/types/balance.go b/binance/coinmfutures/account/types/balance.go
@@ -17,6 +17,13 @@
 
 package types
 
+import "github.com/linstohu/nexapi/utils"
+
+type GetBalanceResp struct {
+	Http *utils.ApiResponse
+	Body []*Balance
+}
+
 type Balance struct {
 	AccountAlias       string `json:"accountAlias"`
 	Asset              string `json:"asset"`

diff --git a/binance/coinmfutures/account/types/leverage.go b/binance/coinmfutures/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"`
 	MaxQty   string `json:"maxQty"`
 	Symbol   string `json:"symbol"`

diff --git a/binance/coinmfutures/account/types/margin.go b/binance/coinmfutures/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/coinmfutures/account/types/order.go b/binance/coinmfutures/account/types/order.go
@@ -20,8 +20,19 @@ package types
 import (
 	umutils "github.com/linstohu/nexapi/binance/usdmfutures/utils"
 	bnutils "github.com/linstohu/nexapi/binance/utils"
+	"github.com/linstohu/nexapi/utils"
 )
 
+type OrderResp struct {
+	Http *utils.ApiResponse
+	Body *Order
+}
+
+type OrdersResp struct {
+	Http *utils.ApiResponse
+	Body []*Order
+}
+
 type Order struct {
 	ClientOrderID string `json:"clientOrderId"`
 	CumQty        string `json:"cumQty"`

diff --git a/binance/coinmfutures/account/types/position.go b/binance/coinmfutures/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 {
@@ -31,6 +32,11 @@ type GetPositionParams struct {
 	bnutils.DefaultParam
 }
 
+type GetPositionResp struct {
+	Http *utils.ApiResponse
+	Body []*Position
+}
+
 type Position struct {
 	Symbol           string `json:"symbol"`
 	PositionAmt      string `json:"positionAmt"`

diff --git a/binance/coinmfutures/account/types/position_mode.go b/binance/coinmfutures/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/coinmfutures/account/types/response.go b/binance/coinmfutures/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/coinmfutures/account/types/trade.go b/binance/coinmfutures/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 {
 	Symbol          string `json:"symbol"`
 	ID              int64  `json:"id"`