From 0369909408d4045a2729dcefa7b85e7fe0ff9d9a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 29 May 2025 10:47:26 +0200
Subject: [PATCH] fix(PushServerUpdateJob): add null checks before updating
 application and database statuses

---
 app/Jobs/PushServerUpdateJob.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 93b203fcb..fbf847ed3 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -317,13 +317,16 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
         }
         if ($subType === 'application') {
             $application = $service->applications()->where('id', $subId)->first();
-            $application->status = $containerStatus;
-            $application->save();
+            if ($application) {
+                $application->status = $containerStatus;
+                $application->save();
+            }
         } elseif ($subType === 'database') {
             $database = $service->databases()->where('id', $subId)->first();
-            $database->status = $containerStatus;
-            $database->save();
-        } else {
+            if ($database) {
+                $database->status = $containerStatus;
+                $database->save();
+            }
         }
     }