Merge pull request #76 from edx/dsjen/no-id-professional

Incorporate no-id-professional mode into professional enrollments.

analytics_data_api/constants/enrollment_modes.py

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

analytics_data_api/v0/tests/views/test_courses.py

@@ -435,6 +435,9 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
         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]
+
         response[u'count'] = total
 
         return [response]
@@ -448,6 +451,7 @@ 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 = {}
         for mode in modes:

analytics_data_api/v0/views/courses.py

@@ -513,6 +513,10 @@ class CourseEnrollmentModeView(BaseCourseEnrollmentView):
             # 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)
+
             item[u'count'] = total
 
             formatted_data.append(item)