From 0605cbb06eb26b4a879727447f2f76ea5fcd5232 Mon Sep 17 00:00:00 2001 From: Eugene Schava Date: Tue, 22 Jun 2021 12:20:12 +0300 Subject: [PATCH 1/3] make "/profit N" command output be consistent with "/daily" and "/status table" commands --- freqtrade/rpc/rpc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 2a7721af0..296793930 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -339,7 +339,10 @@ class RPC: self, stake_currency: str, fiat_display_currency: str, start_date: datetime = datetime.fromtimestamp(0)) -> Dict[str, Any]: """ Returns cumulative profit statistics """ - trades = Trade.get_trades([Trade.open_date >= start_date]).order_by(Trade.id).all() + trade_filter = \ + (Trade.is_open.is_(False) & (Trade.close_date >= start_date)) | \ + Trade.is_open.is_(True) + trades = Trade.get_trades(trade_filter).order_by(Trade.id).all() profit_all_coin = [] profit_all_ratio = [] From e97c82c51490b6c915da417c74abc1a6a484913b Mon Sep 17 00:00:00 2001 From: Eugene Schava Date: Tue, 22 Jun 2021 12:22:19 +0300 Subject: [PATCH 2/3] make "/profit N" command output be consistent with "/daily" and "/status table" commands --- freqtrade/rpc/rpc.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 296793930..b155de673 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -339,9 +339,8 @@ class RPC: self, stake_currency: str, fiat_display_currency: str, start_date: datetime = datetime.fromtimestamp(0)) -> Dict[str, Any]: """ Returns cumulative profit statistics """ - trade_filter = \ - (Trade.is_open.is_(False) & (Trade.close_date >= start_date)) | \ - Trade.is_open.is_(True) + trade_filter = ((Trade.is_open.is_(False) & (Trade.close_date >= start_date)) | + Trade.is_open.is_(True)) trades = Trade.get_trades(trade_filter).order_by(Trade.id).all() profit_all_coin = [] From 3c70768e18dd43d6ac96790c36e7f9382d53071a Mon Sep 17 00:00:00 2001 From: Eugene Schava Date: Wed, 23 Jun 2021 07:30:08 +0300 Subject: [PATCH 3/3] make "/profit N" command output be consistent with "/daily" and "/status table" commands --- freqtrade/rpc/telegram.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 6cb48aef1..16c9fddcc 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -482,7 +482,7 @@ class Telegram(RPCHandler): timescale = None try: if context.args: - timescale = int(context.args[0]) + timescale = int(context.args[0]) - 1 today_start = datetime.combine(date.today(), datetime.min.time()) start_date = today_start - timedelta(days=timescale) except (TypeError, ValueError, IndexError):