From d10e4fa38824f35bff8ad477838ef26f8e894fb9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Wed, 10 Sep 2025 13:26:35 +0200
Subject: [PATCH] refactor(deployment): streamline next deployment queuing
 logic by repositioning queue_next_deployment call

---
 app/Jobs/ApplicationDeploymentJob.php | 4 ++--
 bootstrap/helpers/applications.php    | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 6059cb99a..a1a15eb40 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -2457,8 +2457,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function next(string $status)
     {
-        queue_next_deployment($this->application);
-
         // Never allow changing status from FAILED or CANCELLED_BY_USER to anything else
         if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::FAILED->value) {
             $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
@@ -2473,6 +2471,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             'status' => $status,
         ]);
 
+        queue_next_deployment($this->application);
+
         if ($status === ApplicationDeploymentStatus::FINISHED->value) {
             if (! $this->only_this_server) {
                 $this->deploy_to_additional_destinations();
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index 6c4f8fd22..87c24dbc6 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -108,7 +108,6 @@ function queue_next_deployment(Application $application)
             ApplicationDeploymentJob::dispatch(
                 application_deployment_queue_id: $next_deployment->id,
             );
-            break;
         }
     }
 }
@@ -158,7 +157,6 @@ function next_after_cancel(?Server $server = null)
                     ApplicationDeploymentJob::dispatch(
                         application_deployment_queue_id: $next->id,
                     );
-                    break;
                 }
             }
         }