Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Refactor Code for LEARNER-5257
This commit is contained in:
Uzair Rasheed
2018-07-17 20:24:27 +05:00
committed by GitHub
parent f89da03922 0c610749c9
commit 4b4a8632bb
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/student/signals/signals.py
View File

@@ -7,4 +7,4 @@ ENROLLMENT_TRACK_UPDATED = Signal(providing_args=['user', 'course_key'])
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"])

2
lms/djangoapps/commerce/api/v0/views.py
View File

@@ -143,7 +143,7 @@ class BasketsView(APIView):
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)

5
lms/djangoapps/email_marketing/signals.py
View File

@@ -41,7 +41,7 @@ SAILTHRU_AUDIT_PURCHASE_ENABLED = 'audit_purchase_enabled'
@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)

4
lms/djangoapps/email_marketing/tests/test_signals.py
View File

@@ -716,7 +716,7 @@ class SailthruTests(TestCase):
@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 @@ class SailthruTests(TestCase):
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)