From 22034da01948e9dc33abc0f9d3002079589aa5e7 Mon Sep 17 00:00:00 2001
From: Bozhidar <bobi@microweber.com>
Date: Wed, 15 May 2024 11:15:51 +0300
Subject: [PATCH] update

---
 web/app/Console/Commands/RunDomainRepair.php  |  6 ++---
 .../{VirtualHosts => Jobs}/ApacheBuild.php    | 24 +++++++++++++------
 web/app/Models/Domain.php                     |  5 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)
 rename web/app/{VirtualHosts => Jobs}/ApacheBuild.php (79%)

diff --git a/web/app/Console/Commands/RunDomainRepair.php b/web/app/Console/Commands/RunDomainRepair.php
index e321e6a..a50ee8e 100644
--- a/web/app/Console/Commands/RunDomainRepair.php
+++ b/web/app/Console/Commands/RunDomainRepair.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\ApacheBuild;
 use App\Models\Domain;
-use App\VirtualHosts\ApacheBuild;
 use Illuminate\Console\Command;
 
 class RunDomainRepair extends Command
@@ -27,8 +27,6 @@ class RunDomainRepair extends Command
      */
     public function handle()
     {
-        $apache = new ApacheBuild();
-        $apache->fixPermissions();
-        $apache->build();
+        ApacheBuild::dispatch(true);
     }
 }
diff --git a/web/app/VirtualHosts/ApacheBuild.php b/web/app/Jobs/ApacheBuild.php
similarity index 79%
rename from web/app/VirtualHosts/ApacheBuild.php
rename to web/app/Jobs/ApacheBuild.php
index 50260eb..c609446 100644
--- a/web/app/VirtualHosts/ApacheBuild.php
+++ b/web/app/Jobs/ApacheBuild.php
@@ -1,21 +1,33 @@
 <?php
 
-namespace App\VirtualHosts;
+namespace App\Jobs;
 
 use App\MasterDomain;
 use App\Models\Domain;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 
-class ApacheBuild
+class ApacheBuild implements ShouldQueue
 {
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $fixPermissions = false;
 
-    public function fixPermissions()
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($fixPermissions = false)
     {
-        $this->fixPermissions = true;
+        $this->fixPermissions = $fixPermissions;
     }
 
-    public function build()
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
     {
         $getAllDomains = Domain::all();
         $virtualHosts = [];
@@ -65,7 +77,5 @@ class ApacheBuild
         file_put_contents('/etc/apache2/apache2.conf', $apache2);
 
         shell_exec('systemctl reload apache2');
-
     }
-
 }
diff --git a/web/app/Models/Domain.php b/web/app/Models/Domain.php
index a420466..7207811 100644
--- a/web/app/Models/Domain.php
+++ b/web/app/Models/Domain.php
@@ -5,8 +5,8 @@ namespace App\Models;
 use App\Actions\ApacheWebsiteDelete;
 use App\Events\DomainIsCreated;
 use App\Events\ModelDomainDeleting;
+use App\Jobs\ApacheBuild;
 use App\ShellApi;
-use App\VirtualHosts\ApacheBuild;
 use App\VirtualHosts\DTO\ApacheVirtualHostSettings;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -87,8 +87,7 @@ class Domain extends Model
 
             $model->configureVirtualHost(true);
 
-            $apacheBuild = new ApacheBuild();
-            $apacheBuild->build();
+            ApacheBuild::dispatch();
 
         });