From 3d3fd1625c2437b2017bd8ffd08bd40ee8547f8f Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 7 Aug 2020 14:54:05 +0200 Subject: [PATCH] Add created_at and user to API Step serializer [SCI-4911] --- app/controllers/api/v1/steps_controller.rb | 2 +- app/serializers/api/v1/step_serializer.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/steps_controller.rb b/app/controllers/api/v1/steps_controller.rb index 367ad09e4..b21265825 100644 --- a/app/controllers/api/v1/steps_controller.rb +++ b/app/controllers/api/v1/steps_controller.rb @@ -59,7 +59,7 @@ module Api end def permitted_includes - %w(tables assets checklists checklists.checklist_items comments) + %w(tables assets checklists checklists.checklist_items comments user) end def load_step_for_managing diff --git a/app/serializers/api/v1/step_serializer.rb b/app/serializers/api/v1/step_serializer.rb index 9ed994531..d79485f2f 100644 --- a/app/serializers/api/v1/step_serializer.rb +++ b/app/serializers/api/v1/step_serializer.rb @@ -8,8 +8,9 @@ module Api include InputSanitizeHelper type :steps - attributes :id, :name, :description, :position, :completed + attributes :id, :name, :description, :created_at, :position, :completed attribute :completed_on, if: -> { object.completed? } + belongs_to :user, serializer: UserSerializer belongs_to :protocol, serializer: ProtocolSerializer has_many :assets, serializer: AssetSerializer has_many :checklists, serializer: ChecklistSerializer