From 008c1c127d5be939c7d8ffb9d47a8027c9b30e9c Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Mon, 9 Jun 2025 11:33:53 +0200 Subject: [PATCH] Allow supervisor and fix start_date in Projects API, add archived_on to InventoryItemSerializer [SCI-11984] --- app/controllers/api/v1/projects_controller.rb | 2 +- app/serializers/api/v1/inventory_item_serializer.rb | 2 +- app/serializers/api/v1/project_serializer.rb | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/v1/projects_controller.rb b/app/controllers/api/v1/projects_controller.rb index ffd902d90..19ec39c40 100644 --- a/app/controllers/api/v1/projects_controller.rb +++ b/app/controllers/api/v1/projects_controller.rb @@ -69,7 +69,7 @@ module Api params.require(:data) .require(:attributes) - .permit(:name, :visibility, :archived, :project_folder_id, :start_date, :due_date, :status, :description, metadata: {}) + .permit(:name, :visibility, :supervised_by_id, :archived, :project_folder_id, :start_date, :due_date, :status, :description, metadata: {}) end def permitted_includes diff --git a/app/serializers/api/v1/inventory_item_serializer.rb b/app/serializers/api/v1/inventory_item_serializer.rb index f65375322..dd95d44ee 100644 --- a/app/serializers/api/v1/inventory_item_serializer.rb +++ b/app/serializers/api/v1/inventory_item_serializer.rb @@ -4,7 +4,7 @@ module Api module V1 class InventoryItemSerializer < ActiveModel::Serializer type :inventory_items - attributes :name, :archived + attributes :name, :archived, :archived_on has_many :repository_cells, key: :inventory_cells, serializer: InventoryCellSerializer, class_name: 'RepositoryCell', diff --git a/app/serializers/api/v1/project_serializer.rb b/app/serializers/api/v1/project_serializer.rb index a397a4bbb..d671e1535 100644 --- a/app/serializers/api/v1/project_serializer.rb +++ b/app/serializers/api/v1/project_serializer.rb @@ -4,7 +4,7 @@ module Api module V1 class ProjectSerializer < ActiveModel::Serializer type :projects - attributes :name, :status, :visibility, :start_date, :archived, :started_at, :done_at, :start_date, :due_date, :description + attributes :name, :status, :visibility, :archived, :started_at, :done_at, :start_date, :due_date, :description attribute :metadata, if: -> { scope && scope[:metadata] == true } belongs_to :project_folder, serializer: ProjectFolderSerializer @@ -12,10 +12,6 @@ module Api has_many :project_comments, key: :comments, serializer: CommentSerializer include TimestampableModel - - def start_date - object.created_at - end end end end