From 4e06818d330b4f15f334561500d506f0d24b9dfe Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 10 Nov 2016 15:32:23 +0100
Subject: [PATCH] Support pipelines API

Pass `updated_at` to get only incremental changes since last update
---
 app/models/ci/pipeline.rb                     | 29 +++++++++++++++----
 app/models/commit_status.rb                   | 11 +------
 .../projects/ci/pipelines/_pipeline.html.haml |  7 +++--
 app/views/projects/commit/_pipeline.html.haml |  2 +-
 .../projects/commit/_pipelines_list.haml      |  2 +-
 app/views/projects/pipelines/index.html.haml  |  2 +-
 6 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index caf6908505e..859c6b483f4 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -98,19 +98,38 @@ module Ci
       sha[0...8]
     end
 
-    def self.stages
-      # We use pluck here due to problems with MySQL which doesn't allow LIMIT/OFFSET in queries
-      CommitStatus.where(pipeline: pluck(:id)).stages
-    end
-
     def self.total_duration
       where.not(duration: nil).sum(:duration)
     end
 
+    def stages
+      statuses.group('stage').select(:stage)
+        .order('max(stage_idx)')
+    end
+
+    def stages_with_statuses
+      status_sql = statuses.latest.where('stage=sg.stage').status_sql
+
+      stages_with_statuses = CommitStatus.from(self.stages, :sg).
+        pluck('sg.stage', status_sql)
+
+      stages_with_statuses.map do |stage|
+        OpenStruct.new(
+          name: stage.first,
+          status: stage.last,
+          pipeline: self
+        )
+      end
+    end
+
     def stages_with_latest_statuses
       statuses.latest.includes(project: :namespace).order(:stage_idx).group_by(&:stage)
     end
 
+    def artifacts
+      builds.latest.with_artifacts_not_expired
+    end
+
     def project_id
       project.id
     end
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index c345bf293c9..d9021a38ce3 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -119,16 +119,7 @@ class CommitStatus < ActiveRecord::Base
 
   def self.stages
     # We group by stage name, but order stages by theirs' index
-    unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').pluck('sg.stage')
-  end
-
-  def self.stages_status
-    # We execute subquery for each stage to calculate a stage status
-    statuses = unscoped.from(all, :sg).group('stage').pluck('sg.stage', all.where('stage=sg.stage').status_sql)
-    statuses.inject({}) do |h, k|
-      h[k.first] = k.last
-      h
-    end
+    unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').select('sg.stage')
   end
 
   def failed_but_allowed?
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 0f08f4e8592..d42df00b47f 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -45,9 +45,10 @@
 
   - stages_status = pipeline.statuses.latest.stages_status
   %td.stage-cell
-    - stages.each do |stage|
-      - status = stages_status[stage]
-      - tooltip = "#{stage.titleize}: #{status || 'not found'}"
+    - pipeline.statuses.latest.stages_status.each do |stage|
+      - name = stage.first
+      - status = stage.last
+      - tooltip = "#{name.titleize}: #{status || 'not found'}"
       - if status
         .stage-container
           = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 1174158eb65..cd9ed46d2c1 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -62,5 +62,5 @@
         - if pipeline.project.build_coverage_enabled?
           %th Coverage
         %th
-    - pipeline.statuses.relevant.stages.each do |stage|
+    - pipeline.stages.each do |stage|
       = render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.relevant.where(stage: stage)
diff --git a/app/views/projects/commit/_pipelines_list.haml b/app/views/projects/commit/_pipelines_list.haml
index 2dc91a9b762..7f42fde0fea 100644
--- a/app/views/projects/commit/_pipelines_list.haml
+++ b/app/views/projects/commit/_pipelines_list.haml
@@ -12,4 +12,4 @@
           %th Stages
           %th
           %th
-        = render pipelines, commit_sha: true, stage: true, allow_retry: true, stages: pipelines.stages, show_commit: false
+        = render pipelines, commit_sha: true, stage: true, allow_retry: true, show_commit: false
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 4bc49072f35..8340ce516db 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -51,6 +51,6 @@
             %th Stages
             %th
             %th.hidden-xs
-          = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
+          = render @pipelines, commit_sha: true, stage: true, allow_retry: true
 
       = paginate @pipelines, theme: 'gitlab'
-- 
GitLab