Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr

1 files changed, 26 insertions, 15 deletions

diff --git a/app/services/create_deployment_service.rb b/app/services/create_deployment_service.rb
index c87542e57a2..923de58b244 100644
--- a/app/services/create_deployment_service.rb
+++ b/app/services/create_deployment_service.rb
@@ -2,31 +2,42 @@ require_relative 'base_service'
 
 class CreateDeploymentService < BaseService
   def execute(deployable = nil)
-    environment = find_or_create_environment
+    return unless executable?
 
-    if close?
-      environment.close
-      return
+    ActiveRecord::Base.transaction do
+      @deployable = deployable
+      @environment = prepare_environment
+
+      if close?
+        @environment.close
+        return
+      end
+
+      @environment.reopen
+
+      deploy.tap do |deployment|
+        deployment.update_merge_request_metrics!
+      end
     end
+  end
+
+  private
 
-    environment.reopen
+  def executable?
+    project && name.present?
+  end
 
-    deployment = project.deployments.create(
-      environment: environment,
+  def deploy
+    project.deployments.create(
+      environment: @environment,
       ref: params[:ref],
       tag: params[:tag],
       sha: params[:sha],
       user: current_user,
-      deployable: deployable
-    )
-
-    deployment.update_merge_request_metrics!
-    deployment
+      deployable: @deployable)
   end
 
-  private
-
-  def find_or_create_environment
+  def prepare_environment
     project.environments.find_or_create_by(name: expanded_name) do |environment|
       environment.external_url = expanded_url
     end