Move MessageType definitions into message_types.py

openedx/core/djangoapps/schedules/message_types.py

@@ -9,3 +9,17 @@ class ScheduleMessageType(MessageType):
     def __init__(self, *args, **kwargs):
         super(ScheduleMessageType, self).__init__(*args, **kwargs)
         self.log_level = logging.DEBUG if DEBUG_MESSAGE_WAFFLE_FLAG.is_enabled() else None
+
+
+class RecurringNudge(ScheduleMessageType):
+    def __init__(self, day, *args, **kwargs):
+        super(RecurringNudge, self).__init__(*args, **kwargs)
+        self.name = "recurringnudge_day{}".format(day)
+
+
+class UpgradeReminder(ScheduleMessageType):
+    pass
+
+
+class CourseUpdate(ScheduleMessageType):
+    pass

openedx/core/djangoapps/schedules/tasks.py

@@ -17,10 +17,9 @@ from edx_ace.utils.date import deserialize, serialize
 from opaque_keys.edx.keys import CourseKey
 
 from openedx.core.djangoapps.monitoring_utils import set_custom_metric
-
+from openedx.core.djangoapps.schedules import message_types
 from openedx.core.djangoapps.schedules.models import Schedule, ScheduleConfig
 from openedx.core.djangoapps.schedules import resolvers
-from openedx.core.djangoapps.schedules.message_type import ScheduleMessageType
 from openedx.core.djangoapps.site_configuration.models import SiteConfiguration
 
 
@@ -168,12 +167,6 @@ def _recurring_nudge_schedule_send(site_id, msg_str):
     ace.send(msg)
 
 
-class RecurringNudge(ScheduleMessageType):
-    def __init__(self, day, *args, **kwargs):
-        super(RecurringNudge, self).__init__(*args, **kwargs)
-        self.name = "recurringnudge_day{}".format(day)
-
-
 class ScheduleRecurringNudge(ScheduleMessageBaseTask):
     num_bins = resolvers.RECURRING_NUDGE_NUM_BINS
     enqueue_config_var = 'enqueue_recurring_nudge'
@@ -182,7 +175,7 @@ class ScheduleRecurringNudge(ScheduleMessageBaseTask):
     async_send_task = _recurring_nudge_schedule_send
 
     def make_message_type(self, day_offset):
-        return RecurringNudge(abs(day_offset))
+        return message_types.RecurringNudge(abs(day_offset))
 
 
 @task(ignore_result=True, routing_key=ROUTING_KEY)
@@ -199,10 +192,6 @@ def _upgrade_reminder_schedule_send(site_id, msg_str):
     ace.send(msg)
 
 
-class UpgradeReminder(ScheduleMessageType):
-    pass
-
-
 class ScheduleUpgradeReminder(ScheduleMessageBaseTask):
     num_bins = resolvers.UPGRADE_REMINDER_NUM_BINS
     enqueue_config_var = 'enqueue_upgrade_reminder'
@@ -211,7 +200,7 @@ class ScheduleUpgradeReminder(ScheduleMessageBaseTask):
     async_send_task = _upgrade_reminder_schedule_send
 
     def make_message_type(self, day_offset):
-        return UpgradeReminder()
+        return message_types.UpgradeReminder()
 
 
 
@@ -229,10 +218,6 @@ def _course_update_schedule_send(site_id, msg_str):
     ace.send(msg)
 
 
-class CourseUpdate(ScheduleMessageType):
-    pass
-
-
 class ScheduleCourseUpdate(ScheduleMessageBaseTask):
     num_bins = resolvers.COURSE_UPDATE_NUM_BINS
     enqueue_config_var = 'enqueue_course_update'
@@ -241,4 +226,4 @@ class ScheduleCourseUpdate(ScheduleMessageBaseTask):
     async_send_task = _course_update_schedule_send
 
     def make_message_type(self, day_offset):
-        return CourseUpdate()
+        return message_types.CourseUpdate()