Merge pull request #125 from edx/enrollment-track-switch

Enrollment tracks: add credit, do not merge audit & honor

analytics_data_api/constants/enrollment_modes.py

 AUDIT = u'audit'
+CREDIT = u'credit'
 HONOR = u'honor'
 PROFESSIONAL = u'professional'
 PROFESSIONAL_NO_ID = u'no-id-professional'
 VERIFIED = u'verified'
 
-ALL = [AUDIT, HONOR, PROFESSIONAL, PROFESSIONAL_NO_ID, VERIFIED]
+ALL = [AUDIT, CREDIT, HONOR, PROFESSIONAL, PROFESSIONAL_NO_ID, VERIFIED]

analytics_data_api/management/commands/generate_fake_course_data.py

@@ -70,9 +70,10 @@ class Command(BaseCommand):
 
         enrollment_mode_ratios = {
             'audit': 0.15,
-            'honor': 0.35,
+            'credit': 0.15,
+            'honor': 0.25,
             'professional': 0.10,
-            'verified': 0.40
+            'verified': 0.35
         }
 
         # Generate birth year ratios
@@ -255,7 +256,7 @@ class Command(BaseCommand):
         username = options['username']
         video_id = '0fac49ba'
         video_module_id = 'i4x-edX-DemoX-video-5c90cffecd9b48b188cbfea176bf7fe9'
-        start_date = datetime.datetime(year=2015, month=1, day=1, tzinfo=timezone.utc)
+        start_date = datetime.datetime(year=2016, month=1, day=1, tzinfo=timezone.utc)
 
         num_weeks = options['num_weeks']
         if num_weeks:

analytics_data_api/v0/serializers.py

@@ -10,8 +10,9 @@ from analytics_data_api.constants import (
 from analytics_data_api.v0 import models
 
 
-# Below are the enrollment modes supported by this API. The audit and honor enrollment modes are merged into honor.
-ENROLLMENT_MODES = [enrollment_modes.HONOR, enrollment_modes.PROFESSIONAL, enrollment_modes.VERIFIED]
+# Below are the enrollment modes supported by this API.
+ENROLLMENT_MODES = [enrollment_modes.AUDIT, enrollment_modes.CREDIT, enrollment_modes.HONOR,
+                    enrollment_modes.PROFESSIONAL, enrollment_modes.VERIFIED]
 
 
 class CourseActivityByWeekSerializer(serializers.ModelSerializer):

analytics_data_api/v0/tests/views/test_courses.py

@@ -410,10 +410,6 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
             G(self.model, course_id=course_id, date=self.date, mode=mode)
 
     def serialize_enrollment(self, enrollment):
-        # Treat audit as honor
-        if enrollment.mode is enrollment_modes.AUDIT:
-            enrollment.mode = enrollment_modes.HONOR
-
         return {
             u'course_id': enrollment.course_id,
             u'date': enrollment.date.strftime(settings.DATE_FORMAT),
@@ -432,10 +428,6 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
             cumulative += ce.cumulative_count
             response[ce.mode] = ce.count
 
-        # Merge the honor and audit modes
-        response[enrollment_modes.HONOR] += response[enrollment_modes.AUDIT]
-        del response[enrollment_modes.AUDIT]
-
         response[enrollment_modes.PROFESSIONAL] += response[enrollment_modes.PROFESSIONAL_NO_ID]
         del response[enrollment_modes.PROFESSIONAL_NO_ID]
 
@@ -453,7 +445,6 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
 
         # Create the expected data
         modes = list(enrollment_modes.ALL)
-        modes.remove(enrollment_modes.AUDIT)
         modes.remove(enrollment_modes.PROFESSIONAL_NO_ID)
 
         expected = {}

analytics_data_api/v0/views/courses.py

@@ -513,9 +513,6 @@ class CourseEnrollmentModeView(BaseCourseEnrollmentView):
                 total += enrollment.count
                 cumulative_total += enrollment.cumulative_count
 
-            # Merge audit and honor
-            item[enrollment_modes.HONOR] = item.get(enrollment_modes.HONOR, 0) + item.pop(enrollment_modes.AUDIT, 0)
-
             # Merge professional with non verified professional
             item[enrollment_modes.PROFESSIONAL] = \
                 item.get(enrollment_modes.PROFESSIONAL, 0) + item.pop(enrollment_modes.PROFESSIONAL_NO_ID, 0)