summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-07-06 00:23:28 +0900
committerShinya Maeda <shinya@gitlab.com>2017-07-06 00:23:28 +0900
commitdafc34179488d54776e80b8604513184720985cd (patch)
tree534ffedf025a31aeb74f2b21d4bf1a85f543b23d /app
parent951dd04871a9be0bb83eac09883c130ca63cabdc (diff)
downloadgitlab-ce-dafc34179488d54776e80b8604513184720985cd.tar.gz
Revert "Implement Ci::NestedUniquenessValidator"
This reverts commit 8f0a2b6d780347a5ce258ac1a6a6902ce9695ca1.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/pipeline_schedules_controller.rb3
-rw-r--r--app/models/ci/pipeline_schedule.rb5
-rw-r--r--app/services/ci/create_pipeline_schedule_service.rb13
-rw-r--r--app/services/ci/update_pipeline_schedule_service.rb19
-rw-r--r--app/validators/uniqueness_of_in_memory_validator.rb37
5 files changed, 45 insertions, 32 deletions
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb
index 10d478b1eea..aa71f606657 100644
--- a/app/controllers/projects/pipeline_schedules_controller.rb
+++ b/app/controllers/projects/pipeline_schedules_controller.rb
@@ -33,8 +33,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
end
def update
- if Ci::UpdatePipelineScheduleService
- .new(@project, current_user, schedule_params).execute(schedule)
+ if schedule.update(schedule_params)
redirect_to namespace_project_pipeline_schedules_path(@project.namespace.becomes(Namespace), @project)
else
render :edit
diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb
index df9df45edb0..ad9f8b89924 100644
--- a/app/models/ci/pipeline_schedule.rb
+++ b/app/models/ci/pipeline_schedule.rb
@@ -15,6 +15,11 @@ module Ci
validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
validates :ref, presence: { unless: :importing? }
validates :description, presence: true
+ validates :variables, uniqueness_of_in_memory: {
+ :collection => :variables,
+ :attrs => [:pipeline_schedule_id, :key],
+ :message => ['variables.key', 'keys are duplicated']
+ }
before_save :set_next_run_at
diff --git a/app/services/ci/create_pipeline_schedule_service.rb b/app/services/ci/create_pipeline_schedule_service.rb
index 7016592cd10..cd40deb6187 100644
--- a/app/services/ci/create_pipeline_schedule_service.rb
+++ b/app/services/ci/create_pipeline_schedule_service.rb
@@ -1,22 +1,13 @@
module Ci
class CreatePipelineScheduleService < BaseService
def execute
- pipeline_schedule = project.pipeline_schedules.build(pipeline_schedule_params)
-
- if Ci::NestedUniquenessValidator.duplicated?(pipeline_schedule_params['variables_attributes'], 'key')
- pipeline_schedule.errors.add('variables.key', "keys are duplicated")
-
- return pipeline_schedule
- end
-
- pipeline_schedule.save
- pipeline_schedule
+ project.pipeline_schedules.create(pipeline_schedule_params)
end
private
def pipeline_schedule_params
- @pipeline_schedule_params ||= params.merge(owner: current_user)
+ params.merge(owner: current_user)
end
end
end
diff --git a/app/services/ci/update_pipeline_schedule_service.rb b/app/services/ci/update_pipeline_schedule_service.rb
deleted file mode 100644
index 0ab84e19583..00000000000
--- a/app/services/ci/update_pipeline_schedule_service.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Ci
- class UpdatePipelineScheduleService < BaseService
- def execute(pipeline_schedule)
- if Ci::NestedUniquenessValidator.duplicated?(pipeline_schedule_params['variables_attributes'], 'key')
- pipeline_schedule.errors.add('variables.key', "keys are duplicated")
-
- return false
- end
-
- pipeline_schedule.update(pipeline_schedule_params)
- end
-
- private
-
- def pipeline_schedule_params
- @pipeline_schedule_params ||= params.merge(owner: current_user)
- end
- end
-end
diff --git a/app/validators/uniqueness_of_in_memory_validator.rb b/app/validators/uniqueness_of_in_memory_validator.rb
new file mode 100644
index 00000000000..84e88b2eb76
--- /dev/null
+++ b/app/validators/uniqueness_of_in_memory_validator.rb
@@ -0,0 +1,37 @@
+# UniquenessOfInMemoryValidator
+#
+# This validtor is designed for especially the following condition
+# - Use `accepts_nested_attributes_for :xxx` in a parent model
+# - Use `validates :xxx, uniqueness: { scope: :xxx_id }` in a child model
+#
+# Inspired by https://stackoverflow.com/a/2883129/2522666
+module ActiveRecord
+ class Base
+ # Validate that the the objects in +collection+ are unique
+ # when compared against all their non-blank +attrs+. If not
+ # add +message+ to the base errors.
+ def validate_uniqueness_of_in_memory(collection, attrs, message)
+ hashes = collection.inject({}) do |hash, record|
+ key = attrs.map { |a| record.send(a).to_s }.join
+ if key.blank? || record.marked_for_destruction?
+ key = record.object_id
+ end
+ hash[key] = record unless hash[key]
+ hash
+ end
+
+ if collection.length > hashes.length
+ self.errors.add(*message)
+ end
+ end
+ end
+end
+
+class UniquenessOfInMemoryValidator < ActiveModel::Validator
+ def validate(record)
+ record.validate_uniqueness_of_in_memory(
+ record.public_send(options[:collection]),
+ options[:attrs],
+ options[:message])
+ end
+end