feat: incorporate changes in 8.7.0 and add signal hander

edx · Oct 2, 2023 · 7617f3b · 7617f3b
1 parent 267dc5f
commit 7617f3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/edx_exams/apps/core/signals/handlers.py b/edx_exams/apps/core/signals/handlers.py
@@ -2,12 +2,21 @@
 Signal handlers for the edx-exams application.
 """
 from django.dispatch import receiver
+<<<<<<< HEAD
 from openedx_events.event_bus import get_producer
 from openedx_events.learning.signals import EXAM_ATTEMPT_SUBMITTED
 
 
 @receiver(EXAM_ATTEMPT_SUBMITTED)
 def listen_for_exam_attempt_submitted(sender, signal, **kwargs):  # pylint: disable=unused-argument
+=======
+
+from openedx_events.event_bus import get_producer
+from openedx_events.learning.signals import EXAM_ATTEMPT_SUBMITTED
+
+@receiver(EXAM_ATTEMPT_SUBMITTED)
+def listen_for_exam_attempt_submitted(sender, signal, **kwargs):
+>>>>>>> d324b9d (feat: incorporate changes in 8.7.0 and add signal hander)
     """
     Publish EXAM_ATTEMPT_SUBMITTED signals onto the event bus.
     """

diff --git a/edx_exams/apps/core/signals/signals.py b/edx_exams/apps/core/signals/signals.py
@@ -7,10 +7,14 @@
 
 
 def emit_exam_attempt_submitted_event(user, course_key, usage_key, exam_type):
+<<<<<<< HEAD
     """
     Emit the EXAM_ATTEMPT_SUBMITTED Open edX event.
     """
     name = user.full_name or ''
+=======
+    name=user.full_name or ''
+>>>>>>> d324b9d (feat: incorporate changes in 8.7.0 and add signal hander)
     user_data = UserData(
         id=user.id,
         is_active=user.is_active,