From db5383927c637faab72c2423d035e5398c69707c Mon Sep 17 00:00:00 2001
From: axel <axel.cherubin@gmail.com>
Date: Tue, 20 Jun 2023 21:52:06 -0400
Subject: [PATCH] fix test_rpc_trade_status

---
 freqtrade/rpc/rpc.py  | 21 ++++++++++++---------
 tests/rpc/test_rpc.py |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index fed71bc17..5458259dd 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -26,7 +26,7 @@ from freqtrade.exchange import timeframe_to_minutes, timeframe_to_msecs
 from freqtrade.exchange.types import Tickers
 from freqtrade.loggers import bufferHandler
 from freqtrade.misc import decimals_per_coin
-from freqtrade.persistence import KeyStoreKeys, KeyValueStore, Order, PairLocks, Trade
+from freqtrade.persistence import KeyStoreKeys, KeyValueStore, PairLocks, Trade
 from freqtrade.persistence.models import PairLock
 from freqtrade.plugins.pairlist.pairlist_helpers import expand_pairlist
 from freqtrade.rpc.fiat_convert import CryptoToFiatConverter
@@ -171,11 +171,18 @@ class RPC:
         else:
             results = []
             for trade in trades:
-                order: Optional[Order] = None
                 current_profit_fiat: Optional[float] = None
                 total_profit_fiat: Optional[float] = None
-                if trade.open_order_id:
-                    order = trade.select_order_by_order_id(trade.open_order_id)
+
+                # prepare open orders details
+                oo_details: Optional[str] = ""
+                oo_details_lst = [
+                    f'({oo.order_type} {oo.side} rem={oo.safe_remaining:.8f})'
+                    for oo in trade.open_orders
+                    if oo.ft_order_side not in ['stoploss']
+                ]
+                oo_details = ''.join(map(str, oo_details_lst))
+
                 # calculate profit and send message to user
                 if trade.is_open:
                     try:
@@ -230,7 +237,6 @@ class RPC:
                     profit_pct=round(current_profit * 100, 2),
                     profit_abs=current_profit_abs,
                     profit_fiat=current_profit_fiat,
-
                     total_profit_abs=total_profit_abs,
                     total_profit_fiat=total_profit_fiat,
                     total_profit_ratio=total_profit_ratio,
@@ -239,10 +245,7 @@ class RPC:
                     stoploss_current_dist_pct=round(stoploss_current_dist_ratio * 100, 2),
                     stoploss_entry_dist=stoploss_entry_dist,
                     stoploss_entry_dist_ratio=round(stoploss_entry_dist_ratio, 8),
-                    open_order=(
-                        f'({order.order_type} {order.side} rem={order.safe_remaining:.8f})' if
-                        order else None
-                    ),
+                    open_orders=oo_details
                 ))
                 results.append(trade_dict)
             return results
diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py
index d04c9d2cf..741bd5a50 100644
--- a/tests/rpc/test_rpc.py
+++ b/tests/rpc/test_rpc.py
@@ -74,7 +74,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'stoploss_current_dist_pct': -10.01,
         'stoploss_entry_dist': -0.00010402,
         'stoploss_entry_dist_ratio': -0.10376381,
-        'open_order': None,
+        'open_orders': '',
         'realized_profit': 0.0,
         'realized_profit_ratio': None,
         'total_profit_abs': -4.09e-06,
@@ -127,7 +127,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'profit_pct': 0.0,
         'profit_abs': 0.0,
         'total_profit_abs': 0.0,
-        'open_order': '(limit buy rem=91.07468123)',
+        'open_orders': '(limit buy rem=91.07468123)',
     })
     response_unfilled['orders'][0].update({
         'is_open': True,