From aa1b18d1833dbcda2a3ec13077c60df62f620e5f Mon Sep 17 00:00:00 2001 From: Gabriela Moraes Date: Fri, 22 Nov 2019 16:22:40 -0200 Subject: [PATCH 1/2] Creating method that validates both elements. --- app/controllers/grades_controller.rb | 3 +- app/controllers/releases_controller.rb | 3 +- app/controllers/sprints_controller.rb | 3 +- app/helpers/validations_helper.rb | 48 ++++++++++++++++++-------- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/app/controllers/grades_controller.rb b/app/controllers/grades_controller.rb index 1823b04..7d51d18 100644 --- a/app/controllers/grades_controller.rb +++ b/app/controllers/grades_controller.rb @@ -9,7 +9,8 @@ class GradesController < ApplicationController end before_action only: [:show, :update] do - validate_grade(:id, 0) + # validate_grade(:id, 0) + validate_grade_and_release(:id, 0, "grade") end def index diff --git a/app/controllers/releases_controller.rb b/app/controllers/releases_controller.rb index 3b10f44..dc9209e 100644 --- a/app/controllers/releases_controller.rb +++ b/app/controllers/releases_controller.rb @@ -9,7 +9,8 @@ class ReleasesController < ApplicationController end before_action only: [:show, :edit, :update, :destroy] do - validate_release(:id, 0) + # validate_release(:id, 0) + validate_grade_and_release(:id, 0, "release") end def index diff --git a/app/controllers/sprints_controller.rb b/app/controllers/sprints_controller.rb index c82535a..231def2 100644 --- a/app/controllers/sprints_controller.rb +++ b/app/controllers/sprints_controller.rb @@ -8,7 +8,8 @@ class SprintsController < ApplicationController before_action :set_sprint, only: [:show, :update, :destroy, :get_burndown] before_action only: [:index, :create] do - validate_release(0, :release_id) + # validate_release(0, :release_id) + validate_grade_and_release(0, :release_id, "release") end before_action only: [:show, :update, :destroy, :get_velocity, :get_metrics] do diff --git a/app/helpers/validations_helper.rb b/app/helpers/validations_helper.rb index 76f37b9..9a7b39e 100644 --- a/app/helpers/validations_helper.rb +++ b/app/helpers/validations_helper.rb @@ -86,24 +86,16 @@ def validate_project(id, project_id) end end - - def validate_grade(id, grade_id) + def validate_grade_and_release(id, element_id, component_type) current_user - verifies_id(id, grade_id, "grade") - project_grade - user - - if @current_user.id == @user.id - return true + verifies_id(id, element_id, component_type) + if component_type == "grade" + # verifies_id(id, element_id, component_type) + project_grade else - render json: { error: "Not Authorized" }, status: 401 + # verifies_id(id, release_id, "release") + project end - end - - def validate_release(id, release_id) - current_user - verifies_id(id, release_id, "release") - project user if @current_user.id == @user.id @@ -113,6 +105,32 @@ def validate_release(id, release_id) end end + # def validate_grade(id, grade_id) + # current_user + # verifies_id(id, grade_id, "grade") + # project_grade + # user + + # if @current_user.id == @user.id + # return true + # else + # render json: { error: "Not Authorized" }, status: 401 + # end + # end + + # def validate_release(id, release_id) + # current_user + # verifies_id(id, release_id, "release") + # project + # user + + # if @current_user.id == @user.id + # return true + # else + # render json: { error: "Not Authorized" }, status: 401 + # end + # end + def validate_sprint(id, sprint_id) current_user verifies_id(id, sprint_id, "sprint") From 9684c40531a0ac8ade0ee71c2cd6c0895aa77c94 Mon Sep 17 00:00:00 2001 From: Gabriela Moraes Date: Tue, 26 Nov 2019 12:36:24 -0200 Subject: [PATCH 2/2] Removing comments. --- app/controllers/grades_controller.rb | 1 - app/controllers/releases_controller.rb | 1 - app/controllers/sprints_controller.rb | 1 - app/helpers/validations_helper.rb | 28 -------------------------- 4 files changed, 31 deletions(-) diff --git a/app/controllers/grades_controller.rb b/app/controllers/grades_controller.rb index 7d51d18..9f7ed59 100644 --- a/app/controllers/grades_controller.rb +++ b/app/controllers/grades_controller.rb @@ -9,7 +9,6 @@ class GradesController < ApplicationController end before_action only: [:show, :update] do - # validate_grade(:id, 0) validate_grade_and_release(:id, 0, "grade") end diff --git a/app/controllers/releases_controller.rb b/app/controllers/releases_controller.rb index dc9209e..1fcfd57 100644 --- a/app/controllers/releases_controller.rb +++ b/app/controllers/releases_controller.rb @@ -9,7 +9,6 @@ class ReleasesController < ApplicationController end before_action only: [:show, :edit, :update, :destroy] do - # validate_release(:id, 0) validate_grade_and_release(:id, 0, "release") end diff --git a/app/controllers/sprints_controller.rb b/app/controllers/sprints_controller.rb index 231def2..1a5ebb5 100644 --- a/app/controllers/sprints_controller.rb +++ b/app/controllers/sprints_controller.rb @@ -8,7 +8,6 @@ class SprintsController < ApplicationController before_action :set_sprint, only: [:show, :update, :destroy, :get_burndown] before_action only: [:index, :create] do - # validate_release(0, :release_id) validate_grade_and_release(0, :release_id, "release") end diff --git a/app/helpers/validations_helper.rb b/app/helpers/validations_helper.rb index 9a7b39e..389ea80 100644 --- a/app/helpers/validations_helper.rb +++ b/app/helpers/validations_helper.rb @@ -90,10 +90,8 @@ def validate_grade_and_release(id, element_id, component_type) current_user verifies_id(id, element_id, component_type) if component_type == "grade" - # verifies_id(id, element_id, component_type) project_grade else - # verifies_id(id, release_id, "release") project end user @@ -105,32 +103,6 @@ def validate_grade_and_release(id, element_id, component_type) end end - # def validate_grade(id, grade_id) - # current_user - # verifies_id(id, grade_id, "grade") - # project_grade - # user - - # if @current_user.id == @user.id - # return true - # else - # render json: { error: "Not Authorized" }, status: 401 - # end - # end - - # def validate_release(id, release_id) - # current_user - # verifies_id(id, release_id, "release") - # project - # user - - # if @current_user.id == @user.id - # return true - # else - # render json: { error: "Not Authorized" }, status: 401 - # end - # end - def validate_sprint(id, sprint_id) current_user verifies_id(id, sprint_id, "sprint")