add professional area to skills

app/controllers/analytics/skills_controller.rb

@@ -21,6 +21,7 @@ def build_report
       @skills.map do |skill|
         {
           name: skill.name,
+          professional_area: skill.professional_area,
           level: UserSkill::VALID_LEVELS.map do |level|
             {
               name: level,

app/controllers/requirements_controller.rb

@@ -9,6 +9,9 @@ def index
       statement_of_works_ids = project.statement_of_works.map(&:id)
     elsif requirements_filter[:statement_of_work_id].present?
       statement_of_works_ids = [requirements_filter[:statement_of_work_id]]
+    elsif requirements_filter[:assignments_ids].present?
+      assignments = Assignment.where(id: requirements_filter[:assignments_ids])
+      statement_of_works_ids = assignments.map(&:statement_of_work_id).uniq
     else
       render json: { error: 'project_id or statement_of_work_id is required' }, status: :bad_request
       return
@@ -54,6 +57,6 @@ def requirement_params
   end
 
   def requirements_filter
-    params.permit(:project_id, :statement_of_work_id, :start_date, :end_date)
+    params.permit(:project_id, :statement_of_work_id, :start_date, :end_date, :assignments_ids)
   end
 end

app/controllers/skills_controller.rb

@@ -19,6 +19,6 @@ def create
 
   # Only allow a trusted parameter "white list" through.
   def skill_params
-    params.require(:skill).permit(:name)
+    params.require(:skill).permit(:name, :professional_area)
   end
 end

app/models/skill.rb

@@ -4,10 +4,11 @@
 #
 # Table name: skills
 #
-#  id         :bigint           not null, primary key
-#  name       :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id                :bigint           not null, primary key
+#  name              :string
+#  professional_area :string
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
 #
 # Indexes
 #
@@ -18,4 +19,5 @@ class Skill < ApplicationRecord
   has_many :users, through: :user_skills
 
   validates :name, presence: true, uniqueness: { case_sensitive: false }
+  validates :professional_area, presence: true, inclusion: { in: %w[design engineering] }
 end

app/views/skills/_skill.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.extract! skill, :id, :name
+json.extract! skill, :id, :name, :professional_area

app/views/users/_user.json.jbuilder

@@ -14,3 +14,5 @@ json.user_service_identifiers user.user_service_identifiers,
                               partial: 'user_service_identifiers/user_service_identifier', as: :user_service_identifier
 
 json.user_skills user.user_skills, partial: 'user_skills/user_skill', as: :user_skill
+
+json.assignments user.assignments, partial: 'assignments/assignment', as: :assignment

db/migrate/20241210175942_add_professional_area_to_skill.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddProfessionalAreaToSkill < ActiveRecord::Migration[7.0]
+  def change
+    add_column :skills, :professional_area, :string
+  end
+end

spec/factories/skills.rb

@@ -4,10 +4,11 @@
 #
 # Table name: skills
 #
-#  id         :bigint           not null, primary key
-#  name       :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id                :bigint           not null, primary key
+#  name              :string
+#  professional_area :string
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
 #
 # Indexes
 #

spec/models/skill_spec.rb

@@ -4,10 +4,11 @@
 #
 # Table name: skills
 #
-#  id         :bigint           not null, primary key
-#  name       :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id                :bigint           not null, primary key
+#  name              :string
+#  professional_area :string
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
 #
 # Indexes
 #