From 0d8cc19698f7c43e9ba73edff6f4c79e4dfab7ff Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 22 Jul 2024 14:13:56 +0200
Subject: [PATCH] fix: deleting application should delete preview deployments

---
 app/Actions/Application/StopApplication.php | 9 +++++++--
 app/Jobs/DeleteResourceJob.php              | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Actions/Application/StopApplication.php b/app/Actions/Application/StopApplication.php
index a812b0c6c..1f05e29ac 100644
--- a/app/Actions/Application/StopApplication.php
+++ b/app/Actions/Application/StopApplication.php
@@ -9,7 +9,7 @@ class StopApplication
 {
     use AsAction;
 
-    public function handle(Application $application)
+    public function handle(Application $application, bool $previewDeployments = false)
     {
         if ($application->destination->server->isSwarm()) {
             instant_remote_process(["docker stack rm {$application->uuid}"], $application->destination->server);
@@ -26,7 +26,12 @@ public function handle(Application $application)
             if (! $server->isFunctional()) {
                 return 'Server is not functional';
             }
-            $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+            if ($previewDeployments) {
+                $containers = getCurrentApplicationContainerStatus($server, $application->id, includePullrequests: true);
+            } else {
+                $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+            }
+            ray($containers);
             if ($containers->count() > 0) {
                 foreach ($containers as $container) {
                     $containerName = data_get($container, 'Names');
diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php
index 68663f3a2..dbf44dd5d 100644
--- a/app/Jobs/DeleteResourceJob.php
+++ b/app/Jobs/DeleteResourceJob.php
@@ -40,7 +40,7 @@ public function handle()
             switch ($this->resource->type()) {
                 case 'application':
                     $persistentStorages = $this->resource?->persistentStorages()?->get();
-                    StopApplication::run($this->resource);
+                    StopApplication::run($this->resource, previewDeployments: true);
                     break;
                 case 'standalone-postgresql':
                 case 'standalone-redis':