WIP - Filter for exercise id on programming group index page

openHPI · Sep 15, 2023 · 34ddb85 · 34ddb85
1 parent 45c640c
commit 34ddb85
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/controllers/programming_groups_controller.rb b/app/controllers/programming_groups_controller.rb
@@ -8,7 +8,8 @@ class ProgrammingGroupsController < ApplicationController
   before_action :set_programming_group, only: %i[destroy]
 
   def index
-    @programming_groups = ProgrammingGroup.all.paginate(page: params[:page], per_page: per_page_param)
+    @search = ProgrammingGroup.ransack(params[:q], {auth_object: current_user})
+    @programming_groups = @search.result.includes(:exercise).order(:id).paginate(page: params[:page], per_page: per_page_param)
     authorize!
   end
 

diff --git a/app/models/exercise.rb b/app/models/exercise.rb
@@ -34,6 +34,7 @@ class Exercise < ApplicationRecord
   has_many :programming_groups
 
   scope :with_submissions, -> { where('id IN (SELECT exercise_id FROM submissions)') }
+  scope :with_programming_groups, -> { where('id IN (SELECT DISTINCT exercise_id FROM programming_groups)') }
 
   validate :valid_main_file?
   validate :valid_submission_deadlines?
@@ -612,7 +613,7 @@ def last_submission_per_contributor
   end
 
   def self.ransackable_attributes(_auth_object = nil)
-    %w[title]
+    %w[title id]
   end
 
   def self.ransackable_associations(_auth_object = nil)

diff --git a/app/models/programming_group.rb b/app/models/programming_group.rb
@@ -82,6 +82,14 @@ def users=(users)
     end
   end
 
+  def self.ransackable_attributes(_auth_object = nil)
+    %w[id exercise_id]
+  end
+
+  def self.ransackable_associations(_auth_object = nil)
+    %w[exercise]
+  end
+
   private
 
   def min_group_size