fix question update as teacher
This commit is contained in:
@@ -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] }
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -10,7 +10,7 @@ class ApplicationPolicy
|
||||
end
|
||||
|
||||
def is?(role)
|
||||
@roles.any?(role)
|
||||
@roles.any?(role.to_s)
|
||||
end
|
||||
|
||||
def index?
|
||||
|
||||
Reference in New Issue
Block a user