update

Author: bobimicroweber

web/app/Models/HostingSubscriptionBackup.php

@@ -84,12 +84,15 @@ public function checkBackup()
 
             $backupDoneFile = $this->path.'/backup-'.$this->id.'.done';
             if (file_exists($backupDoneFile)) {
+
                 $this->size = Helpers::checkPathSize($this->path);
                 $this->status = 'completed';
                 $this->completed = true;
                 $this->completed_at = now();
                 $this->save();
+
                 shell_exec('rm -rf ' . $backupDoneFile);
+
                 return [
                     'status' => 'completed',
                     'message' => 'Backup completed'
@@ -164,6 +167,7 @@ public function startBackup()
 
             $backupTempScript = '/tmp/backup-script-'.$this->id.'.sh';
             $shellFileContent = '';
+            $shellFileContent .= 'mkdir -p '. $backupTargetPath.PHP_EOL;
             $shellFileContent .= 'echo "Backup up domain: '.$findHostingSubscription->domain . PHP_EOL;
             $shellFileContent .= 'echo "Backup filename: '.$backupFileName. PHP_EOL;
             $shellFileContent .= 'cp -r /home/'.$findHostingSubscription->system_username.' '.$backupTempPath.PHP_EOL;
@@ -175,7 +179,6 @@ public function startBackup()
             $shellFileContent .= 'touch ' . $backupTargetPath. '/backup-'.$this->id.'.done' . PHP_EOL;
             $shellFileContent .= 'rm -rf ' . $backupTempScript . PHP_EOL;
 
-            $shellFileContent .= 'mkdir -p '. $backupTargetPath.PHP_EOL;
             $shellFileContent .= 'mv '.$backupFilePath.' '. $backupTargetFilePath.PHP_EOL;
 
             file_put_contents($backupTempScript, $shellFileContent);

web/tests/Unit/HostingSubscriptionBackupTest.php

@@ -17,26 +17,29 @@ class HostingSubscriptionBackupTest extends ActionTestCase
 {
     public function testFullBackup()
     {
-        $this->_createHostingSubscription();
+        $chs = $this->_createHostingSubscription();
 
         Artisan::call('phyre:run-hosting-subscriptions-backup');
 
-        $findLastBackup = HostingSubscriptionBackup::orderBy('id', 'asc')->first();
+        $findLastBackup = HostingSubscriptionBackup::where('hosting_subscription_id', $chs['hostingSubscriptionId'])
+            ->first();
+
         $this->assertNotEmpty($findLastBackup);
         $this->assertNotEmpty($findLastBackup->id);
         $this->assertNotEmpty($findLastBackup->created_at);
         $this->assertSame($findLastBackup->backup_type, 'full');
 
         $backupFinished = false;
-        for ($i = 0; $i < 100; $i++) {
-            $findLastBackup = HostingSubscriptionBackup::orderBy('id', 'desc')->first();
+        for ($i = 0; $i < 50; $i++) {
+            $findLastBackup = HostingSubscriptionBackup::where('id', $findLastBackup->id)->first();
             $findLastBackup->checkBackup();
             if ($findLastBackup->status == BackupStatus::Completed) {
                 $backupFinished = true;
                 break;
             }
             sleep(1);
         }
+
         $this->assertTrue($backupFinished);
         $this->assertSame($findLastBackup->status, BackupStatus::Completed);
         $this->assertNotEmpty($findLastBackup->filepath);
@@ -46,23 +49,25 @@ public function testFullBackup()
         $checkCronJob = $backup->checkCronJob();
         $this->assertTrue($checkCronJob);
 
-        $this->_createHostingSubscription();
+        $chs = $this->_createHostingSubscription();
 
         $backup = new HostingSubscriptionBackup();
         $backup->backup_type = 'full';
+        $backup->hosting_subscription_id = $chs['hostingSubscriptionId'];
         $backup->save();
 
         $backupId = $backup->id;
 
         $findBackup = false;
         $backupCompleted = false;
-        for ($i = 0; $i < 100; $i++) {
+        for ($i = 0; $i < 10; $i++) {
             $findBackup = HostingSubscriptionBackup::where('id', $backupId)->first();
-            $status = $findBackup->checkBackup();
-            dump($status);
-            if ($findBackup->status == BackupStatus::Completed) {
-                $backupCompleted = true;
-                break;
+            if ($findBackup) {
+                $status = $findBackup->checkBackup();
+                if ($findBackup->status == BackupStatus::Completed) {
+                    $backupCompleted = true;
+                    break;
+                }
             }
             sleep(1);
         }
@@ -106,5 +111,11 @@ private function _createHostingSubscription()
         $hostingSubscription->hosting_plan_id = $hostingPlan->id;
         $hostingSubscription->domain = 'unit-backup-test' . time() . '.com';
         $hostingSubscription->save();
+
+        return [
+            'customerId' => $customer->id,
+            'hostingPlanId' => $hostingPlan->id,
+            'hostingSubscriptionId' => $hostingSubscription->id,
+        ];
     }
 }