From d755d72603dd2dcf88a26c1f0308548d3c049e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Geonizeli?= Date: Mon, 17 Oct 2022 10:06:03 -0300 Subject: [PATCH] fix question update as teacher --- app/graphql/mutations/create_question.rb | 20 +++++++++---------- .../mutations/create_review_message.rb | 8 ++++---- app/graphql/mutations/update_question.rb | 17 ++++++++-------- app/policies/application_policy.rb | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/app/graphql/mutations/create_question.rb b/app/graphql/mutations/create_question.rb index bb4ce7c..b17618c 100644 --- a/app/graphql/mutations/create_question.rb +++ b/app/graphql/mutations/create_question.rb @@ -7,26 +7,26 @@ module Mutations argument :question, Inputs::QuestionCreateInput, required: true def resolve(question:) - question = question.to_h - reviewer_user_id = question.delete(:reviewer_user_id) + question_attributes = question.to_h + reviewer_user_id = question_attributes.delete(:reviewer_user_id) - record = Question.new(question) - record.user_id = context[:current_user].id + question = Question.new(question_attributes) + question.user_id = context[:current_user].id - policy = QuestionPolicy.new(context[:current_user], record) + policy = QuestionPolicy.new(context[:current_user], question) raise Pundit::NotAuthorizedError unless policy.create? ActiveRecord::Base.transaction do - record.save! + question.save! - if reviewer_user_id.present? && question[:status] != "draft" - record.review_requests.create!(user_id: reviewer_user_id) + if reviewer_user_id.present? && question_attributes[:status] != "draft" + question.review_requests.create!(user_id: reviewer_user_id) end - { question: record, errors: [] } + { question: question, errors: [] } rescue ActiveRecord::RecordInvalid - { question: nil, errors: record.errors.full_messages } + { question: nil, errors: question.errors.full_messages } end rescue Pundit::NotAuthorizedError => e { question: nil, errors: [e.message] } diff --git a/app/graphql/mutations/create_review_message.rb b/app/graphql/mutations/create_review_message.rb index eee5797..4a195a9 100644 --- a/app/graphql/mutations/create_review_message.rb +++ b/app/graphql/mutations/create_review_message.rb @@ -10,15 +10,15 @@ module Mutations message = message.to_h ActiveRecord::Base.transaction do - record = ReviewMessage.create!({ + review_message = ReviewMessage.create!({ **message, user_id: current_user.id, }) - update_question_status(record.question, message[:feedback_type]) - update_review_requests(record.question, message[:feedback_type]) + update_question_status(review_message.question, message[:feedback_type]) + update_review_requests(review_message.question, message[:feedback_type]) - { review_message: record, errors: [] } + { review_message: review_message, errors: [] } rescue ActiveRecord::RecordInvalid => e { review_message: nil, errors: e.record.errors.full_messages } end diff --git a/app/graphql/mutations/update_question.rb b/app/graphql/mutations/update_question.rb index 4585e54..6203e38 100644 --- a/app/graphql/mutations/update_question.rb +++ b/app/graphql/mutations/update_question.rb @@ -7,29 +7,28 @@ module Mutations argument :question, Inputs::QuestionUpdateInput, required: true def resolve(question:) - question = question.to_h - reviewer_user_id = question.delete(:reviewer_user_id) + question_attributes = question.to_h + reviewer_user_id = question_attributes.delete(:reviewer_user_id) - record = Question.find(question[:id]) + question = Question.find(question_attributes[:id]) - raise Pundit::NotAuthorizedError unless QuestionPolicy.new(context[:current_user], record).update? + raise Pundit::NotAuthorizedError unless QuestionPolicy.new(context[:current_user], question).update? ActiveRecord::Base.transaction do - record.update!(question) + question.update!(question_attributes) - if reviewer_user_id.present? && question[:status] != "draft" - review_request = record.review_requests.find_or_create_by!( + if reviewer_user_id.present? && question_attributes[:status] != "draft" + review_request = question.review_requests.find_or_create_by!( user_id: reviewer_user_id ) review_request.update!(answered: false) end - { question: record, errors: [] } + { question: question, errors: [] } rescue ActiveRecord::RecordInvalid { question: nil, errors: question.errors.full_messages } end - rescue Pundit::NotAuthorizedError => e { question: nil, errors: [e.message] } end diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index 46a9435..a1c2418 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -10,7 +10,7 @@ class ApplicationPolicy end def is?(role) - @roles.any?(role) + @roles.any?(role.to_s) end def index?