fix: duplicate external id

README.md

@@ -37,6 +37,7 @@ Your One-Stop-Shop for setting up rotating :calendar: schedules.
 * Copy & paste app_manifest.yml
 ![Image of creating a slack app](https://github.com/Germandrummer92/SchedSlackBot/raw/main/assets/slack_bot_creation.png "Creating a Slack bot")
 * Adjust the request url to something valid (either ngrok or already final k8s deployment url) (you can change it later)
+* Make sure the url is verified in the App Manifest section. (it should have the prefix /slack/events)
 * Install to your workspace
 ![Image of installing the slack bot](https://github.com/Germandrummer92/SchedSlackBot/raw/main/assets/install.png "Installing the Slack bot")
 * Copy the Slack_Bot_Token and Slack_Signing_Secret for local development or deployment

sched_slack_bot/model/schedule.py

@@ -10,6 +10,7 @@
 from sched_slack_bot.utils.slack_typing_stubs import SlackState, SlackBody
 from sched_slack_bot.views.schedule_dialog_block_ids import (
     DISPLAY_NAME_BLOCK_ID,
+    SHEDULE_VIEW_ID_SCHEDULE_ID_DELIMITER,
     USERS_INPUT_BLOCK_ID,
     CHANNEL_INPUT_BLOCK_ID,
     DatetimeSelectorType,
@@ -144,13 +145,16 @@ def from_modal_submission(cls, submission_body: SlackBody) -> Schedule:
             state=state, date_input_block_ids=get_datetime_block_ids(label=SECOND_ROTATION_LABEL)
         )
 
-        time_between_rotations = second_rotation - next_rotation
+        time_between_rotations = abs(second_rotation - next_rotation)
 
         schedule_id = submission_body["view"]["external_id"]
 
-        if schedule_id == CREATE_NEW_SCHEDULE_VIEW_ID:
+        if schedule_id.startswith(CREATE_NEW_SCHEDULE_VIEW_ID):
             schedule_id = str(uuid.uuid4())
 
+        if SHEDULE_VIEW_ID_SCHEDULE_ID_DELIMITER in schedule_id:
+            schedule_id = schedule_id.split(SHEDULE_VIEW_ID_SCHEDULE_ID_DELIMITER)[0]
+
         return Schedule(
             id=schedule_id,
             display_name=display_name,

sched_slack_bot/views/schedule_dialog.py

@@ -2,6 +2,7 @@
 
 from enum import StrEnum
 from typing import Optional, Dict
+import uuid
 
 from slack_sdk.models.blocks import (
     HeaderBlock,
@@ -19,6 +20,7 @@
 from sched_slack_bot.views.schedule_dialog_block_ids import (
     DISPLAY_NAME_BLOCK_ID,
     CHANNEL_INPUT_BLOCK_ID,
+    SHEDULE_VIEW_ID_SCHEDULE_ID_DELIMITER,
     USERS_INPUT_BLOCK_ID,
     FIRST_ROTATION_LABEL,
     SECOND_ROTATION_LABEL,
@@ -84,7 +86,9 @@ def get_edit_schedule_block(
     schedule: Optional[Schedule] = None, callback: ScheduleDialogCallback = ScheduleDialogCallback.CREATE_DIALOG
 ) -> View:
     modal_type = CREATE_MODAL_TYPE if schedule is None else EDIT_MODAL_TYPE
+    # make sure external id is unique globally: https://github.com/slackapi/node-slack-sdk/issues/1012#issuecomment-684818059
     external_id = schedule.id if schedule is not None else CREATE_NEW_SCHEDULE_VIEW_ID
+    external_id = f"{external_id}{SHEDULE_VIEW_ID_SCHEDULE_ID_DELIMITER}{str(uuid.uuid4())}"
     return View(
         type="modal",
         external_id=external_id,

sched_slack_bot/views/schedule_dialog_block_ids.py

@@ -11,6 +11,8 @@
 
 CREATE_NEW_SCHEDULE_VIEW_ID = "NEW_DIALOG"
 
+SHEDULE_VIEW_ID_SCHEDULE_ID_DELIMITER = "::"
+
 
 class DatetimeSelectorType(Enum):
     DATE = "DATE"

test_sched_slack_bot/test_controller.py

@@ -151,12 +151,14 @@ def test_handle_clicked_create_opens_create_schedule_dialog(
     schedule: Schedule,
 ) -> None:
     mocked_schedule_access.get_available_schedules.return_value = [schedule]
+    with mock.patch(target="sched_slack_bot.views.schedule_dialog.uuid", return_value="uuid"):
+        ack = mock.MagicMock()
+        controller_with_mocks.handle_clicked_create_schedule(ack=ack, body=slack_body)
 
-    ack = mock.MagicMock()
-    controller_with_mocks.handle_clicked_create_schedule(ack=ack, body=slack_body)
-
-    ack.assert_called_once()
-    mocked_slack_client.views_open.assert_called_once_with(trigger_id=slack_body["trigger_id"], view=get_edit_schedule_block())
+        ack.assert_called_once()
+        mocked_slack_client.views_open.assert_called_once_with(
+            trigger_id=slack_body["trigger_id"], view=get_edit_schedule_block()
+        )
 
 
 @pytest.mark.parametrize(
@@ -194,15 +196,15 @@ def test_handle_clicked_edit_schedule_opens_edit_dialog(
 ) -> None:
     mocked_schedule_access.get_schedule.return_value = schedule
     slack_body["actions"] = [SlackAction(action_id=EDIT_SCHEDULE_ACTION_ID, block_id=schedule.id)]
-
-    ack = mock.MagicMock()
-    controller_with_mocks.handle_clicked_edit_schedule(ack=ack, body=slack_body)
-
-    ack.assert_called_once()
-    mocked_slack_client.views_open.assert_called_once_with(
-        trigger_id=slack_body["trigger_id"],
-        view=get_edit_schedule_block(schedule=schedule, callback=ScheduleDialogCallback.EDIT_DIALOG),
-    )
+    with mock.patch(target="sched_slack_bot.views.schedule_dialog.uuid", return_value="uuid"):
+        ack = mock.MagicMock()
+        controller_with_mocks.handle_clicked_edit_schedule(ack=ack, body=slack_body)
+
+        ack.assert_called_once()
+        mocked_slack_client.views_open.assert_called_once_with(
+            trigger_id=slack_body["trigger_id"],
+            view=get_edit_schedule_block(schedule=schedule, callback=ScheduleDialogCallback.EDIT_DIALOG),
+        )
 
 
 def test_handle_submitted_create_schedule_creates_new_schedule(

test_sched_slack_bot/views/test_schedule_dialog.py

@@ -47,7 +47,8 @@ def test_get_create_schedule_dialog() -> None:
     assert create_block.blocks[0].text is not None
     assert CREATE_MODAL_TYPE in create_block.blocks[0].text.text
 
-    assert create_block.external_id == CREATE_NEW_SCHEDULE_VIEW_ID
+    if create_block.external_id is not None:
+        assert create_block.external_id.startswith(CREATE_NEW_SCHEDULE_VIEW_ID)
 
 
 def test_get_edit_schedule_dialog(schedule: Schedule) -> None:
@@ -59,7 +60,8 @@ def test_get_edit_schedule_dialog(schedule: Schedule) -> None:
     assert create_block.blocks[0].text is not None
     assert EDIT_MODAL_TYPE in create_block.blocks[0].text.text
 
-    assert create_block.external_id == schedule.id
+    if create_block.external_id is not None:
+        assert create_block.external_id.startswith(schedule.id)
 
 
 def test_get_display_name_input_creation() -> None: