Merge pull request #111 from Stanford-Online/sef/dont-count-direct-access

direct access: exclude non-registered from enrollments

common/djangoapps/student/models.py

@@ -701,9 +701,13 @@ class CourseEnrollment(models.Model):
         Returns the count of active enrollments in a course.
 
         'course_id' is the course_id to return enrollments
+        Direct access: don't include non-registered enrollments in counts.
         """
-        enrollment_number = CourseEnrollment.objects.filter(course_id=course_id, is_active=1).count()
-
+        enrollment_number = CourseEnrollment.objects.filter(
+            course_id=course_id,
+            is_active=1,
+            user__profile__nonregistered=0,
+        ).count()
         return enrollment_number
 
     @classmethod

lms/djangoapps/analytics/basic.py

@@ -24,10 +24,13 @@ def enrolled_students_features(course_id, features):
         {'username': 'username2', 'first_name': 'firstname2'}
         {'username': 'username3', 'first_name': 'firstname3'}
     ]
+
+    Direct access: don't include non-registered enrollments in result.
     """
     students = User.objects.filter(
         courseenrollment__course_id=course_id,
         courseenrollment__is_active=1,
+        profile__nonregistered=0,
     ).order_by('username').select_related('profile')
 
     def extract_student(student, features):