fix model problem

Philx0 · Jan 29, 2020 · 3bba3bd · 3bba3bd
1 parent 8b19f6e
commit 3bba3bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/binance_f/model/accountinformation.py b/binance_f/model/accountinformation.py
@@ -33,6 +33,7 @@ def __init__(self):
         self.openOrderInitialMargin = 0.0
         self.positionInitialMargin = 0.0
         self.symbol = ""
+        self.leverage = 0.0
         self.unrealizedProfit = 0.0
         self.isolated = False
 
@@ -41,6 +42,7 @@ def json_parse(json_data):
         result = Position()
         result.initialMargin = json_data.get_float("initialMargin")
         result.maintMargin = json_data.get_float("maintMargin")
+        result.leverage = json_data.get_float("leverage")
         result.openOrderInitialMargin = json_data.get_float("openOrderInitialMargin")
         result.positionInitialMargin = json_data.get_float("positionInitialMargin")
         result.symbol = json_data.get_string("symbol")

diff --git a/binance_f/model/balance.py b/binance_f/model/balance.py
@@ -2,13 +2,15 @@ class Balance:
 
     def __init__(self):
         self.asset = ""
+        self.accountAlias = ""
         self.balance = 0.0
         self.withdrawAvailable = 0.0
 
     @staticmethod
     def json_parse(json_data):
         result = Balance()
         result.asset = json_data.get_string("asset")
+        result.accountAlias = json_data.get_string("accountAlias")
         result.balance = json_data.get_float("balance")
         result.withdrawAvailable = json_data.get_float("withdrawAvailable")
 

diff --git a/binance_f/model/mytrade.py b/binance_f/model/mytrade.py
@@ -23,7 +23,7 @@ def json_parse(json_data):
         result.commission = json_data.get_float("commission")
         result.commissionAsset = json_data.get_string("commissionAsset")
         result.counterPartyId = json_data.get_int_or_default("counterPartyId", None)
-        result.orderId = json_data.get_int("orderId")
+        result.id = json_data.get_int("id")
         result.isMaker = json_data.get_boolean("maker")
         result.orderId = json_data.get_int("orderId")
         result.price = json_data.get_float("price")

diff --git a/binance_f/model/position.py b/binance_f/model/position.py
@@ -2,6 +2,7 @@ class Position:
 
     def __init__(self):
         self.entryPrice = 0.0
+        self.isAutoAddMargin = False
         self.leverage = 0.0
         self.maxNotionalValue = 0.0
         self.liquidationPrice = 0.0
@@ -16,6 +17,7 @@ def __init__(self):
     def json_parse(json_data):
         result = Position()
         result.entryPrice = json_data.get_float("entryPrice")
+        result.isAutoAddMargin = json_data.get_boolean("isAutoAddMargin")
         result.leverage = json_data.get_float("leverage")
         result.maxNotionalValue = json_data.get_float("maxNotionalValue")
         result.liquidationPrice = json_data.get_float("liquidationPrice")