From f821ef5aec8fb8321b75bfbe9ab33e0eed380ef5 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Tue, 20 Apr 2021 19:36:30 +0200
Subject: [PATCH] Final finetunings of rpc_fill messages

---
 freqtrade/rpc/telegram.py      |  2 +-
 tests/conftest.py              |  3 ++-
 tests/rpc/test_rpc_telegram.py | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index 778baea3c..ffe7a7ceb 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -242,7 +242,7 @@ class Telegram(RPCHandler):
                        "Cancelling open {message_side} Order for {pair} (#{trade_id}). "
                        "Reason: {reason}.".format(**msg))
 
-        elif msg['type'] == (RPCMessageType.BUY_FILL, RPCMessageType.SELL_FILL):
+        elif msg['type'] in (RPCMessageType.BUY_FILL, RPCMessageType.SELL_FILL):
             msg['message_side'] = 'Buy' if msg['type'] == RPCMessageType.BUY_FILL else 'Sell'
 
             message = ("\N{LARGE CIRCLE} *{exchange}:* "
diff --git a/tests/conftest.py b/tests/conftest.py
index cc4fe91f0..788586134 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -314,7 +314,8 @@ def get_default_conf(testdatadir):
         "telegram": {
             "enabled": True,
             "token": "token",
-            "chat_id": "0"
+            "chat_id": "0",
+            "notification_settings": {},
         },
         "datadir": str(testdatadir),
         "initial_state": "running",
diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py
index 718c1d3a0..d72ba36ad 100644
--- a/tests/rpc/test_rpc_telegram.py
+++ b/tests/rpc/test_rpc_telegram.py
@@ -1254,6 +1254,25 @@ def test_send_msg_buy_cancel_notification(default_conf, mocker) -> None:
             'Reason: cancelled due to timeout.')
 
 
+def test_send_msg_buy_fill_notification(default_conf, mocker) -> None:
+
+    default_conf['telegram']['notification_settings']['buy_fill'] = 'on'
+    telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)
+
+    telegram.send_msg({
+        'type': RPCMessageType.BUY_FILL,
+        'trade_id': 1,
+        'exchange': 'Binance',
+        'pair': 'ETH/USDT',
+        'open_rate': 200,
+        'stake_amount': 100,
+        'amount': 0.5,
+        'open_date': arrow.utcnow().datetime
+    })
+    assert (msg_mock.call_args[0][0] == '\N{LARGE CIRCLE} *Binance:* '
+            'Buy order for ETH/USDT (#1) filled for 200.')
+
+
 def test_send_msg_sell_notification(default_conf, mocker) -> None:
 
     telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)