From 071a519db550ffc8ec7642ab692664c6044f8c9a Mon Sep 17 00:00:00 2001
From: Bozhidar <bobi@microweber.com>
Date: Thu, 25 Apr 2024 15:38:39 +0300
Subject: [PATCH] update

---
 web/app/Models/Backup.php     | 6 ++++--
 web/tests/Unit/BackupTest.php | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/app/Models/Backup.php b/web/app/Models/Backup.php
index f1467a4b..3dd4996b 100644
--- a/web/app/Models/Backup.php
+++ b/web/app/Models/Backup.php
@@ -53,7 +53,7 @@ public static function boot()
         });
     }
 
-    private function checkCronJob()
+    public function checkCronJob()
     {
         $cronJobCommand = 'phyre-php /usr/local/phyre/web/artisan phyre:run-backup';
         $findCronJob = CronJob::where('command', $cronJobCommand)->first();
@@ -63,7 +63,9 @@ private function checkCronJob()
             $cronJob->command = $cronJobCommand;
             $cronJob->user = 'root';
             $cronJob->save();
+            return false;
         }
+        return true;
     }
 
     protected function backupRelated() : Attribute
@@ -144,7 +146,7 @@ public function startBackup()
             $findHostingSubscription = HostingSubscription::where('id', $this->hosting_subscription_id)->first();
             if ($findHostingSubscription) {
 
-                $backupFileName = Str::slug($findHostingSubscription->domain .'-'. date('Ymd-His')) . '.tar.gz';
+                $backupFileName = Str::slug($findHostingSubscription->system_username .'-'. date('Ymd-His')) . '.tar.gz';
                 $backupFilePath = $backupPath.'/'.$backupFileName;
 
                 $backupLogFileName = 'backup.log';
diff --git a/web/tests/Unit/BackupTest.php b/web/tests/Unit/BackupTest.php
index 1c669f6d..43143809 100644
--- a/web/tests/Unit/BackupTest.php
+++ b/web/tests/Unit/BackupTest.php
@@ -15,6 +15,10 @@ class BackupTest extends ActionTestCase
 {
     public function testBackup()
     {
+        $backup = new Backup();
+        $checkCronJob = $backup->checkCronJob();
+        $this->assertTrue($checkCronJob);
+
         $customer = new Customer();
         $customer->name = 'UnitBackupTest' . time();
         $customer->email = 'UnitBackupTest' . time() . '@unit-test.com';
@@ -75,6 +79,7 @@ public function testBackup()
         $this->assertTrue(is_dir($findBackup->path . '/unit-test/' . $hostingSubscription->system_username . '/public_html/cgi-bin'));
         $this->assertTrue(is_file($findBackup->path . '/unit-test/' . $hostingSubscription->system_username . '/public_html/index.php'));
 
+
     }
 
 }