diff --git a/app/controllers/beta/project_boards_controller.rb b/app/controllers/beta/project_boards_controller.rb index bcdee5f97..7047d8f52 100644 --- a/app/controllers/beta/project_boards_controller.rb +++ b/app/controllers/beta/project_boards_controller.rb @@ -6,14 +6,14 @@ def show project_id: params[:id], current_user: current_user, current_flow: cookies[:current_flow], - projects_scope: policy_scope(Project) + projects_scope: policy_scope(Project), ) @project = result.success.project authorize @project, policy_class: Beta::ProjectPolicy response = result.success.as_json(root: false) - render json: collapse_response_stories(response) + render json: response end private @@ -21,10 +21,4 @@ def show def set_fluid_layout @layout_settings[:fluid] = true end - - def collapse_response_stories(response) - stories = response['stories'] - response['stories'] = ProjectBoardsSerializer.collapsed_stories(stories) - response - end end diff --git a/app/serializers/project_boards_serializer.rb b/app/serializers/project_boards_serializer.rb deleted file mode 100644 index d710c53d4..000000000 --- a/app/serializers/project_boards_serializer.rb +++ /dev/null @@ -1,17 +0,0 @@ -class ProjectBoardsSerializer - def self.collapsed_stories(stories) - stories.map do |story| - { - id: story['id'], - title: story['title'], - description: story['description'], - estimate: story['estimate'], - story_type: story['story_type'], - state: story['state'], - requested_by_name: story['requested_by_name'], - owned_by_initials: story['owned_by_initials'], - project_id: story['project_id'] - } - end - end -end diff --git a/spec/operations/beta/project_board_operations/read_spec.rb b/spec/operations/beta/project_board_operations/read_spec.rb index f5160628d..23f63c1ea 100644 --- a/spec/operations/beta/project_board_operations/read_spec.rb +++ b/spec/operations/beta/project_board_operations/read_spec.rb @@ -15,10 +15,11 @@ let(:user) { create(:user, :with_team) } context 'when the project exists' do - let(:story_operations_read_all_instance) { instance_double(StoryOperations::ReadAll, call: Dry::Monads::Success({ active_stories: stories, past_iterations: 'Past Iterations' })) } + let(:story_operations_read_all_instance) { instance_double(StoryOperations::ReadAll, call: Dry::Monads::Success({ active_stories: stories })) } before do allow(StoryOperations::ReadAll).to receive(:new).and_return(story_operations_read_all_instance) + allow_any_instance_of(Iterations::ProjectIterations).to receive(:past_iterations).and_return("Past Iterations") end it 'returns success' do @@ -46,7 +47,7 @@ end it 'returns with stories' do - expect(subject.call.success.stories).to eq(stories) + expect(subject.call.success.stories).to match_array(stories) end it 'returns with past_iterations' do