From fbd3b3d8a245072121784df11b7b41d3257b989f Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 12 May 2017 04:12:04 +0900
Subject: Add API support for pipeline schedule

---
 lib/api/api.rb                |   1 +
 lib/api/entities.rb           |   8 +++
 lib/api/pipeline_schedules.rb | 127 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+)
 create mode 100644 lib/api/pipeline_schedules.rb

(limited to 'lib')

diff --git a/lib/api/api.rb b/lib/api/api.rb
index ac113c5200d..bbdd2039f43 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -110,6 +110,7 @@ module API
     mount ::API::Notes
     mount ::API::NotificationSettings
     mount ::API::Pipelines
+    mount ::API::PipelineSchedules
     mount ::API::ProjectHooks
     mount ::API::Projects
     mount ::API::ProjectSnippets
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 8c5e5c91769..1f1942b2ec1 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -686,6 +686,14 @@ module API
       expose :coverage
     end
 
+    class PipelineSchedule < Grape::Entity
+      expose :id
+      expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
+      expose :created_at, :updated_at, :deleted_at
+      expose :last_pipeline, using: Entities::Pipeline, if: -> (pipeline_schedule, opts) { pipeline_schedule.last_pipeline.present? }
+      expose :owner, using: Entities::UserBasic
+    end
+
     class EnvironmentBasic < Grape::Entity
       expose :id, :name, :slug, :external_url
     end
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
new file mode 100644
index 00000000000..32fa5a86fab
--- /dev/null
+++ b/lib/api/pipeline_schedules.rb
@@ -0,0 +1,127 @@
+module API
+  class PipelineSchedules < Grape::API
+    include PaginationParams
+
+    params do
+      requires :id, type: String, desc: 'The ID of a project'
+    end
+    resource :projects, requirements: { id: %r{[^/]+} } do
+      desc 'Get pipeline_schedules list' do
+        success Entities::PipelineSchedule
+      end
+      params do
+        use :pagination
+      end
+      get ':id/pipeline_schedules' do
+        authenticate!
+        authorize! :read_pipeline_schedule, user_project
+
+        pipeline_schedules = user_project.pipeline_schedules
+
+        present paginate(pipeline_schedules), with: Entities::PipelineSchedule
+      end
+
+      desc 'Get specific pipeline_schedule of a project' do
+        success Entities::PipelineSchedule
+      end
+      params do
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+      end
+      get ':id/pipeline_schedules/:pipeline_schedule_id' do
+        authenticate!
+        authorize! :read_pipeline_schedule, user_project
+
+        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
+        return not_found!('PipelineSchedule') unless pipeline_schedule
+
+        present pipeline_schedule, with: Entities::PipelineSchedule
+      end
+
+      desc 'Create a pipeline_schedule' do
+        success Entities::PipelineSchedule
+      end
+      params do
+        requires :description, type: String, desc: 'The pipeline_schedule description'
+        requires :ref, type: String, desc: 'The pipeline_schedule ref'
+        requires :cron, type: String, desc: 'The pipeline_schedule cron'
+        requires :cron_timezone, type: String, desc: 'The pipeline_schedule cron_timezone'
+        requires :active, type: Boolean, desc: 'The pipeline_schedule active'
+      end
+      post ':id/pipeline_schedules' do
+        authenticate!
+        authorize! :create_pipeline_schedule, user_project
+
+        pipeline_schedule = user_project.pipeline_schedules.create(
+          declared_params(include_missing: false).merge(owner: current_user))
+
+        if pipeline_schedule.valid?
+          present pipeline_schedule, with: Entities::PipelineSchedule
+        else
+          render_validation_error!(pipeline_schedule)
+        end
+      end
+
+      desc 'Update a pipeline_schedule' do
+        success Entities::PipelineSchedule
+      end
+      params do
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+        optional :description, type: String, desc: 'The pipeline_schedule description'
+        optional :ref, type: String, desc: 'The pipeline_schedule ref'
+        optional :cron, type: String, desc: 'The pipeline_schedule cron'
+        optional :cron_timezone, type: String, desc: 'The pipeline_schedule cron_timezone'
+        optional :active, type: Boolean, desc: 'The pipeline_schedule active'
+      end
+      put ':id/pipeline_schedules/:pipeline_schedule_id' do
+        authenticate!
+        authorize! :create_pipeline_schedule, user_project
+
+        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
+        return not_found!('PipelineSchedule') unless pipeline_schedule
+
+        if pipeline_schedule.update(declared_params(include_missing: false))
+          present pipeline_schedule, with: Entities::PipelineSchedule
+        else
+          render_validation_error!(pipeline_schedule)
+        end
+      end
+
+      desc 'Take ownership of pipeline_schedule' do
+        success Entities::PipelineSchedule
+      end
+      params do
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+      end
+      post ':id/pipeline_schedules/:pipeline_schedule_id/take_ownership' do
+        authenticate!
+        authorize! :create_pipeline_schedule, user_project
+
+        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
+        return not_found!('PipelineSchedule') unless pipeline_schedule
+
+        if pipeline_schedule.update(owner: current_user)
+          status :ok
+          present pipeline_schedule, with: Entities::PipelineSchedule
+        else
+          render_validation_error!(pipeline_schedule)
+        end
+      end
+
+      desc 'Delete a pipeline_schedule' do
+        success Entities::PipelineSchedule
+      end
+      params do
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+      end
+      delete ':id/pipeline_schedules/:pipeline_schedule_id' do
+        authenticate!
+        authorize! :admin_pipeline_schedule, user_project
+
+        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
+        return not_found!('PipelineSchedule') unless pipeline_schedule
+
+        present pipeline_schedule.destroy, with: Entities::PipelineSchedule
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 0a11ab48993d092bd730af9b378fbf665b255625 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 13 May 2017 01:48:34 +0900
Subject: Reflect doc to api desc

---
 lib/api/pipeline_schedules.rb | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 32fa5a86fab..5b3af090e2b 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -6,7 +6,7 @@ module API
       requires :id, type: String, desc: 'The ID of a project'
     end
     resource :projects, requirements: { id: %r{[^/]+} } do
-      desc 'Get pipeline_schedules list' do
+      desc 'Get a list of pipeline schedules' do
         success Entities::PipelineSchedule
       end
       params do
@@ -21,11 +21,11 @@ module API
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end
 
-      desc 'Get specific pipeline_schedule of a project' do
+      desc 'Get a single pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
-        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       get ':id/pipeline_schedules/:pipeline_schedule_id' do
         authenticate!
@@ -37,15 +37,15 @@ module API
         present pipeline_schedule, with: Entities::PipelineSchedule
       end
 
-      desc 'Create a pipeline_schedule' do
+      desc 'Creates a new pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
-        requires :description, type: String, desc: 'The pipeline_schedule description'
-        requires :ref, type: String, desc: 'The pipeline_schedule ref'
-        requires :cron, type: String, desc: 'The pipeline_schedule cron'
-        requires :cron_timezone, type: String, desc: 'The pipeline_schedule cron_timezone'
-        requires :active, type: Boolean, desc: 'The pipeline_schedule active'
+        requires :description, type: String, desc: 'The description of pipeline schedule'
+        requires :ref, type: String, desc: 'The branch/tag name will be triggered'
+        requires :cron, type: String, desc: 'The cron'
+        requires :cron_timezone, type: String, desc: 'The timezone'
+        requires :active, type: Boolean, desc: 'The activation of pipeline schedule'
       end
       post ':id/pipeline_schedules' do
         authenticate!
@@ -61,16 +61,16 @@ module API
         end
       end
 
-      desc 'Update a pipeline_schedule' do
+      desc 'Updates an existing pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
-        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
-        optional :description, type: String, desc: 'The pipeline_schedule description'
-        optional :ref, type: String, desc: 'The pipeline_schedule ref'
-        optional :cron, type: String, desc: 'The pipeline_schedule cron'
-        optional :cron_timezone, type: String, desc: 'The pipeline_schedule cron_timezone'
-        optional :active, type: Boolean, desc: 'The pipeline_schedule active'
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
+        optional :description, type: String, desc: 'The description of pipeline schedule'
+        optional :ref, type: String, desc: 'The branch/tag name will be triggered'
+        optional :cron, type: String, desc: 'The cron'
+        optional :cron_timezone, type: String, desc: 'The timezone'
+        optional :active, type: Boolean, desc: 'The activation of pipeline schedule'
       end
       put ':id/pipeline_schedules/:pipeline_schedule_id' do
         authenticate!
@@ -86,11 +86,11 @@ module API
         end
       end
 
-      desc 'Take ownership of pipeline_schedule' do
+      desc 'Update an owner of a pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
-        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       post ':id/pipeline_schedules/:pipeline_schedule_id/take_ownership' do
         authenticate!
@@ -107,11 +107,11 @@ module API
         end
       end
 
-      desc 'Delete a pipeline_schedule' do
+      desc 'Delete a pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
-        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline_schedule ID'
+        requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       delete ':id/pipeline_schedules/:pipeline_schedule_id' do
         authenticate!
-- 
cgit v1.2.3


From 97bf2401991ab2e9cea956dfb7c9630e2a185683 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 13 May 2017 03:06:05 +0900
Subject: Remove if from last_pipeline in entity

---
 lib/api/entities.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1f1942b2ec1..b2bc0a17142 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,7 +690,7 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at, :deleted_at
-      expose :last_pipeline, using: Entities::Pipeline, if: -> (pipeline_schedule, opts) { pipeline_schedule.last_pipeline.present? }
+      expose :last_pipeline, using: Entities::Pipeline
       expose :owner, using: Entities::UserBasic
     end
 
-- 
cgit v1.2.3


From 8743f765abc2281c664792f5016747f54d0fb7aa Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 13 May 2017 03:10:16 +0900
Subject: Use CreatePipelineScheduleService

---
 lib/api/pipeline_schedules.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 5b3af090e2b..6e6bbb29e3a 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -51,8 +51,9 @@ module API
         authenticate!
         authorize! :create_pipeline_schedule, user_project
 
-        pipeline_schedule = user_project.pipeline_schedules.create(
-          declared_params(include_missing: false).merge(owner: current_user))
+        pipeline_schedule = Ci::CreatePipelineScheduleService
+          .new(user_project, current_user, declared_params(include_missing: false))
+          .execute
 
         if pipeline_schedule.valid?
           present pipeline_schedule, with: Entities::PipelineSchedule
-- 
cgit v1.2.3


From f8cb5fd65a8ed00f38368a6a050c940e72cc6f3e Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 13 May 2017 03:37:09 +0900
Subject: Add own! method on PipleineSchedule

---
 lib/api/pipeline_schedules.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 6e6bbb29e3a..81b88b17041 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -100,7 +100,7 @@ module API
         pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
-        if pipeline_schedule.update(owner: current_user)
+        if pipeline_schedule.own!(current_user)
           status :ok
           present pipeline_schedule, with: Entities::PipelineSchedule
         else
-- 
cgit v1.2.3


From a104e7a2c92d9752e48b2ac776b547809b0036d5 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Tue, 16 May 2017 23:58:08 +0900
Subject: Move authenticate! to before

---
 lib/api/pipeline_schedules.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 81b88b17041..2319ff639e5 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -2,6 +2,8 @@ module API
   class PipelineSchedules < Grape::API
     include PaginationParams
 
+    before { authenticate! }
+
     params do
       requires :id, type: String, desc: 'The ID of a project'
     end
@@ -13,7 +15,6 @@ module API
         use :pagination
       end
       get ':id/pipeline_schedules' do
-        authenticate!
         authorize! :read_pipeline_schedule, user_project
 
         pipeline_schedules = user_project.pipeline_schedules
@@ -28,7 +29,6 @@ module API
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       get ':id/pipeline_schedules/:pipeline_schedule_id' do
-        authenticate!
         authorize! :read_pipeline_schedule, user_project
 
         pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
@@ -48,7 +48,6 @@ module API
         requires :active, type: Boolean, desc: 'The activation of pipeline schedule'
       end
       post ':id/pipeline_schedules' do
-        authenticate!
         authorize! :create_pipeline_schedule, user_project
 
         pipeline_schedule = Ci::CreatePipelineScheduleService
@@ -74,7 +73,6 @@ module API
         optional :active, type: Boolean, desc: 'The activation of pipeline schedule'
       end
       put ':id/pipeline_schedules/:pipeline_schedule_id' do
-        authenticate!
         authorize! :create_pipeline_schedule, user_project
 
         pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
@@ -94,7 +92,6 @@ module API
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       post ':id/pipeline_schedules/:pipeline_schedule_id/take_ownership' do
-        authenticate!
         authorize! :create_pipeline_schedule, user_project
 
         pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
@@ -115,7 +112,6 @@ module API
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       delete ':id/pipeline_schedules/:pipeline_schedule_id' do
-        authenticate!
         authorize! :admin_pipeline_schedule, user_project
 
         pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
-- 
cgit v1.2.3


From 94f7595b9a8edcb4ac8480995a067eb4fa3dec7e Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Wed, 17 May 2017 00:20:11 +0900
Subject: Define last_pipeline in PipelineScheduleEntity

---
 lib/api/entities.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b2bc0a17142..93f28e39f82 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,7 +690,9 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at, :deleted_at
-      expose :last_pipeline, using: Entities::Pipeline
+      expose :last_pipeline, using: Entities::Pipeline do |pipeline_schedule|
+        pipeline_schedule.pipelines&.last
+      end
       expose :owner, using: Entities::UserBasic
     end
 
-- 
cgit v1.2.3


From e828e835e435deab8a62c7c999dca0b774e7a7d6 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Wed, 17 May 2017 01:33:09 +0900
Subject: avoids N + 1 queries

---
 lib/api/pipeline_schedules.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 2319ff639e5..9429306fe20 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -17,7 +17,7 @@ module API
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedules = user_project.pipeline_schedules
+        pipeline_schedules = user_project.pipeline_schedules.preload(:pipelines)
 
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end
-- 
cgit v1.2.3


From df6040bbd41a639b3d0aa339b2dc0e84d67b811b Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Wed, 17 May 2017 21:26:18 +0900
Subject: zj keen eye2

---
 lib/api/pipeline_schedules.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 9429306fe20..58888417888 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -54,7 +54,7 @@ module API
           .new(user_project, current_user, declared_params(include_missing: false))
           .execute
 
-        if pipeline_schedule.valid?
+        if pipeline_schedule.persisted?
           present pipeline_schedule, with: Entities::PipelineSchedule
         else
           render_validation_error!(pipeline_schedule)
@@ -98,7 +98,6 @@ module API
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.own!(current_user)
-          status :ok
           present pipeline_schedule, with: Entities::PipelineSchedule
         else
           render_validation_error!(pipeline_schedule)
-- 
cgit v1.2.3


From 17b9128b305aefc29fddae3b51d13c61ae7dfef9 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Wed, 17 May 2017 22:58:23 +0900
Subject: includes last_pipeline

---
 lib/api/entities.rb           | 4 +---
 lib/api/pipeline_schedules.rb | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 93f28e39f82..b2bc0a17142 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,9 +690,7 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at, :deleted_at
-      expose :last_pipeline, using: Entities::Pipeline do |pipeline_schedule|
-        pipeline_schedule.pipelines&.last
-      end
+      expose :last_pipeline, using: Entities::Pipeline
       expose :owner, using: Entities::UserBasic
     end
 
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 58888417888..27be796356c 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -17,7 +17,7 @@ module API
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedules = user_project.pipeline_schedules.preload(:pipelines)
+        pipeline_schedules = user_project.pipeline_schedules.includes(last_pipeline: {statuses: :latest})
 
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end
-- 
cgit v1.2.3


From 20a07d26ff4be9c82271297e516df912109b05aa Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Thu, 18 May 2017 17:45:08 +0900
Subject: Include owner for pipeline_schedules. Improve N+1 spec. Use
 PipelineBasic for small payload.

---
 lib/api/entities.rb           | 2 +-
 lib/api/pipeline_schedules.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b2bc0a17142..f0260cf03f3 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,7 +690,7 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at, :deleted_at
-      expose :last_pipeline, using: Entities::Pipeline
+      expose :last_pipeline, using: Entities::PipelineBasic
       expose :owner, using: Entities::UserBasic
     end
 
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 27be796356c..c6c22f6e518 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -17,7 +17,7 @@ module API
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedules = user_project.pipeline_schedules.includes(last_pipeline: {statuses: :latest})
+        pipeline_schedules = user_project.pipeline_schedules.includes([:owner, last_pipeline: {statuses: :latest}])
 
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end
-- 
cgit v1.2.3


From 8c40bbbe7d0d1bb930a590f5ca98570bd32ad1f0 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Thu, 18 May 2017 17:58:55 +0900
Subject: Switch to preload. Remove unncecessary associations.

---
 lib/api/pipeline_schedules.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index c6c22f6e518..3b9d5b0d7a6 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -17,7 +17,7 @@ module API
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedules = user_project.pipeline_schedules.includes([:owner, last_pipeline: {statuses: :latest}])
+        pipeline_schedules = user_project.pipeline_schedules.preload([:owner, :last_pipeline])
 
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end
-- 
cgit v1.2.3


From 92bc1ddaf5a256a5e6636bc4a6f8ebd8673ec719 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Thu, 18 May 2017 18:22:41 +0900
Subject: Dryup fetching pipeline_schedule with helper

---
 lib/api/pipeline_schedules.rb | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 3b9d5b0d7a6..454237d3fbb 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -17,8 +17,6 @@ module API
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedules = user_project.pipeline_schedules.preload([:owner, :last_pipeline])
-
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end
 
@@ -31,7 +29,6 @@ module API
       get ':id/pipeline_schedules/:pipeline_schedule_id' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         present pipeline_schedule, with: Entities::PipelineSchedule
@@ -75,7 +72,6 @@ module API
       put ':id/pipeline_schedules/:pipeline_schedule_id' do
         authorize! :create_pipeline_schedule, user_project
 
-        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.update(declared_params(include_missing: false))
@@ -94,7 +90,6 @@ module API
       post ':id/pipeline_schedules/:pipeline_schedule_id/take_ownership' do
         authorize! :create_pipeline_schedule, user_project
 
-        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.own!(current_user)
@@ -113,11 +108,24 @@ module API
       delete ':id/pipeline_schedules/:pipeline_schedule_id' do
         authorize! :admin_pipeline_schedule, user_project
 
-        pipeline_schedule = user_project.pipeline_schedules.find(params.delete(:pipeline_schedule_id))
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         present pipeline_schedule.destroy, with: Entities::PipelineSchedule
       end
     end
+
+    helpers do
+      def pipeline_schedules
+        @pipeline_schedules ||=
+          user_project.pipeline_schedules.preload([:owner, :last_pipeline])
+      end
+
+      def pipeline_schedule
+        @pipeline_schedule ||=
+          user_project.pipeline_schedules
+                      .preload([:owner, :last_pipeline])
+                      .find(params.delete(:pipeline_schedule_id))
+      end
+    end
   end
 end
-- 
cgit v1.2.3


From f6a8894a5928e1cc37d8301c555fcfd5953cc180 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 19 May 2017 02:42:23 +0900
Subject: Expose last_pipeline only when detailed status

---
 lib/api/entities.rb           |  2 +-
 lib/api/pipeline_schedules.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index f0260cf03f3..d779cd2a294 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,7 +690,7 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at, :deleted_at
-      expose :last_pipeline, using: Entities::PipelineBasic
+      expose :last_pipeline, using: Entities::PipelineBasic, if: { type: :full }
       expose :owner, using: Entities::UserBasic
     end
 
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 454237d3fbb..c013d6f316b 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -31,7 +31,7 @@ module API
 
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
-        present pipeline_schedule, with: Entities::PipelineSchedule
+        present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
       end
 
       desc 'Creates a new pipeline schedule' do
@@ -52,7 +52,7 @@ module API
           .execute
 
         if pipeline_schedule.persisted?
-          present pipeline_schedule, with: Entities::PipelineSchedule
+          present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
         else
           render_validation_error!(pipeline_schedule)
         end
@@ -75,7 +75,7 @@ module API
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.update(declared_params(include_missing: false))
-          present pipeline_schedule, with: Entities::PipelineSchedule
+          present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
         else
           render_validation_error!(pipeline_schedule)
         end
@@ -93,7 +93,7 @@ module API
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.own!(current_user)
-          present pipeline_schedule, with: Entities::PipelineSchedule
+          present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
         else
           render_validation_error!(pipeline_schedule)
         end
@@ -110,7 +110,7 @@ module API
 
         return not_found!('PipelineSchedule') unless pipeline_schedule
 
-        present pipeline_schedule.destroy, with: Entities::PipelineSchedule
+        present pipeline_schedule.destroy, with: Entities::PipelineSchedule, type: :full
       end
     end
 
-- 
cgit v1.2.3


From bfa028e13a41b16b0da2d69359694edbebf9e455 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 19 May 2017 22:24:31 +0900
Subject: Remove deleted_at from Entity. Use find_by. Remove returns.

---
 lib/api/entities.rb           |  2 +-
 lib/api/pipeline_schedules.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index d779cd2a294..40ef62fdb14 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -689,7 +689,7 @@ module API
     class PipelineSchedule < Grape::Entity
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
-      expose :created_at, :updated_at, :deleted_at
+      expose :created_at, :updated_at
       expose :last_pipeline, using: Entities::PipelineBasic, if: { type: :full }
       expose :owner, using: Entities::UserBasic
     end
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index c013d6f316b..367f6e2fbab 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -29,7 +29,7 @@ module API
       get ':id/pipeline_schedules/:pipeline_schedule_id' do
         authorize! :read_pipeline_schedule, user_project
 
-        return not_found!('PipelineSchedule') unless pipeline_schedule
+        not_found!('PipelineSchedule') unless pipeline_schedule
 
         present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
       end
@@ -72,7 +72,7 @@ module API
       put ':id/pipeline_schedules/:pipeline_schedule_id' do
         authorize! :create_pipeline_schedule, user_project
 
-        return not_found!('PipelineSchedule') unless pipeline_schedule
+        not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.update(declared_params(include_missing: false))
           present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
@@ -90,7 +90,7 @@ module API
       post ':id/pipeline_schedules/:pipeline_schedule_id/take_ownership' do
         authorize! :create_pipeline_schedule, user_project
 
-        return not_found!('PipelineSchedule') unless pipeline_schedule
+        not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.own!(current_user)
           present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
@@ -108,7 +108,7 @@ module API
       delete ':id/pipeline_schedules/:pipeline_schedule_id' do
         authorize! :admin_pipeline_schedule, user_project
 
-        return not_found!('PipelineSchedule') unless pipeline_schedule
+        not_found!('PipelineSchedule') unless pipeline_schedule
 
         present pipeline_schedule.destroy, with: Entities::PipelineSchedule, type: :full
       end
@@ -124,7 +124,7 @@ module API
         @pipeline_schedule ||=
           user_project.pipeline_schedules
                       .preload([:owner, :last_pipeline])
-                      .find(params.delete(:pipeline_schedule_id))
+                      .find_by(id: params.delete(:pipeline_schedule_id))
       end
     end
   end
-- 
cgit v1.2.3


From c91292b61f80626b91d41cc17d0a662f302d6ecd Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Wed, 24 May 2017 19:25:13 +0900
Subject: Improve document

---
 lib/api/pipeline_schedules.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 367f6e2fbab..4b7dd487186 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -8,7 +8,7 @@ module API
       requires :id, type: String, desc: 'The ID of a project'
     end
     resource :projects, requirements: { id: %r{[^/]+} } do
-      desc 'Get a list of pipeline schedules' do
+      desc 'Get all pipeline schedules' do
         success Entities::PipelineSchedule
       end
       params do
@@ -34,7 +34,7 @@ module API
         present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
       end
 
-      desc 'Creates a new pipeline schedule' do
+      desc 'Create a new pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
@@ -58,7 +58,7 @@ module API
         end
       end
 
-      desc 'Updates an existing pipeline schedule' do
+      desc 'Edit a pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
@@ -81,7 +81,7 @@ module API
         end
       end
 
-      desc 'Update an owner of a pipeline schedule' do
+      desc 'Take ownership of a pipeline schedule' do
         success Entities::PipelineSchedule
       end
       params do
-- 
cgit v1.2.3


From b17c8d67d8811e0a440338dc25464d8c90e81179 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 27 May 2017 21:29:01 +0900
Subject: Use PipelineScheduleDetails

---
 lib/api/entities.rb           |  5 ++++-
 lib/api/pipeline_schedules.rb | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 40ef62fdb14..e10bd230ae2 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,10 +690,13 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at
-      expose :last_pipeline, using: Entities::PipelineBasic, if: { type: :full }
       expose :owner, using: Entities::UserBasic
     end
 
+    class PipelineScheduleDetails < PipelineSchedule
+      expose :last_pipeline, using: Entities::PipelineBasic
+    end
+
     class EnvironmentBasic < Grape::Entity
       expose :id, :name, :slug, :external_url
     end
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 4b7dd487186..5269239b7ed 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -21,7 +21,7 @@ module API
       end
 
       desc 'Get a single pipeline schedule' do
-        success Entities::PipelineSchedule
+        success Entities::PipelineScheduleDetails
       end
       params do
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
@@ -31,11 +31,11 @@ module API
 
         not_found!('PipelineSchedule') unless pipeline_schedule
 
-        present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
+        present pipeline_schedule, with: Entities::PipelineScheduleDetails
       end
 
       desc 'Create a new pipeline schedule' do
-        success Entities::PipelineSchedule
+        success Entities::PipelineScheduleDetails
       end
       params do
         requires :description, type: String, desc: 'The description of pipeline schedule'
@@ -52,14 +52,14 @@ module API
           .execute
 
         if pipeline_schedule.persisted?
-          present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
+          present pipeline_schedule, with: Entities::PipelineScheduleDetails
         else
           render_validation_error!(pipeline_schedule)
         end
       end
 
       desc 'Edit a pipeline schedule' do
-        success Entities::PipelineSchedule
+        success Entities::PipelineScheduleDetails
       end
       params do
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
@@ -75,14 +75,14 @@ module API
         not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.update(declared_params(include_missing: false))
-          present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
+          present pipeline_schedule, with: Entities::PipelineScheduleDetails
         else
           render_validation_error!(pipeline_schedule)
         end
       end
 
       desc 'Take ownership of a pipeline schedule' do
-        success Entities::PipelineSchedule
+        success Entities::PipelineScheduleDetails
       end
       params do
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
@@ -93,14 +93,14 @@ module API
         not_found!('PipelineSchedule') unless pipeline_schedule
 
         if pipeline_schedule.own!(current_user)
-          present pipeline_schedule, with: Entities::PipelineSchedule, type: :full
+          present pipeline_schedule, with: Entities::PipelineScheduleDetails
         else
           render_validation_error!(pipeline_schedule)
         end
       end
 
       desc 'Delete a pipeline schedule' do
-        success Entities::PipelineSchedule
+        success Entities::PipelineScheduleDetails
       end
       params do
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
@@ -110,7 +110,7 @@ module API
 
         not_found!('PipelineSchedule') unless pipeline_schedule
 
-        present pipeline_schedule.destroy, with: Entities::PipelineSchedule, type: :full
+        present pipeline_schedule.destroy, with: Entities::PipelineScheduleDetails
       end
     end
 
-- 
cgit v1.2.3


From 63ca126e977666335d7e5f70665815d1289a6f34 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 27 May 2017 22:22:33 +0900
Subject: Improve API with optinal and default. Allow to use scope as a
 parameter.

---
 lib/api/pipeline_schedules.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 5269239b7ed..52ad682b972 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -13,11 +13,15 @@ module API
       end
       params do
         use :pagination
+        optional :scope,    type: String, values: %w[active inactive],
+                            desc: 'The scope of pipeline schedules'
       end
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        present paginate(pipeline_schedules), with: Entities::PipelineSchedule
+        schedules = PipelineSchedulesFinder.new(user_project).execute(scope: params[:scope])
+          .preload([:owner, :last_pipeline])
+        present paginate(schedules), with: Entities::PipelineSchedule
       end
 
       desc 'Get a single pipeline schedule' do
@@ -41,8 +45,8 @@ module API
         requires :description, type: String, desc: 'The description of pipeline schedule'
         requires :ref, type: String, desc: 'The branch/tag name will be triggered'
         requires :cron, type: String, desc: 'The cron'
-        requires :cron_timezone, type: String, desc: 'The timezone'
-        requires :active, type: Boolean, desc: 'The activation of pipeline schedule'
+        optional :cron_timezone, type: String, default: 'UTC', desc: 'The timezone'
+        optional :active, type: Boolean, default: true, desc: 'The activation of pipeline schedule'
       end
       post ':id/pipeline_schedules' do
         authorize! :create_pipeline_schedule, user_project
-- 
cgit v1.2.3


From 3b61451c46f462b392783b282fe63dbddd8b6c2e Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Sat, 27 May 2017 22:31:22 +0900
Subject: Return 202 for destory. Remove []. Remove def pipeline_schedules from
 helper.

---
 lib/api/pipeline_schedules.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 52ad682b972..d9509375698 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -114,20 +114,16 @@ module API
 
         not_found!('PipelineSchedule') unless pipeline_schedule
 
+        status :accepted
         present pipeline_schedule.destroy, with: Entities::PipelineScheduleDetails
       end
     end
 
     helpers do
-      def pipeline_schedules
-        @pipeline_schedules ||=
-          user_project.pipeline_schedules.preload([:owner, :last_pipeline])
-      end
-
       def pipeline_schedule
         @pipeline_schedule ||=
           user_project.pipeline_schedules
-                      .preload([:owner, :last_pipeline])
+                      .preload(:owner, :last_pipeline)
                       .find_by(id: params.delete(:pipeline_schedule_id))
       end
     end
-- 
cgit v1.2.3


From 2da420be04ae1fa00b06149c0293a0349a085e99 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Wed, 31 May 2017 00:06:37 +0900
Subject: Use update_pipeline_schedule

---
 lib/api/pipeline_schedules.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index d9509375698..93d89209934 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -74,7 +74,7 @@ module API
         optional :active, type: Boolean, desc: 'The activation of pipeline schedule'
       end
       put ':id/pipeline_schedules/:pipeline_schedule_id' do
-        authorize! :create_pipeline_schedule, user_project
+        authorize! :update_pipeline_schedule, user_project
 
         not_found!('PipelineSchedule') unless pipeline_schedule
 
@@ -92,7 +92,7 @@ module API
         requires :pipeline_schedule_id, type: Integer,  desc: 'The pipeline schedule id'
       end
       post ':id/pipeline_schedules/:pipeline_schedule_id/take_ownership' do
-        authorize! :create_pipeline_schedule, user_project
+        authorize! :update_pipeline_schedule, user_project
 
         not_found!('PipelineSchedule') unless pipeline_schedule
 
-- 
cgit v1.2.3