mattdrayer/api: Fixes to support Apros cohort page

lms/djangoapps/api_manager/courses/tests.py

@@ -1817,7 +1817,6 @@ class CoursesApiTests(TestCase):
             response = self.do_post(completion_uri, completions_data)
             self.assertEqual(response.status_code, 201)
 
-
         # get course metrics
         course_metrics_uri = '{}/{}/metrics/'.format(self.base_courses_uri, self.test_course_id)
         response = self.do_get(course_metrics_uri)
@@ -1825,6 +1824,9 @@ class CoursesApiTests(TestCase):
         self.assertEqual(response.data['users_enrolled'], users_to_add + USER_COUNT)
         self.assertEqual(response.data['users_started'], 1)
         self.assertIsNotNone(response.data['grade_cutoffs'])
+        # TODO: (mattdrayer) Uncomment after comment service has been updated
+        # self.assertEqual(response.data['num_threads'], 5)
+        # self.assertEqual(response.data['num_active_threads'], 3)
 
         # get course metrics by organization
         course_metrics_uri = '{}/{}/metrics/?organization={}'.format(self.base_courses_uri, self.test_course_id, org_id)

lms/djangoapps/api_manager/courses/views.py

@@ -1503,15 +1503,16 @@ class CoursesMetrics(SecureAPIView):
             'users_started': users_started_qs.values('user').distinct().count(),
             'grade_cutoffs': course_descriptor.grading_policy['GRADE_CUTOFFS']
         }
-        thread_stats = {}
-        try:
-            thread_stats = get_course_thread_stats(slash_course_id)
-        except CommentClientRequestError, e:
-            data = {
-                "err_msg": str(e)
-            }
-            return Response(data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        data.update(thread_stats)
+        # TODO: (mattdrayer) Uncomment after comment service has been updated
+        # thread_stats = {}
+        # try:
+        #     thread_stats = get_course_thread_stats(slash_course_id)
+        # except CommentClientRequestError, e:
+        #     data = {
+        #         "err_msg": str(e)
+        #     }
+        #     return Response(data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        # data.update(thread_stats)
         return Response(data, status=status.HTTP_200_OK)
 
 

lms/djangoapps/gradebook/models.py

@@ -69,51 +69,52 @@ class StudentGradebook(TimeStampedModel):
             queryset = StudentGradebook.objects.select_related('user')\
                 .filter(course_id__exact=course_key, user__is_active=True)
             gradebook_user_count = len(queryset)
-
-            # Remove any users who should not be considered for the statistics
-            if exclude_users:
-                total_user_count = total_user_count - len(exclude_users)
-                queryset = queryset.exclude(user__in=exclude_users)
-                gradebook_user_count = len(queryset)
-
-            # Calculate the class average
-            course_avg = queryset.aggregate(Avg('grade'))['grade__avg']
-            if course_avg is not None and gradebook_user_count < total_user_count:
-                # Take into account any ungraded students (assumes zeros for grades...)
-                course_avg = course_avg / total_user_count * gradebook_user_count
-
-            # Fill up the response container
-            data['course_avg'] = course_avg
-            data['course_max'] = queryset.aggregate(Max('grade'))['grade__max']
-            data['course_min'] = queryset.aggregate(Min('grade'))['grade__min']
-            data['course_count'] = queryset.aggregate(Count('grade'))['grade__count']
-
-            # Construct the leaderboard as a queryset
-            data['queryset'] = queryset.values(
-                'user__id',
-                'user__username',
-                'user__profile__title',
-                'user__profile__avatar_url',
-                'grade',
-                'created')\
-                .order_by('-grade', 'created')[:count]
-
-            # If a user_id value was provided, we need to provide some additional user-specific data to the caller
-            if user_id:
-                user_grade = 0
-                user_time_scored = timezone.now()
-                try:
-                    user_queryset = StudentGradebook.objects.get(course_id__exact=course_key, user__id=user_id)
-                except StudentGradebook.DoesNotExist:
-                    user_queryset = None
-                if user_queryset:
-                    user_grade = user_queryset.grade
-                    user_time_scored = user_queryset.created
-                users_above = queryset.filter(grade__gte=user_grade)\
-                    .exclude(user__id=user_id)\
-                    .exclude(grade=user_grade, created__lt=user_time_scored)
-                data['user_position'] = len(users_above) + 1
-                data['user_grade'] = user_grade
+            if gradebook_user_count:
+
+                # Remove any users who should not be considered for the statistics
+                if exclude_users:
+                    total_user_count = total_user_count - len(exclude_users)
+                    queryset = queryset.exclude(user__in=exclude_users)
+                    gradebook_user_count = len(queryset)
+
+                # Calculate the class average
+                course_avg = queryset.aggregate(Avg('grade'))['grade__avg']
+                if course_avg is not None and gradebook_user_count < total_user_count:
+                    # Take into account any ungraded students (assumes zeros for grades...)
+                    course_avg = course_avg / total_user_count * gradebook_user_count
+
+                # Fill up the response container
+                data['course_avg'] = course_avg
+                data['course_max'] = queryset.aggregate(Max('grade'))['grade__max']
+                data['course_min'] = queryset.aggregate(Min('grade'))['grade__min']
+                data['course_count'] = queryset.aggregate(Count('grade'))['grade__count']
+
+                # Construct the leaderboard as a queryset
+                data['queryset'] = queryset.values(
+                    'user__id',
+                    'user__username',
+                    'user__profile__title',
+                    'user__profile__avatar_url',
+                    'grade',
+                    'created')\
+                    .order_by('-grade', 'created')[:count]
+
+                # If a user_id value was provided, we need to provide some additional user-specific data to the caller
+                if user_id:
+                    user_grade = 0
+                    user_time_scored = timezone.now()
+                    try:
+                        user_queryset = StudentGradebook.objects.get(course_id__exact=course_key, user__id=user_id)
+                    except StudentGradebook.DoesNotExist:
+                        user_queryset = None
+                    if user_queryset:
+                        user_grade = user_queryset.grade
+                        user_time_scored = user_queryset.created
+                    users_above = queryset.filter(grade__gte=user_grade)\
+                        .exclude(user__id=user_id)\
+                        .exclude(grade=user_grade, created__lt=user_time_scored)
+                    data['user_position'] = len(users_above) + 1
+                    data['user_grade'] = user_grade
 
         return data