From febc399568e16d0ea128a82b821bc996ca34d9e6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 30 Sep 2023 20:47:07 +0200
Subject: [PATCH 1/2] fix: not found base_branch in git webhooks

---
 config/sentry.php   |  2 +-
 config/version.php  |  2 +-
 routes/webhooks.php | 10 +++++++---
 versions.json       |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index f5ec7b6ab..b34772125 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.52',
+    'release' => '4.0.0-beta.53',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 42439e4bb..c90e8cda6 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.52';
+return '4.0.0-beta.53';
diff --git a/routes/webhooks.php b/routes/webhooks.php
index 5f27ed22b..d7b645fb3 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -111,13 +111,17 @@ Route::post('/source/github/events', function () {
         $applications = Application::where('repository_project_id', $id)->whereRelation('source', 'is_public', false);
         if ($x_github_event === 'push') {
             $applications = $applications->where('git_branch', $branch)->get();
+            if ($applications->isEmpty()) {
+                return response("Nothing to do. No applications found with branch '$branch'.");
+            }
         }
         if ($x_github_event === 'pull_request') {
             $applications = $applications->where('git_branch', $base_branch)->get();
+            if ($applications->isEmpty()) {
+                return response("Nothing to do. No applications found with branch '$base_branch'.");
+            }
         }
-        if ($applications->isEmpty()) {
-            return response("Nothing to do. No applications found with branch '$base_branch'.");
-        }
+
         foreach ($applications as $application) {
             $isFunctional = $application->destination->server->isFunctional();
             if (!$isFunctional) {
diff --git a/versions.json b/versions.json
index 49b23e57d..08a738489 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.52"
+            "version": "4.0.0-beta.53"
         }
     }
 }

From 4daa1b8c16ae0eb7c9f433fa131ee7dfbcc7d58e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 30 Sep 2023 20:54:05 +0200
Subject: [PATCH 2/2] fix: coolify db backup

---
 app/Jobs/DatabaseBackupJob.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 1138870b5..a59c6494a 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -62,7 +62,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         try {
             $status = Str::of(data_get($this->database, 'status'));
-            if (!$status->startsWith('running')) {
+            if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
@@ -90,7 +90,6 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $this->upload_to_s3();
             }
             $this->save_backup_logs();
-            // TODO: Notify user
         } catch (\Throwable $e) {
             ray($e->getMessage());
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());