Refactor VariablesController#save_multiple

1 files changed, 13 insertions, 9 deletions

diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index f9d548a14f8..9aacb53078a 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -35,17 +35,12 @@ class Projects::VariablesController < Projects::ApplicationController
   def save_multiple
     respond_to do |format|
       format.json do
-        variables = []
-        variables_params[:variables].each do |variable_hash|
-          variable = project.variables.where(key: variable_hash[:key]).first_or_initialize(variable_hash)
-          variable.assign_attributes(variable_hash) unless variable.new_record?
-          return head :bad_request unless variable.valid?
+        variables = variables_from_params(variables_params)
+        return head :bad_request unless variables.all?(&:valid?)
 
-          variables << variable
-        end
-        variables.each { |variable| variable.save }
+        variables.each(&:save)
+        head :ok
       end
-      head :ok
     end
   end
 
@@ -71,6 +66,15 @@ class Projects::VariablesController < Projects::ApplicationController
     params.permit(variables: [*variable_params_attributes])
   end
 
+  def variables_from_params(params)
+    params[:variables].map do |variable_hash|
+      variable = project.variables.where(key: variable_hash[:key])
+        .first_or_initialize(variable_hash)
+      variable.assign_attributes(variable_hash) unless variable.new_record?
+      variable
+    end
+  end
+
   def variable_params_attributes
     %i[id key value protected _destroy]
   end