Merge pull request #61 from TreinaDev/fix/expor-categoria-de-trabalho…

…-por-projeto Adiciona categorias de trabalho no endpoint de listagem de projetos
TreinaDev · Feb 2, 2024 · a8d1d2e · a8d1d2e
2 parents 53fae43 + 4568c9f
commit a8d1d2e
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 9 deletions.
diff --git a/api_doc.md b/api_doc.md
@@ -18,13 +18,29 @@ Retorna a lista de todos os projetos cadastradas. (Status: 200):
     "id": 1,
     "title": "Projeto Master",
     "description": "Principal projeto criado",
-    "category": "Video"
+    "category": "Video",
+    "project_job_categories": [
+      {
+        "job_category_id": 1
+      },
+      {
+        "job_category_id": 2
+      }
+    ]
   },
   {
     "id": 2,
     "title": "Projeto Website",
     "description": "Um site de jogos",
-    "category": "Programação"
+    "category": "Programação",
+    "project_job_categories": [
+      {
+        "job_category_id": 1
+      },
+      {
+        "job_category_id": 2
+      }
+    ]
   }
 ]
 ```

diff --git a/app/controllers/api/v1/projects_controller.rb b/app/controllers/api/v1/projects_controller.rb
@@ -2,7 +2,10 @@ module Api
   module V1
     class ProjectsController < Api::V1::ApiController
       def index
-        response = Project.all.as_json(only: %i[id title description category])
+        response = Project.all.as_json(
+          only: %i[id title description category],
+          include: { project_job_categories: { only: [:job_category_id] } }
+        )
 
         response = { message: 'Nenhum projeto encontrado.' } if response.empty?
 

diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -59,8 +59,15 @@
 
 ash_project = FactoryBot.create(:project, user: ash, title: 'Pousadaria', category: 'Aplicação WEB')
 ash_project2 = FactoryBot.create(:project, user: ash, title: 'Portfoliorr', category: 'Aplicação WEB')
-pokemon_project = FactoryBot.create(:project, user: brock, title: 'Líder de Ginásio',
-                                    description: 'Me tornar líder do estádio de pedra.')
+
+
+
+first_project_job_category = FactoryBot.create(:project_job_category, project: pokemon_project, job_category_id: 1)
+
+second_project_job_category = FactoryBot.create(:project_job_category, project: pokemon_project, job_category_id: 2)
+
+third_project_job_category = FactoryBot.create(:project_job_category, project: encrenca_project, job_category_id: 1)
+
 
 
 FactoryBot.create(:task, project: pokemon_project, title:'Pegar um geodude',

diff --git a/spec/requests/api/v1/projects_api_spec.rb b/spec/requests/api/v1/projects_api_spec.rb
@@ -4,11 +4,14 @@
   context 'GET /api/v1/projects' do
     it 'com sucesso' do
       project_owner = create(:user)
-      create(:project, user: project_owner, title: 'Primeiro Projeto',
-                       description: 'Esse é o primeiro projeto', category: 'Site')
+      project = create(:project, user: project_owner, title: 'Primeiro Projeto',
+                                 description: 'Esse é o primeiro projeto', category: 'Site')
       create(:project, user: project_owner, title: 'Segundo Projeto',
                        description: 'Projeto de edição', category: 'Video')
 
+      create(:project_job_category, project:, job_category_id: 1)
+      create(:project_job_category, project:, job_category_id: 2)
+
       get '/api/v1/projects'
 
       expect(response.status).to eq 200
@@ -19,10 +22,13 @@
       expect(json_response[0]['title']).to eq 'Primeiro Projeto'
       expect(json_response[0]['description']).to eq 'Esse é o primeiro projeto'
       expect(json_response[0]['category']).to eq 'Site'
+      expect(json_response[0]['project_job_categories'][0]['job_category_id']).to eq 1
+      expect(json_response[0]['project_job_categories'][1]['job_category_id']).to eq 2
       expect(json_response[1]['id']).to eq 2
       expect(json_response[1]['title']).to eq 'Segundo Projeto'
       expect(json_response[1]['description']).to eq 'Projeto de edição'
       expect(json_response[1]['category']).to eq 'Video'
+      expect(json_response[1]['project_job_categories'].any?).to eq false
     end
 
     it 'e não tem nenhum projeto' do

diff --git a/spec/system/profiles/user_edit_profile_spec.rb b/spec/system/profiles/user_edit_profile_spec.rb
@@ -67,7 +67,7 @@
       visit edit_profile_path user.profile
       click_on 'Pular etapa'
 
-      expect(current_path).to eq root_path
+      expect(page).to have_current_path root_path
     end
 
     it 'e já tem informação registrada' do
@@ -79,7 +79,7 @@
       visit edit_profile_path user.profile
       click_on 'Voltar'
 
-      expect(current_path).to eq profile_path user.profile
+      expect(page).to have_current_path profile_path user.profile
     end
   end