Merge pull request openedx#18598 from edx/refactor-code-of-LEARNER-5257

Refactor Code for LEARNER-5257
alangsto · Jul 17, 2018 · 4b4a863 · 4b4a863
2 parents f89da03 + 0c61074
commit 4b4a863
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/common/djangoapps/student/signals/signals.py b/common/djangoapps/student/signals/signals.py
@@ -7,4 +7,4 @@
 UNENROLL_DONE = Signal(providing_args=["course_enrollment", "skip_refund"])
 ENROLL_STATUS_CHANGE = Signal(providing_args=["event", "user", "course_id", "mode", "cost", "currency"])
 REFUND_ORDER = Signal(providing_args=["course_enrollment"])
-SAILTHRU_AUDIT_PURCHASE = Signal(providing_args=["event", "user", "course_id", "mode"])
+SAILTHRU_AUDIT_PURCHASE = Signal(providing_args=["user", "course_id", "mode"])
diff --git a/lms/djangoapps/commerce/api/v0/views.py b/lms/djangoapps/commerce/api/v0/views.py
@@ -143,7 +143,7 @@ def post(self, request, *args, **kwargs):
             self._enroll(course_key, user, default_enrollment_mode.slug)
             mode = CourseMode.AUDIT if audit_mode else CourseMode.HONOR
             SAILTHRU_AUDIT_PURCHASE.send(
-                sender=None, event='enroll', user=user, mode=mode, course_id=course_key
+                sender=None, user=user, mode=mode, course_id=course_id
             )
             self._handle_marketing_opt_in(request, course_key, user)
             return DetailResponse(msg)

diff --git a/lms/djangoapps/email_marketing/signals.py b/lms/djangoapps/email_marketing/signals.py
@@ -41,7 +41,7 @@
 
 
 @receiver(SAILTHRU_AUDIT_PURCHASE)
-def update_sailthru(sender, event, user, mode, course_id, **kwargs):
+def update_sailthru(sender, user, mode, course_id, **kwargs):  # pylint: disable=unused-argument
     """
     Receives signal and calls a celery task to update the
     enrollment track
@@ -52,9 +52,8 @@ def update_sailthru(sender, event, user, mode, course_id, **kwargs):
         None
     """
     if WAFFLE_SWITCHES.is_enabled(SAILTHRU_AUDIT_PURCHASE_ENABLED) and mode in CourseMode.AUDIT_MODES:
-        course_key = course_id
         email = str(user.email)
-        update_course_enrollment.delay(email, course_key, mode)
+        update_course_enrollment.delay(email, course_id, mode)
 
 
 @receiver(CREATE_LOGON_COOKIE)

diff --git a/lms/djangoapps/email_marketing/tests/test_signals.py b/lms/djangoapps/email_marketing/tests/test_signals.py
@@ -716,7 +716,7 @@ def test_update_course_enrollment(self, mock_sailthru_api_post,
     @patch('sailthru.sailthru_client.SailthruClient.purchase')
     def test_switch_is_disabled(self, mock_sailthru_purchase):
         """Make sure sailthru purchase is not called when waffle switch is disabled"""
-        update_sailthru(None, None, self.user, 'verified', self.course_id)
+        update_sailthru(None, self.user, 'verified', self.course_id)
         self.assertFalse(mock_sailthru_purchase.called)
 
     @patch('openedx.core.djangoapps.waffle_utils.WaffleSwitchNamespace.is_enabled')
@@ -726,5 +726,5 @@ def test_purchase_is_not_invoked(self, mock_sailthru_purchase, switch):
             i: waffle switch is True and mode is verified
         """
         switch.return_value = True
-        update_sailthru(None, None, self.user, 'verified', self.course_id)
+        update_sailthru(None, self.user, 'verified', self.course_id)
         self.assertFalse(mock_sailthru_purchase.called)