Do not show empty groups in stats

Author: nygrenh

app/controllers/api/v8/courses/exercises_controller.rb

@@ -53,7 +53,7 @@ def index
 
           all_exercises = course.exercises
                                 .where(hidden: false, disabled_status: 0)
-                                .select { |ex| ex._fast_visible_to?(current_user) }
+                                .select { |ex| ex._fast_visible? }
 
           presentable = all_exercises.map do |ex|
             {

app/models/course.rb

@@ -469,7 +469,12 @@ def toggle_submission_result_visiblity
   def exercise_group_completion_by_user
     # TODO: clean up exercise group discovery
 
-    groups = exercises.map(&:name).map { |name| if name =~ /^(.+)-[^-]+$/ then $1 else '' end }.uniq
+    groups = exercises
+      .where(disabled_status: 0)
+      .select { |e| e._fast_visible? }
+      .map(&:name)
+      .map { |name| if name =~ /^(.+)-[^-]+$/ then $1 else '' end }
+      .uniq
 
     result = {}
     for group in groups

app/models/exercise.rb

@@ -188,10 +188,10 @@ def submittable_by?(user)
   # Whether a user may see all metadata about the exercise
   def visible_to?(user)
     user.administrator? || user.teacher?(course.organization) || user.assistant?(course) ||
-      _fast_visible_to?(user) && unlock_spec_obj.permits_unlock_for?(user)
+      _fast_visible? && unlock_spec_obj.permits_unlock_for?(user)
   end
 
-  def _fast_visible_to?(user)
+  def _fast_visible?
     !hidden? && !disabled? && published?
   end
 

lib/course_info.rb

@@ -45,7 +45,7 @@ def course_data_core_api(course)
                     exercises.where(unlock_spec: nil)
                   else
                     exercises.where(["unlock_spec IS NULL OR exercises.name IN (#{@unlocked_exercises.map { |_| '?' }.join(', ')})", *@unlocked_exercises])
-      end.select { |e| e._fast_visible_to?(@user) }
+      end.select { |e| e._fast_visible? }
     end
 
     exercises = exercises.to_a.natsort_by(&:name)