From 80f85cf4b46a98a0d5c1f20f739133e4c3228723 Mon Sep 17 00:00:00 2001
From: Vadim Stepanov <vadimkerr@gmail.com>
Date: Mon, 15 Jan 2024 17:36:01 +0000
Subject: [PATCH] Fix updating a shift swap with no Slack message (#3686)

# What this PR does

Fixes https://github.com/grafana/oncall/issues/3648

## 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] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)

---------

Co-authored-by: Joey Orlando <joey.orlando@grafana.com>
---
 CHANGELOG.md                                        |  4 ++++
 engine/apps/slack/scenarios/shift_swap_requests.py  |  3 +++
 .../test_scenario_steps/test_shift_swap_requests.py | 13 +++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b372914..c4b9e05d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fix updating a shift swap with no Slack message by @vadimkerr ([#3686](https://github.com/grafana/oncall/pull/3686))
+
 ## v1.3.87 (2024-01-15)
 
 ### Fixed
diff --git a/engine/apps/slack/scenarios/shift_swap_requests.py b/engine/apps/slack/scenarios/shift_swap_requests.py
index b7ffcf86..0cbd7f79 100644
--- a/engine/apps/slack/scenarios/shift_swap_requests.py
+++ b/engine/apps/slack/scenarios/shift_swap_requests.py
@@ -165,6 +165,9 @@ class BaseShiftSwapRequestStep(scenario_step.ScenarioStep):
         )
 
     def update_message(self, shift_swap_request: "ShiftSwapRequest") -> None:
+        if not shift_swap_request.slack_message:
+            return
+
         self._slack_client.chat_update(
             channel=shift_swap_request.slack_channel_id,
             ts=shift_swap_request.slack_message.slack_id,
diff --git a/engine/apps/slack/tests/test_scenario_steps/test_shift_swap_requests.py b/engine/apps/slack/tests/test_scenario_steps/test_shift_swap_requests.py
index df91ae47..0ffe428a 100644
--- a/engine/apps/slack/tests/test_scenario_steps/test_shift_swap_requests.py
+++ b/engine/apps/slack/tests/test_scenario_steps/test_shift_swap_requests.py
@@ -183,6 +183,19 @@ class TestBaseShiftSwapRequestStep:
                 channel=ssr.slack_channel_id, ts=ts, blocks=mock_generate_blocks.return_value
             )
 
+    @patch("apps.slack.scenarios.shift_swap_requests.BaseShiftSwapRequestStep._generate_blocks")
+    @pytest.mark.django_db
+    def test_update_message_no_slack_message(self, mock_generate_blocks, setup, make_slack_message) -> None:
+        ssr, _, _, _ = setup()  # SSR without a Slack message
+        organization = ssr.organization
+        slack_team_identity = organization.slack_team_identity
+
+        step = scenarios.BaseShiftSwapRequestStep(slack_team_identity, organization)
+
+        with patch.object(step, "_slack_client") as mock_slack_client:
+            step.update_message(ssr)
+            mock_slack_client.chat_update.assert_not_called()
+
     @pytest.mark.django_db
     def test_post_message_to_thread(self, setup, make_slack_message) -> None:
         ts = "12345.67"