Fix off by one issue in OANDA

core/lib/schemas/oanda_s.py

@@ -82,7 +82,7 @@ def parse_side(x):
         return "unknown"
 
 
-def parse_trade_ids(x, sum=-1):
+def parse_trade_ids(x, sum=0):
     if float(x["long"]["units"]) > 0:
         return [str(int(y) + sum) for y in x["long"]["tradeIDs"]]
     elif float(x["short"]["units"]) < 0:

core/templates/partials/position-list.html

@@ -8,7 +8,7 @@
     <th>quote</th>
     <th>P/L</th>
     <th>side</th>
-    <th>stored</th>
+    <th>trades</th>
     <th>actions</th>
   </thead>
   {% for item in items %}
@@ -33,7 +33,7 @@
           </span>
         {% endif %}
       </td>
-      <td>{{ item.trades|length }}</td>
+      <td>{{ item.trade_ids|length }}</td>
       <td>
         <div class="buttons">
           <button

core/templates/window-content/view-position.html

@@ -1,6 +1,5 @@
 {% include 'partials/notify.html' %}
 <h1 class="title">Live information</h1>
-{{ valid_trade_ids }}
 <table class="table is-fullwidth is-hoverable">
   <thead>
     <th>attribute</th>

core/views/trades.py

@@ -39,6 +39,9 @@ class TradeAction(LoginRequiredMixin, OTPRequiredMixin, View):
             return HttpResponseBadRequest("Trade not found.")
         if db_info.order_id is not None:
             try:
+                if db_info.order_id == db_info.response["id"]:
+                    db_info.order_id = str(int(db_info.order_id) + 1)
+                    db_info.save()
                 live_info = db_info.account.client.get_trade(db_info.order_id)
             except GenericAPIError as e:
                 live_info = {"error": e}