Edit trade API

Author: iilunin

API/APIServer.py

@@ -57,6 +57,7 @@ def __init__(self, trade_handler):
         super().__init__(trade_handler)
         self.parser = reqparse.RequestParser()
         self.parser.add_argument('action', type=str, help='close|start|pause')
+        self.parser.add_argument('data', type=dict)
 
     def get(self, id):
         return Response(response=ConfigLoader.get_json_str(self.th.get_strategy_by_id(id).trade),
@@ -67,7 +68,7 @@ def delete(self, id):
         strategies = self.get_strategies(id)
 
         if not strategies:
-            return APIResult.ErrorResult(101, msg='No strategies were found')
+            return APIResult.ErrorResult(101, msg='No strategies were found'), 404
 
         # for strategy in strategies:
         #     self.th.remove_trade_by_strategy(strategy, True)
@@ -90,12 +91,12 @@ def post(self, id=None):
         action = args['action']
 
         if not action:
-            return APIResult.ErrorResult(100, msg='No "action" was provided')
+            return APIResult.ErrorResult(100, msg='No "action" was provided'), 403
 
         strategies = self.get_strategies(id)
 
         if not strategies:
-            return APIResult.ErrorResult(101, msg='No strategies were found')
+            return APIResult.ErrorResult(101, msg='No strategies were found'), 404
 
         action = action.lower()
 
@@ -108,6 +109,20 @@ def post(self, id=None):
 
             for strategy in strategies:
                 strategy.paused = paused
+        elif action == 'add':
+            ids = []
+            try:
+                trade_json = args['data']
+                trades = ConfigLoader.load_trade_list_from_obj(trade_json)
+                for trade in trades:
+                    ids.append(trade.id)
+                    self.th.updated_trade(trade)
+                    self.th.fire_trade_updated(trade, True)
+            except Exception as e:
+                # return Response(APIResult.ErrorResult(100, e), 500, mimetype='application/json')
+                return json.dumps(APIResult.ErrorResult(100, str(e))), 500
+
+            return APIResult.OKResult(ids), 201
 
         return APIResult.OKResult()
 

Bot/ConfigLoader.py

@@ -86,10 +86,20 @@ def _rename_trade_file(self, path, file_name, trades):
     def load_trade_list_fromfile(self, file_path):
         with open(file_path, 'r') as f:
             trade_obj = json.load(f)
-            if ConfigLoader.PARENT_ELEMENT in trade_obj:
-                return [Trade(**to) for to in trade_obj[ConfigLoader.PARENT_ELEMENT]]
-            if ConfigLoader.ALT_PARENT_ELEMENT in trade_obj:
-                return [Trade(**trade_obj[ConfigLoader.ALT_PARENT_ELEMENT])]
+            return ConfigLoader.load_trade_list_from_obj(trade_obj)
+
+    @classmethod
+    def load_trade_list_from_json(cls, s):
+        trade_obj = json.loads(s)
+        return cls.load_trade_list_from_obj(trade_obj)
+
+    @classmethod
+    def load_trade_list_from_obj(cls, trade_obj):
+        if ConfigLoader.PARENT_ELEMENT in trade_obj:
+            return [Trade(**to) for to in trade_obj[ConfigLoader.PARENT_ELEMENT]]
+        if ConfigLoader.ALT_PARENT_ELEMENT in trade_obj:
+            return [Trade(**trade_obj[ConfigLoader.ALT_PARENT_ELEMENT])]
+
 
     def save_trades(self, saver, trades):
         if isinstance(trades, list):

Bot/TradeHandler.py

@@ -307,3 +307,7 @@ def updated_trade(self, trade: Trade):
     def confirm_socket_msg_rcvd(self):
         self.socket_message_rcvd = True
         self.logInfo('WebSocket message received')
+
+    def fire_trade_updated(self, trade, need_cloud_sync):
+        if self.order_updated_handler:
+            self.order_updated_handler(trade, need_cloud_sync)