add types.py

Author: vstpme

engine/apps/mobile_app/demo_push.py

@@ -6,14 +6,8 @@
 from firebase_admin.messaging import APNSPayload, Aps, ApsAlert, CriticalSound, Message
 
 from apps.mobile_app.exceptions import DeviceNotSet
-from apps.mobile_app.tasks import (
-    FCMMessageData,
-    MessageType,
-    Platform,
-    _construct_fcm_message,
-    _send_push_notification,
-    logger,
-)
+from apps.mobile_app.tasks import _construct_fcm_message, _send_push_notification, logger
+from apps.mobile_app.types import FCMMessageData, MessageType, Platform
 from apps.user_management.models import User
 
 if typing.TYPE_CHECKING:

engine/apps/mobile_app/models.py

@@ -10,7 +10,7 @@
 
 from apps.auth_token import constants, crypto
 from apps.auth_token.models import BaseAuthToken
-from apps.mobile_app.tasks import MessageType, Platform
+from apps.mobile_app.types import MessageType, Platform
 
 if typing.TYPE_CHECKING:
     from apps.user_management.models import Organization, User

engine/apps/mobile_app/tasks.py

@@ -3,7 +3,6 @@
 import logging
 import math
 import typing
-from enum import StrEnum
 
 import humanize
 import pytz
@@ -20,6 +19,7 @@
 from apps.alerts.models import AlertGroup
 from apps.base.utils import live_settings
 from apps.mobile_app.alert_rendering import get_push_notification_subtitle
+from apps.mobile_app.types import FCMMessageData, MessageType, Platform
 from apps.schedules.models import ShiftSwapRequest
 from apps.schedules.models.on_call_schedule import OnCallSchedule, ScheduleEvent
 from apps.user_management.models import User
@@ -36,23 +36,6 @@
 logger.setLevel(logging.DEBUG)
 
 
-class MessageType(StrEnum):
-    DEFAULT = "oncall.message"
-    IMPORTANT = "oncall.critical_message"
-    INFO = "oncall.info"
-
-
-class Platform(StrEnum):
-    ANDROID = "android"
-    IOS = "ios"
-
-
-class FCMMessageData(typing.TypedDict):
-    title: str
-    subtitle: typing.Optional[str]
-    body: typing.Optional[str]
-
-
 def send_push_notification_to_fcm_relay(message: Message) -> requests.Response:
     """
     Send push notification to FCM relay on cloud instance: apps.mobile_app.fcm_relay.FCMRelayView

engine/apps/mobile_app/tests/test_user_settings.py

@@ -4,7 +4,7 @@
 from rest_framework.test import APIClient
 
 from apps.mobile_app.models import MobileAppUserSettings
-from apps.mobile_app.tasks import MessageType, Platform
+from apps.mobile_app.types import MessageType, Platform
 
 
 @pytest.mark.django_db

engine/apps/mobile_app/tests/test_your_going_oncall_notification.py

@@ -8,7 +8,7 @@
 
 from apps.mobile_app import tasks
 from apps.mobile_app.models import FCMDevice, MobileAppUserSettings
-from apps.mobile_app.tasks import MessageType, Platform
+from apps.mobile_app.types import MessageType, Platform
 from apps.schedules.models import OnCallScheduleCalendar, OnCallScheduleICal, OnCallScheduleWeb
 from apps.schedules.models.on_call_schedule import ScheduleEvent
 
@@ -248,7 +248,7 @@ def test_get_youre_going_oncall_fcm_message(
     mock_get_youre_going_oncall_notification_title.assert_called_once_with(seconds_until_going_oncall)
 
     mock_construct_fcm_message.assert_called_once_with(
-        tasks.MessageType.INFO, device, notification_thread_id, data, mock_apns_payload.return_value
+        MessageType.INFO, device, notification_thread_id, data, mock_apns_payload.return_value
     )
 
 

engine/apps/mobile_app/types.py

@@ -0,0 +1,19 @@
+import typing
+from enum import StrEnum
+
+
+class MessageType(StrEnum):
+    DEFAULT = "oncall.message"
+    IMPORTANT = "oncall.critical_message"
+    INFO = "oncall.info"
+
+
+class Platform(StrEnum):
+    ANDROID = "android"
+    IOS = "ios"
+
+
+class FCMMessageData(typing.TypedDict):
+    title: str
+    subtitle: typing.Optional[str]
+    body: typing.Optional[str]