0c96427cfc
# What this PR does It _appears_ like Telegram may have changed one of the error messages they return for `telegram.error.BadRequest`. This _may_ be causing us to infinitely retry some of these tasks. Previously we were checking for two variants of the same type of error message: - "Message to reply not found" - "Replied message not found" _However_, if I search for the following [in the logs](https://ops.grafana-ops.net/goto/hMgBb8CSR?orgId=1): ```logql {namespace="amixr-prod"} |~ `(Message to be replied not found|Message to reply not found|Replied message not found)` ```` I _only_ see references to "Message to be replied not found". I have updated references to the former to this new error log message we are seeing. Also: - deduplicate some of the words we check for in `telegram.error.BadRequest` and `telegram.error.Unauthorized` into `apps.telegram.client.TelegramClient.BadRequestMessage` and `apps.telegram.client.TelegramClient.UnauthorizedMessage` respectively - deduplicate some of the wording we use in the `reason` arg passed to `TelegramToUserConnector.create_telegram_notification_error` into `apps.telegram.models.connectors.personal.TelegramToUserConnector.NotificationErrorReason` - standardize how we check the `message` attribute of `telegram.error.TelegramError`s into a new `error_message_is` static method on `apps.telegram.client.TelegramClient` - previously we would check these error messages in two different ways: ```python3 # style 1 if "error message to check" in e.message: # do something # style 2 if error.message == "error message to check": # do something ``` ## Which issue(s) this PR closes Closes https://github.com/grafana/oncall-private/issues/2868 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] Added the relevant release notes label (see labels prefixed w/ `release:`). These labels dictate how your PR will show up in the autogenerated release notes.
49 lines
1.8 KiB
Python
49 lines
1.8 KiB
Python
from unittest.mock import patch
|
|
|
|
import pytest
|
|
from telegram import error
|
|
|
|
from apps.telegram.client import TelegramClient
|
|
from apps.telegram.models import TelegramMessage
|
|
from apps.telegram.tasks import send_log_and_actions_message
|
|
|
|
bad_request_error_msg = TelegramClient.BadRequestMessage.MESSAGE_TO_BE_REPLIED_NOT_FOUND
|
|
|
|
|
|
@patch.object(TelegramClient, "send_raw_message", side_effect=error.BadRequest(bad_request_error_msg))
|
|
@pytest.mark.django_db
|
|
def test_send_log_and_actions_replied_message_not_found(
|
|
mock_send_message,
|
|
make_organization_and_user,
|
|
make_telegram_user_connector,
|
|
make_alert_receive_channel,
|
|
make_alert_group,
|
|
make_alert,
|
|
make_telegram_message,
|
|
caplog,
|
|
):
|
|
# set up a user with Telegram account connected
|
|
organization, user = make_organization_and_user()
|
|
make_telegram_user_connector(user)
|
|
|
|
# create an alert group with an existing Telegram message in user's DM
|
|
alert_receive_channel = make_alert_receive_channel(organization)
|
|
alert_group = make_alert_group(alert_receive_channel)
|
|
make_alert(alert_group=alert_group, raw_request_data=alert_receive_channel.config.example_payload)
|
|
telegram_message = make_telegram_message(
|
|
alert_group=alert_group,
|
|
message_type=TelegramMessage.PERSONAL_MESSAGE,
|
|
chat_id=str(user.telegram_connection.telegram_chat_id),
|
|
message_id=123,
|
|
)
|
|
|
|
reply_to_message_id = 321
|
|
send_log_and_actions_message(
|
|
telegram_message.chat_id, "group_chat_id", telegram_message.message_id, reply_to_message_id
|
|
)
|
|
|
|
expected_msg = (
|
|
f"Could not send log and actions messages to Telegram group with id group_chat_id "
|
|
f"due to '{bad_request_error_msg}'. alert_group {alert_group.pk}"
|
|
)
|
|
assert expected_msg in caplog.text
|