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

Refactor exercises_controller.rb to reduce code duplication

Browse Source
This commit is contained in:
Sebastian Serth
2022-09-15 22:12:55 +02:00
committed by Sebastian Serth
parent bf13cfc712
commit fa6527b4ed
1 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/controllers/exercises_controller.rb
View File

@ -13,6 +13,7 @@ class ExercisesController < ApplicationController
only: MEMBER_ACTIONS + %i[clone implement working_times intervention search run statistics submit reload feedback only: MEMBER_ACTIONS + %i[clone implement working_times intervention search run statistics submit reload feedback
requests_for_comments study_group_dashboard export_external_check export_external_confirm requests_for_comments study_group_dashboard export_external_check export_external_confirm
external_user_statistics] external_user_statistics]
before_action :collect_set_and_unset_exercise_tags, only: MEMBER_ACTIONS
before_action :set_external_user_and_authorize, only: [:external_user_statistics] before_action :set_external_user_and_authorize, only: [:external_user_statistics]
before_action :set_file_types, only: %i[create edit new update] before_action :set_file_types, only: %i[create edit new update]
before_action :set_course_token, only: [:implement] before_action :set_course_token, only: [:implement]
@ -74,35 +75,19 @@ class ExercisesController < ApplicationController
def create def create
@exercise = Exercise.new(exercise_params&.except(:tips)) @exercise = Exercise.new(exercise_params&.except(:tips))
collect_set_and_unset_exercise_tags authorize!
handle_exercise_tips handle_exercise_tips
collect_set_and_unset_exercise_tags
return if performed? return if performed?
myparam = exercise_params.presence || {} create_and_respond(object: @exercise, params: exercise_params_with_tags)
checked_exercise_tags = @exercise_tags.select {|et| myparam[:tag_ids].include? et.tag.id.to_s }
removed_exercise_tags = @exercise_tags.reject {|et| myparam[:tag_ids].include? et.tag.id.to_s }
checked_exercise_tags.each do |et|
et.factor = params[:tag_factors][et.tag_id.to_s][:factor]
et.exercise = @exercise
end
myparam[:exercise_tags] = checked_exercise_tags
myparam.delete :tag_ids
myparam.delete :tips
removed_exercise_tags.map(&:destroy)
authorize!
create_and_respond(object: @exercise)
end end
def destroy def destroy
destroy_and_respond(object: @exercise) destroy_and_respond(object: @exercise)
end end
def edit def edit; end
collect_set_and_unset_exercise_tags
end
def feedback def feedback
authorize! authorize!
@ -234,6 +219,24 @@ class ExercisesController < ApplicationController
private :exercise_params private :exercise_params
def exercise_params_with_tags
myparam = exercise_params.presence || {}
checked_exercise_tags = @exercise_tags.select {|et| myparam[:tag_ids]&.include? et.tag.id.to_s }
removed_exercise_tags = @exercise_tags.reject {|et| myparam[:tag_ids]&.include? et.tag.id.to_s }
checked_exercise_tags.each do |et|
et.factor = params[:tag_factors][et.tag_id.to_s][:factor]
et.exercise = @exercise
end
myparam[:exercise_tags] = checked_exercise_tags
myparam.delete :tag_ids
myparam.delete :tips
removed_exercise_tags.map(&:destroy)
myparam
end
private :exercise_params_with_tags
def handle_file_uploads def handle_file_uploads
if exercise_params if exercise_params
exercise_params[:files_attributes].try(:each) do |_index, file_attributes| exercise_params[:files_attributes].try(:each) do |_index, file_attributes|
@ -429,9 +432,8 @@ class ExercisesController < ApplicationController
def new def new
@exercise = Exercise.new @exercise = Exercise.new
collect_set_and_unset_exercise_tags
authorize! authorize!
collect_set_and_unset_exercise_tags
end end
def not_authorized_for_exercise(_exception) def not_authorized_for_exercise(_exception)
@ -592,24 +594,10 @@ class ExercisesController < ApplicationController
private :transmit_lti_score private :transmit_lti_score
def update def update
collect_set_and_unset_exercise_tags
handle_exercise_tips handle_exercise_tips
return if performed? return if performed?
myparam = exercise_params update_and_respond(object: @exercise, params: exercise_params_with_tags)
checked_exercise_tags = @exercise_tags.select {|et| myparam[:tag_ids].include? et.tag.id.to_s }
removed_exercise_tags = @exercise_tags.reject {|et| myparam[:tag_ids].include? et.tag.id.to_s }
checked_exercise_tags.each do |et|
et.factor = params[:tag_factors][et.tag_id.to_s][:factor]
et.exercise = @exercise
end
myparam[:exercise_tags] = checked_exercise_tags
myparam.delete :tag_ids
myparam.delete :tips
removed_exercise_tags.map(&:destroy)
update_and_respond(object: @exercise, params: myparam)
end end
def study_group_dashboard def study_group_dashboard