Refactor service and resource deletion logic

app/Actions/Service/DeleteService.php

@@ -10,10 +10,10 @@ class DeleteService
     use AsAction;
     public function handle(Service $service)
     {
+        try {
             $server = data_get($service, 'server');
             if ($server->isFunctional()) {
                 StopService::run($service);
-        }
                 $storagesToDelete = collect([]);
 
                 $service->environment_variables()->delete();
@@ -23,16 +23,13 @@ class DeleteService
                     foreach ($storages as $storage) {
                         $storagesToDelete->push($storage);
                     }
-            $application->forceDelete();
                 }
                 foreach ($service->databases()->get() as $database) {
                     $storages = $database->persistentStorages()->get();
                     foreach ($storages as $storage) {
                         $storagesToDelete->push($storage);
                     }
-            $database->forceDelete();
                 }
-        if ($server->isFunctional()) {
                 foreach ($storagesToDelete as $storage) {
                     $commands[] = "docker volume rm -f $storage->name";
                 }
@@ -40,6 +37,16 @@ class DeleteService
 
                 instant_remote_process($commands, $server, false);
             }
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage());
+        } finally {
+            foreach ($service->applications()->get() as $application) {
+                $application->forceDelete();
+            }
+            foreach ($service->databases()->get() as $database) {
+                $database->forceDelete();
+            }
             $service->forceDelete();
         }
+    }
 }

app/Jobs/DeleteResourceJob.php

@@ -30,25 +30,30 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            $this->resource->delete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);
+                    $this->resource->forceDelete();
                     break;
                 case 'standalone-postgresql':
                     StopDatabase::run($this->resource);
+                    $this->resource->forceDelete();
                     break;
                 case 'standalone-redis':
                     StopDatabase::run($this->resource);
+                    $this->resource->forceDelete();
                     break;
                 case 'standalone-mongodb':
                     StopDatabase::run($this->resource);
+                    $this->resource->forceDelete();
                     break;
                 case 'standalone-mysql':
                     StopDatabase::run($this->resource);
+                    $this->resource->forceDelete();
                     break;
                 case 'standalone-mariadb':
                     StopDatabase::run($this->resource);
+                    $this->resource->forceDelete();
                     break;
                 case 'service':
                     DeleteService::dispatch($this->resource);
@@ -57,8 +62,6 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
             throw $e;
-        } finally {
-            $this->resource->forceDelete();
         }
     }
 }

app/Livewire/Project/Shared/Danger.php

@@ -24,7 +24,8 @@ class Danger extends Component
     public function delete()
     {
         try {
-            DeleteResourceJob::dispatchSync($this->resource);
+            $this->resource->delete();
+            DeleteResourceJob::dispatch($this->resource);
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->projectUuid,
                 'environment_name' => $this->environmentName