From 8d0ff8a57d8bdcadb287974d485dd13c77203ca9 Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sun, 1 Nov 2020 22:31:41 -0500 Subject: [PATCH 1/2] feat: Adds "questionnaire_id" to User.as_json --- app/controllers/users_controller.rb | 4 +--- app/models/user.rb | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 097a31280..f0c528776 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -7,8 +7,6 @@ def logged_in end def show - respond_to do |format| - format.json { render json: current_user } - end + render json: current_user end end diff --git a/app/models/user.rb b/app/models/user.rb index 00f16f4d6..4cb6fcf9c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -90,4 +90,10 @@ def self.non_organizer def self.without_questionnaire non_organizer.left_outer_joins(:questionnaire).where(questionnaires: { id: nil }) end + + def as_json(options={}) + result = super + result['questionnaire_id'] = Questionnaire.where(user_id: self.id).any? ? Questionnaire.where(user_id: self.id).first.id : nil + result + end end From 25b3246714f2bae74d25bf3d63a4e99929a7254a Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sun, 1 Nov 2020 22:35:09 -0500 Subject: [PATCH 2/2] Fixes Hound issues --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4cb6fcf9c..3df19bde0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,9 +91,9 @@ def self.without_questionnaire non_organizer.left_outer_joins(:questionnaire).where(questionnaires: { id: nil }) end - def as_json(options={}) + def as_json(options = {}) result = super - result['questionnaire_id'] = Questionnaire.where(user_id: self.id).any? ? Questionnaire.where(user_id: self.id).first.id : nil + result['questionnaire_id'] = Questionnaire.where(user_id: id).any? ? Questionnaire.where(user_id: id).first.id : nil result end end