Direct paging improvements

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Remove deprecated `heartbeat.HeartBeat` model/table by @joeyorlando ([#2534](https://github.com/grafana/oncall/pull/2534))
+- Deprecate `/oncall` Slack command, update direct paging functionality by @vadimkerr ([#2537](https://github.com/grafana/oncall/pull/2537))
 
 ## v1.3.12 (2023-07-14)
 

engine/apps/alerts/paging.py

@@ -42,7 +42,7 @@ def _trigger_alert(
         deleted_at=None,
         defaults={
             "author": from_user,
-            "verbal_name": "Direct paging",
+            "verbal_name": f"Direct paging ({team.name if team else 'No'} team)",
         },
     )
     if alert_receive_channel.default_channel_filter is None:
@@ -90,7 +90,7 @@ def _trigger_alert(
     return alert.group
 
 
-def check_user_availability(user: User, team: Team) -> list[dict[str, Any]]:
+def check_user_availability(user: User) -> list[dict[str, Any]]:
     """Check user availability to be paged.
 
     Return a warnings list indicating `error` and any additional related `data`.
@@ -108,7 +108,6 @@ def check_user_availability(user: User, team: Team) -> list[dict[str, Any]]:
     schedules = OnCallSchedule.objects.filter(
         Q(cached_ical_file_primary__contains=user.username) | Q(cached_ical_file_primary__contains=user.email),
         organization=user.organization,
-        team=team,
     )
     schedules_data = {}
     for s in schedules:

engine/apps/alerts/tests/test_paging.py

@@ -70,7 +70,7 @@ def test_check_user_availability_no_policies(make_organization, make_user_for_or
     organization = make_organization()
     user = make_user_for_organization(organization)
 
-    warnings = check_user_availability(user, None)
+    warnings = check_user_availability(user)
     assert warnings == [
         {"data": {}, "error": USER_HAS_NO_NOTIFICATION_POLICY},
         {"data": {"schedules": {}}, "error": USER_IS_NOT_ON_CALL},
@@ -95,40 +95,12 @@ def test_check_user_availability_not_on_call(
         make_schedule, make_on_call_shift, organization, None, other_user, extra_users=[user]
     )
 
-    warnings = check_user_availability(user, None)
+    warnings = check_user_availability(user)
     assert warnings == [
         {"data": {"schedules": {schedule.name: {other_user.public_primary_key}}}, "error": USER_IS_NOT_ON_CALL},
     ]
 
 
-@pytest.mark.django_db
-def test_check_user_availability_on_call_different_team(
-    make_organization,
-    make_team,
-    make_user_for_organization,
-    make_user_notification_policy,
-    make_schedule,
-    make_on_call_shift,
-):
-    organization = make_organization()
-    some_team = make_team(organization)
-    user = make_user_for_organization(organization)
-    make_user_notification_policy(
-        user=user,
-        step=UserNotificationPolicy.Step.NOTIFY,
-        notify_by=UserNotificationPolicy.NotificationChannel.SMS,
-    )
-
-    # setup on call schedule
-    # user is on call, but on a different team
-    setup_always_on_call_schedule(make_schedule, make_on_call_shift, organization, some_team, user)
-
-    warnings = check_user_availability(user, None)
-    assert warnings == [
-        {"data": {"schedules": {}}, "error": USER_IS_NOT_ON_CALL},
-    ]
-
-
 @pytest.mark.django_db
 def test_check_user_availability_on_call(
     make_organization,
@@ -150,7 +122,7 @@ def test_check_user_availability_on_call(
     # setup on call schedule
     setup_always_on_call_schedule(make_schedule, make_on_call_shift, organization, some_team, user)
 
-    warnings = check_user_availability(user, some_team)
+    warnings = check_user_availability(user)
     assert warnings == []
 
 

engine/apps/api/serializers/paging.py

@@ -49,7 +49,7 @@ class DirectPagingSerializer(serializers.Serializer):
     alert_group = serializers.HiddenField(default=None)  # set in DirectPagingSerializer.validate
 
     title = serializers.CharField(required=False, default=None)
-    message = serializers.CharField(required=False, default=None)
+    message = serializers.CharField(required=False, default=None, allow_null=True)
 
     team = TeamPrimaryKeyRelatedField(allow_null=True, default=CurrentTeamDefault())
 

engine/apps/api/views/user.py

@@ -647,7 +647,7 @@ def export_token(self, request, pk):
     @action(detail=True, methods=["get"])
     def check_availability(self, request, pk):
         user = self.get_object()
-        warnings = check_user_availability(user=user, team=request.user.current_team)
+        warnings = check_user_availability(user=user)
         return Response(data={"warnings": warnings}, status=status.HTTP_200_OK)
 
 

engine/apps/slack/scenarios/manual_incident.py

@@ -20,6 +20,7 @@
 class StartCreateIncidentFromSlashCommand(scenario_step.ScenarioStep):
     """
     StartCreateIncidentFromSlashCommand triggers creation of a manual incident from the slack message via slash command
+    THIS FEATURE IS DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE
     """
 
     command_name = [settings.SLACK_SLASH_COMMAND_NAME]
@@ -232,6 +233,18 @@ def process_scenario(self, slack_user_identity, slack_team_identity, payload):
 
 
 def _get_manual_incident_form_view(routing_uid, blocks, private_metatada):
+    deprecation_blocks = [
+        {
+            "type": "header",
+            "text": {
+                "type": "plain_text",
+                "text": f":no_entry: This command is deprecated and will be removed soon. Please use {settings.SLACK_DIRECT_PAGING_SLASH_COMMAND} command instead :no_entry:",
+                "emoji": True,
+            },
+        },
+        {"type": "divider"},
+    ]
+
     view = {
         "type": "modal",
         "callback_id": routing_uid,
@@ -248,7 +261,7 @@ def _get_manual_incident_form_view(routing_uid, blocks, private_metatada):
             "type": "plain_text",
             "text": "Submit",
         },
-        "blocks": blocks,
+        "blocks": deprecation_blocks + blocks,
         "private_metadata": private_metatada,
     }