Set account ID in exchange library instead of the view

core/exchanges/alpaca.py

@@ -146,6 +146,7 @@ class AlpacaExchange(BaseExchange):
             return (success, response)
 
         for item in response["itemlist"]:
+            item["account"] = self.account.name
             item["account_id"] = self.account.id
             item["unrealized_pl"] = float(item["unrealized_pl"])
             items.append(item)

core/exchanges/oanda.py

@@ -85,7 +85,8 @@ class OANDAExchange(BaseExchange):
 
         print("Positions", response)
         for item in response["itemlist"]:
-            item["account_id"] = self.account.id
+            item["account"] = self.account.name
+            item["account_id"] = self.account_id
             item["unrealized_pl"] = float(item["unrealized_pl"])
             items.append(item)
         return (True, items)

core/views/positions.py

@@ -21,8 +21,6 @@ def get_positions(user, account_id=None):
         if not success:
             items.append({"name": account.name, "status": "error"})
             continue
-        for position in positions:
-            position["account"] = account.name
 
         for item in positions:
             items.append(item)