From 1d726075a948e9a43b84195258c05abb483fe2e5 Mon Sep 17 00:00:00 2001 From: Kaio Magalhaes Date: Fri, 1 Nov 2024 16:32:00 -0300 Subject: [PATCH] update how the user skill is rendered --- app/controllers/user_skills_controller.rb | 4 +--- app/views/user_skills/_user_skill.json.jbuilder | 2 +- app/views/user_skills/index.json.jbuilder | 3 +++ docker-compose.yml | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 app/views/user_skills/index.json.jbuilder diff --git a/app/controllers/user_skills_controller.rb b/app/controllers/user_skills_controller.rb index e9e174b..5d3dbad 100644 --- a/app/controllers/user_skills_controller.rb +++ b/app/controllers/user_skills_controller.rb @@ -5,9 +5,7 @@ class UserSkillsController < ApplicationController # GET /user_skills?user_id=:id def index - @user_skills = UserSkill.where(user_id: params['user_id']).joins(:skill).select('user_skills.*', 'skills.name as skill_name') - - render json: @user_skills + @user_skills = UserSkill.where(user_id: params['user_id']) end # PATCH/PUT /user_skills diff --git a/app/views/user_skills/_user_skill.json.jbuilder b/app/views/user_skills/_user_skill.json.jbuilder index ccd9f3f..d8923e8 100644 --- a/app/views/user_skills/_user_skill.json.jbuilder +++ b/app/views/user_skills/_user_skill.json.jbuilder @@ -2,4 +2,4 @@ # _user_service_identifier.json.jbuilder -json.extract! user_skill, :id, :last_applied_in_year, :level, :years_of_experience +json.extract! user_skill, :id, :last_applied_in_year, :level, :years_of_experience, :skill \ No newline at end of file diff --git a/app/views/user_skills/index.json.jbuilder b/app/views/user_skills/index.json.jbuilder new file mode 100644 index 0000000..d1abfeb --- /dev/null +++ b/app/views/user_skills/index.json.jbuilder @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +json.array! @user_skills, partial: 'user_skills/user_skill', as: :user_skill diff --git a/docker-compose.yml b/docker-compose.yml index 43fb8b9..24f6246 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: db: image: postgres