Fix stage.json endpoint

4 files changed, 18 insertions, 23 deletions

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index ef699e885b8..160613ea5dc 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -106,7 +106,7 @@ class Projects::PipelinesController < Projects::ApplicationController
 
     render json: StageSerializer
       .new(project: @project, current_user: @current_user)
-      .represent(@pipeline)
+      .represent(@stage, details: true)
   end
 
   def retry
diff --git a/app/serializers/stage_details_entity.rb b/app/serializers/stage_details_entity.rb
deleted file mode 100644
index e9180d5fbb7..00000000000
--- a/app/serializers/stage_details_entity.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class StageDetailsEntity < Grape::Entity
-  include RequestAwareEntity
-
-  expose :name
-
-  expose :title do |stage|
-    "#{stage.name}: #{detailed_status.label}"
-  end
-
-  expose :statuses, with: JobEntity
-
-  expose :detailed_status, as: :status, with: StatusEntity
-
-  private
-
-  alias_method :stage, :object
-
-  def detailed_status
-    stage.detailed_status(request.current_user)
-  end
-end
diff --git a/app/serializers/stage_entity.rb b/app/serializers/stage_entity.rb
index 4523b15152e..2516df70ad9 100644
--- a/app/serializers/stage_entity.rb
+++ b/app/serializers/stage_entity.rb
@@ -11,6 +11,12 @@ class StageEntity < Grape::Entity
     if: -> (_, opts) { opts[:grouped] },
     with: JobGroupEntity
 
+  expose :latest_statuses,
+    if: -> (_, opts) { opts[:details] },
+    with: JobEntity do |stage|
+    latest_statuses
+  end
+
   expose :detailed_status, as: :status, with: StatusEntity
 
   expose :path do |stage|
@@ -35,4 +41,14 @@ class StageEntity < Grape::Entity
   def detailed_status
     stage.detailed_status(request.current_user)
   end
+
+  def grouped_statuses
+    @grouped_statuses ||= stage.statuses.latest_ordered.group_by(&:status)
+  end
+
+  def latest_statuses
+    HasStatus::ORDERED_STATUSES.map do |ordered_status|
+      grouped_statuses.fetch(ordered_status, [])
+    end.flatten
+  end
 end
diff --git a/app/serializers/stage_serializer.rb b/app/serializers/stage_serializer.rb
index 19cb6c04c10..091d8e91e43 100644
--- a/app/serializers/stage_serializer.rb
+++ b/app/serializers/stage_serializer.rb
@@ -3,5 +3,5 @@ class StageSerializer < BaseSerializer
 
   InvalidResourceError = Class.new(StandardError)
 
-  entity StageDetailsEntity
+  entity StageEntity
 end