htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce SQL queries in the exercise controller

Browse Source 
Fixes CODEOCEAN-JK
This commit is contained in:
Sebastian Serth
2023-03-14 20:58:21 +01:00
parent d410c67473
commit a7cd85507e
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/exercises_controller.rb
View File

@ -75,7 +75,7 @@ class ExercisesController < ApplicationController
def index def index
@search = policy_scope(Exercise).ransack(params[:q]) @search = policy_scope(Exercise).ransack(params[:q])
@exercises = @search.result.includes(:execution_environment, :user).order(:title).paginate(page: params[:page], per_page: per_page_param) @exercises = @search.result.includes(:execution_environment, :user, :files, :exercise_tags).order(:title).paginate(page: params[:page], per_page: per_page_param)
authorize! authorize!
end end
@ -460,7 +460,7 @@ class ExercisesController < ApplicationController
private :set_execution_environments private :set_execution_environments
def set_exercise_and_authorize def set_exercise_and_authorize
@exercise = Exercise.find(params[:id]) @exercise = Exercise.includes(:exercise_tips, files: [:file_type]).find(params[:id])
authorize! authorize!
end end

6
app/models/exercise.rb
View File

@ -517,7 +517,11 @@ class Exercise < ApplicationRecord
0 0
end end
else else
@maximum_score ||= files.teacher_defined_assessments.sum(:weight) @maximum_score ||= if files.loaded?
files.filter(&:teacher_defined_assessment?).pluck(:weight).sum
else
files.teacher_defined_assessments.sum(:weight)
end
end end
end end

2
app/policies/exercise_policy.rb
View File

@ -31,7 +31,7 @@ class ExercisePolicy < AdminOrAuthorPolicy
%i[implement? working_times? intervention? search? reload?].each do |action| %i[implement? working_times? intervention? search? reload?].each do |action|
define_method(action) do define_method(action) do
return no_one unless @record.files.visible.exists? && @record.execution_environment.present? return no_one unless @record.files.any? {|f| f.hidden == false } && @record.execution_environment.present?
admin? || teacher_in_study_group? || author? || (everyone && !@record.unpublished?) admin? || teacher_in_study_group? || author? || (everyone && !@record.unpublished?)
end end

4
app/views/exercises/index.html.slim
View File

@ -29,9 +29,9 @@ h1 = Exercise.model_name.human(count: 2)
tr data-id=exercise.id tr data-id=exercise.id
td.p-1.pt-2 = link_to_if(policy(exercise).show?, exercise.title, exercise, 'data-turbolinks' => "false") td.p-1.pt-2 = link_to_if(policy(exercise).show?, exercise.title, exercise, 'data-turbolinks' => "false")
td.p-1.pt-2 = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment) td.p-1.pt-2 = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
td.p-1.pt-2 = exercise.files.teacher_defined_assessments.count td.p-1.pt-2 = exercise.files.filter(&:teacher_defined_assessment?).length
td.p-1.pt-2 = exercise.maximum_score td.p-1.pt-2 = exercise.maximum_score
td.p-1.pt-2 = exercise.exercise_tags.count td.p-1.pt-2 = exercise.exercise_tags.length
td.p-1.pt-2 = exercise.expected_difficulty td.p-1.pt-2 = exercise.expected_difficulty
td.p-1.pt-2.public data-value=exercise.public? = symbol_for(exercise.public?) td.p-1.pt-2.public data-value=exercise.public? = symbol_for(exercise.public?)
td.p-1.pt-2 = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit? td.p-1.pt-2 = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit?