Make account required for trade information

core/models.py

@@ -235,12 +235,16 @@ class Trade(models.Model):
         return cls.objects.get(id=trade_id, user=user)
 
     @classmethod
-    def get_by_id_or_order(cls, trade_id, user):
+    def get_by_id_or_order(cls, trade_id, account_id, user):
         try:
-            return cls.objects.get(id=trade_id, user=user)
+            account = Account.objects.get(id=account_id, user=user)
+        except Account.DoesNotExist:
+            return None
+        try:
+            return cls.objects.get(id=trade_id, account=account, user=user)
         except cls.DoesNotExist:
             try:
-                return cls.objects.get(order_id=trade_id, user=user)
+                return cls.objects.get(order_id=trade_id, account=account, user=user)
             except cls.DoesNotExist:
                 return None