refactoring

Author: asadali145

src/ol_openedx_course_sync/__init__.py

@@ -2,5 +2,4 @@
 ol-openedx-course-sync plugin
 """
 
-__version__ = 0.1
 default_app_config = "ol_openedx_course_sync.apps.OLOpenEdxCourseSyncConfig"

src/ol_openedx_course_sync/admin.py

@@ -12,6 +12,7 @@ class CourseSyncParentOrgAdmin(admin.ModelAdmin):
 
 class CourseSyncMapAdmin(admin.ModelAdmin):
     list_display = ("source_course", "target_courses")
+    search_fields = ("source_course", "target_courses")
 
 
 admin.site.register(CourseSyncParentOrg, CourseSyncParentOrgAdmin)

src/ol_openedx_course_sync/constants.py

@@ -0,0 +1,4 @@
+"""
+Constants for ol-openedx-course-sync plugin
+"""
+COURSE_RERUN_STATE_SUCCEEDED = "succeeded"

src/ol_openedx_course_sync/signals.py

@@ -7,9 +7,11 @@
 from common.djangoapps.course_action_state.models import CourseRerunState
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from xmodule.modulestore.django import SignalHandler
+
 from ol_openedx_course_sync.models import CourseSyncMap, CourseSyncParentOrg
 from ol_openedx_course_sync.tasks import async_course_sync
-from xmodule.modulestore.django import SignalHandler
+from ol_openedx_course_sync.constants import COURSE_RERUN_STATE_SUCCEEDED
 
 log = logging.getLogger(__name__)
 
@@ -32,23 +34,23 @@ def listen_for_course_publish(
         return
 
     source_course = str(course_sync_map.source_course)
-    user_id = 2
+    user_id = None
     for target_course_key in course_sync_map.target_courses.split(","):
         log.info(
             "Initializing async course content sync from %s to %s",
             source_course,
             target_course_key,
         )
         # Call the async task to copy the course content
-        async_course_sync.delay(user_id, source_course, target_course_key)
+        async_course_sync(user_id, source_course, target_course_key)
 
 
 @receiver(post_save, sender=CourseRerunState)
 def listen_for_course_rerun_state_post_save(sender, instance, **kwargs):  # noqa: ARG001
     """
     Listen for `CourseRerunState` post_save and update target courses in `CourseSyncMap`
     """
-    if instance.state != "succeeded":
+    if instance.state != COURSE_RERUN_STATE_SUCCEEDED:
         return
 
     if not CourseSyncParentOrg.objects.filter(

src/ol_openedx_course_sync/tasks.py

@@ -9,21 +9,31 @@
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import SignalHandler
 
-LOGGER = get_task_logger(__name__)
+logger = get_task_logger(__name__)
 
 
-@shared_task
+# @shared_task
 def async_course_sync(user_id, source_course_id, dest_course_id):
     """
     Sync course content from source course to destination course.
     """
+    logger.debug(
+        "Starting async course sync from %s to %s", source_course_id, dest_course_id
+    )
     source_course_key = CourseLocator.from_string(source_course_id)
     dest_course_key = CourseLocator.from_string(dest_course_id)
 
+    logger.debug(
+        "Copying draft course content from %s to %s", source_course_key, dest_course_key
+    )
     # Copy draft branch content
     copy_course_content(
         user_id, source_course_key, dest_course_key, ModuleStoreEnum.BranchName.draft
     )
+
+    logger.debug(
+        "Copying published course content from %s to %s", source_course_key, dest_course_key
+    )
     # copy published branch content
     copy_course_content(
         user_id,
@@ -34,3 +44,6 @@ def async_course_sync(user_id, source_course_id, dest_course_id):
 
     # trigger course publish signal to trigger outline and relevant updates
     SignalHandler.course_published.send(sender=None, course_key=dest_course_key)
+    logger.debug(
+        "Finished async course sync from %s to %s", source_course_key, dest_course_key
+    )