Response to CR

common/djangoapps/course_modes/views.py

@@ -17,12 +17,10 @@ from edxmako.shortcuts import render_to_response
 
 from course_modes.models import CourseMode
 from courseware.access import has_access
-from student.models import CourseEnrollment, UserMethods
+from student.models import CourseEnrollment
 from student.views import course_from_id
 from verify_student.models import SoftwareSecurePhotoVerification
 
-EVENT_NAME_USER_CLICKED_UPGRADE = 'edx.user.upgrade.clicked'
-
 
 class ChooseModeView(View):
     """
@@ -39,8 +37,6 @@ class ChooseModeView(View):
 
         enrollment_mode = CourseEnrollment.enrollment_mode_for_user(request.user, course_id)
         upgrade = request.GET.get('upgrade', False)
-        if upgrade == "True":
-            UserMethods.emit_event(request.user, course_id, EVENT_NAME_USER_CLICKED_UPGRADE)
 
         # verified users do not need to register or upgrade
         if enrollment_mode == 'verified':

common/djangoapps/student/models.py

@@ -16,12 +16,6 @@ import json
 import logging
 import uuid
 
-import crum
-
-from track import contexts
-from track.views import server_track
-from eventtracking import tracker
-
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.auth.signals import user_logged_in, user_logged_out

common/djangoapps/student/tests/tests.py

@@ -340,14 +340,7 @@ class EnrollInCourseTest(TestCase):
             user=user,
             course_id=course_id
         )
-
-    def test_user_emitted_events(self):
-        user = User.objects.create_user("joe", "joe@joe.com", "password")
-        course_id = "edX/Test101/2013"
-        course_id_partial = "edX/Test101"
-        with patch('eventtracking.tracker.get_tracker', side_effect=Exception):
-            UserMethods.emit_event(user, course_id, "fake")
-        self.assertTrue(True)
+        self.assertFalse(enrollment_record.is_active)
 
         # Make sure mode is updated properly if user unenrolls & re-enrolls
         enrollment = CourseEnrollment.enroll(user, course_id, "verified")

common/djangoapps/track/contexts.py

@@ -57,13 +57,3 @@ def course_context_from_course_id(course_id):
             )
 
     return context
-
-
-def user_context(user):
-    """
-    Creates a user context from `user`
-    """
-    context = {
-        'user': user,
-    }
-    return context

lms/djangoapps/shoppingcart/models.py

@@ -25,7 +25,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 from course_modes.models import CourseMode
 from edxmako.shortcuts import render_to_string
 from student.views import course_from_id
-from student.models import CourseEnrollment, unenroll_done, UserMethods
+from student.models import CourseEnrollment, unenroll_done
 
 from verify_student.models import SoftwareSecurePhotoVerification
 
@@ -608,7 +608,7 @@ class CertificateItem(OrderItem):
                 "Could not submit verification attempt for enrollment {}".format(self.course_enrollment)
             )
         if self.upgrade is True:
-            UserMethods.emit_event(self.user, self.course_enrollment.course_id, EVENT_NAME_USER_UPGRADED)
+            self.course_enrollment.emit_event(EVENT_NAME_USER_UPGRADED)
         self.course_enrollment.change_mode(self.mode)
         self.course_enrollment.activate()
 

lms/djangoapps/shoppingcart/tests/test_models.py

@@ -451,8 +451,9 @@ class CertificateItemTest(ModuleStoreTestCase):
             sentinel.request,
             'edx.user.upgrade.purchased',
             {
-                'user': user,
                 'course_id': course_id,
+                'user_id': user.pk,
+                'mode': 'honor'
             }
         )
         self.mock_server_track.reset_mock()

lms/templates/dashboard.html

@@ -22,6 +22,12 @@
         $(this).closest('.message.is-expandable').toggleClass('is-expanded');
     }
 
+    $("#upgrade-to-verified").click(function(event) {
+      $user = $(event.target).data("user");
+      $course = $(event.target).data("course-id");
+      Logger.log('EVENT-NAME-USER-CLICKED-UPGRADE', [$user, $course], null);
+    });
+
     $(".email-settings").click(function(event) {
       $("#email_settings_course_id").val( $(event.target).data("course-id") );
       $("#email_settings_course_number").text( $(event.target).data("course-number") );

lms/templates/dashboard/_dashboard_course_listing.html

@@ -80,7 +80,7 @@
                   <a class="action action-upgrade" href="${reverse('course_modes_choose', kwargs={'course_id': course.id})}?upgrade=True">
                     <img class="deco-graphic" src="${static.url('images/vcert-ribbon-s.png')}" alt="ID Verified Ribbon/Badge">
                     <span class="wrapper-copy">
-                      <span class="copy">${_("Upgrade to Verified Track")}</span>
+                      <span class="copy" id="upgrade-to-verified" data-course-id="${course.id}" data-user="${user.username}">${_("Upgrade to Verified Track")}</span>
                     </span>
                   </a>
                 </li>