From 577f157996b20edb944fe1f1edf621ff6e2b85b8 Mon Sep 17 00:00:00 2001 From: Thomas Hille Date: Wed, 4 Oct 2017 16:51:41 +0200 Subject: [PATCH] extracted number of interventions per exercise into own variable --- app/controllers/exercises_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index 5eab7a02..85131009 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -24,6 +24,10 @@ class ExercisesController < ApplicationController 3 end + def max_intervention_count_per_exercise + 1 + end + def java_course_token "702cbd2a-c84c-4b37-923a-692d7d1532d0" @@ -167,7 +171,7 @@ class ExercisesController < ApplicationController redirect_to(@exercise, alert: t('exercises.implement.no_files')) unless @exercise.files.visible.exists? user_solved_exercise = @exercise.has_user_solved(current_user) count_interventions_today = UserExerciseIntervention.where(user: current_user).where("created_at >= ?", Time.zone.now.beginning_of_day).count - user_got_intervention_in_exercise = ! UserExerciseIntervention.where(user: current_user, exercise: @exercise).empty? + user_got_intervention_in_exercise = UserExerciseIntervention.where(user: current_user, exercise: @exercise).size >= max_intervention_count_per_exercise user_got_enough_interventions = count_interventions_today >= max_intervention_count_per_day || user_got_intervention_in_exercise is_java_course = @course_token && @course_token.eql?(java_course_token)