diff --git a/app/controllers/api/v1/job_skills_controller.rb b/app/controllers/api/v1/job_skills_controller.rb new file mode 100644 index 0000000..24d519f --- /dev/null +++ b/app/controllers/api/v1/job_skills_controller.rb @@ -0,0 +1,13 @@ +class Api::V1::JobSkillsController < Api::V1::ApiController + def all + @skills = JobSkill.all() + render :all, status: :ok + end + + def job + job = Job.find(params[:id]) + + @skills = JobSkill.where(job: job).or(JobSkill.where(sub: true)) + render :all, status: :ok + end +end diff --git a/app/controllers/api/v1/jobs_controller.rb b/app/controllers/api/v1/jobs_controller.rb index 7084bce..c6fbabf 100644 --- a/app/controllers/api/v1/jobs_controller.rb +++ b/app/controllers/api/v1/jobs_controller.rb @@ -3,11 +3,4 @@ class Api::V1::JobsController < Api::V1::ApiController @jobs = Job.all() render :all, status: :ok end - - def skills - job = Job.find(params[:id]) - - @skills = JobSkill.where(job: job).or(JobSkill.where(sub: true)) - render :skills, status: :ok - end end diff --git a/app/views/api/v1/job_skills/all.json.rabl b/app/views/api/v1/job_skills/all.json.rabl new file mode 100644 index 0000000..ba30a1c --- /dev/null +++ b/app/views/api/v1/job_skills/all.json.rabl @@ -0,0 +1,3 @@ +collection @skills, object_root: false + +extends 'job_skills/base' diff --git a/app/views/api/v1/jobs/skills.json.rabl b/app/views/api/v1/job_skills/base.json.rabl similarity index 78% rename from app/views/api/v1/jobs/skills.json.rabl rename to app/views/api/v1/job_skills/base.json.rabl index d0592e1..03c6f1e 100644 --- a/app/views/api/v1/jobs/skills.json.rabl +++ b/app/views/api/v1/job_skills/base.json.rabl @@ -1,4 +1,4 @@ -collection @skills, object_root: false +object :job_skill attributes :id, :job, :slug, :color, :main, :base, :sub, :emp, :order @@ -8,4 +8,3 @@ node :name do |w| :ja => w.name_jp } end - diff --git a/config/routes.rb b/config/routes.rb index 526992c..44260c7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,7 +27,10 @@ Rails.application.routes.draw do post 'search/summons', to: 'search#summons' get 'jobs', to: 'jobs#all' - get 'jobs/:id/skills', to: 'jobs#skills' + + get 'jobs/skills', to: 'job_skills#all' + get 'jobs/:id/skills', to: 'job_skills#job' + get 'raids', to: 'raids#all' get 'weapon_keys', to: 'weapon_keys#all'