Include open orders in json responses
This commit is contained in:
parent
c0ff554d5b
commit
8369d5bedd
@ -395,7 +395,7 @@ class LocalTrade():
|
|||||||
)
|
)
|
||||||
|
|
||||||
def to_json(self) -> Dict[str, Any]:
|
def to_json(self) -> Dict[str, Any]:
|
||||||
filled_orders = self.select_filled_orders()
|
filled_orders = self.select_filled_or_open_orders()
|
||||||
orders = [order.to_json(self.entry_side) for order in filled_orders]
|
orders = [order.to_json(self.entry_side) for order in filled_orders]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -898,6 +898,21 @@ class LocalTrade():
|
|||||||
(o.filled or 0) > 0 and
|
(o.filled or 0) > 0 and
|
||||||
o.status in NON_OPEN_EXCHANGE_STATES]
|
o.status in NON_OPEN_EXCHANGE_STATES]
|
||||||
|
|
||||||
|
def select_filled_or_open_orders(self) -> List['Order']:
|
||||||
|
"""
|
||||||
|
Finds filled or open orders
|
||||||
|
:param order_side: Side of the order (either 'buy', 'sell', or None)
|
||||||
|
:return: array of Order objects
|
||||||
|
"""
|
||||||
|
return [o for o in self.orders if
|
||||||
|
(
|
||||||
|
o.ft_is_open is False
|
||||||
|
and (o.filled or 0) > 0
|
||||||
|
and o.status in NON_OPEN_EXCHANGE_STATES
|
||||||
|
)
|
||||||
|
or (o.ft_is_open is True and o.status is not None)
|
||||||
|
]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def nr_of_successful_entries(self) -> int:
|
def nr_of_successful_entries(self) -> int:
|
||||||
"""
|
"""
|
||||||
|
@ -396,7 +396,7 @@ class Telegram(RPCHandler):
|
|||||||
first_avg = filled_orders[0]["safe_price"]
|
first_avg = filled_orders[0]["safe_price"]
|
||||||
|
|
||||||
for x, order in enumerate(filled_orders):
|
for x, order in enumerate(filled_orders):
|
||||||
if not order['ft_is_entry']:
|
if not order['ft_is_entry'] or order['is_open'] is True:
|
||||||
continue
|
continue
|
||||||
cur_entry_datetime = arrow.get(order["order_filled_date"])
|
cur_entry_datetime = arrow.get(order["order_filled_date"])
|
||||||
cur_entry_amount = order["amount"]
|
cur_entry_amount = order["amount"]
|
||||||
|
Loading…
Reference in New Issue
Block a user