Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Adds "questionnaire_id" to User.as_json #394

Merged
merged 2 commits into from
Nov 8, 2020
Merged

feat: Adds "questionnaire_id" to User.as_json #394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d0ff8a
feat: Adds "questionnaire_id" to User.as_json
cbaudouinjr Nov 2, 2020
25b3246
Fixes Hound issues
cbaudouinjr Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={})
cbaudouinjr marked this conversation as resolved.
Show resolved Hide resolved
result = super
result['questionnaire_id'] = Questionnaire.where(user_id: self.id).any? ? Questionnaire.where(user_id: self.id).first.id : nil
cbaudouinjr marked this conversation as resolved.
Show resolved Hide resolved
result
end
end