From 2b518e22914e04b34f6d23ffd631270640f17630 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Nov 2024 09:16:58 +0100
Subject: [PATCH] refactor a few jobs

---
 app/Console/Kernel.php                |  2 +-
 app/Jobs/CleanupInstanceStuffsJob.php | 30 ++++++++-------------------
 app/Jobs/DockerCleanupJob.php         |  6 ++++++
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 79f5f7e6c..3fb4de60b 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -48,7 +48,7 @@ class Kernel extends ConsoleKernel
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
-            $schedule->job(new CheckHelperImageJob)->everyFiveMinutes()->onOneServer();
+            $schedule->job(new CheckHelperImageJob)->everyTenMinutes()->onOneServer();
 
             // Server Jobs
             $this->checkResources($schedule);
diff --git a/app/Jobs/CleanupInstanceStuffsJob.php b/app/Jobs/CleanupInstanceStuffsJob.php
index acbe82338..84f14ed02 100644
--- a/app/Jobs/CleanupInstanceStuffsJob.php
+++ b/app/Jobs/CleanupInstanceStuffsJob.php
@@ -3,14 +3,15 @@
 namespace App\Jobs;
 
 use App\Models\TeamInvitation;
-use App\Models\Waitlist;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class CleanupInstanceStuffsJob implements ShouldBeEncrypted, ShouldBeUnique, ShouldQueue
 {
@@ -18,34 +19,21 @@ class CleanupInstanceStuffsJob implements ShouldBeEncrypted, ShouldBeUnique, Sho
 
     public function __construct() {}
 
-    // public function uniqueId(): string
-    // {
-    //     return $this->container_name;
-    // }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping('cleanup-instance-stuffs'))->dontRelease()];
+    }
 
     public function handle(): void
     {
         try {
-            // $this->cleanup_waitlist();
+            $this->cleanupInvitationLink();
         } catch (\Throwable $e) {
-            send_internal_notification('CleanupInstanceStuffsJob failed with error: '.$e->getMessage());
-        }
-        try {
-            $this->cleanup_invitation_link();
-        } catch (\Throwable $e) {
-            send_internal_notification('CleanupInstanceStuffsJob failed with error: '.$e->getMessage());
+            Log::error('CleanupInstanceStuffsJob failed with error: '.$e->getMessage());
         }
     }
 
-    private function cleanup_waitlist()
-    {
-        $waitlist = Waitlist::whereVerified(false)->where('created_at', '<', now()->subMinutes(config('constants.waitlist.expiration')))->get();
-        foreach ($waitlist as $item) {
-            $item->delete();
-        }
-    }
-
-    private function cleanup_invitation_link()
+    private function cleanupInvitationLink()
     {
         $invitation = TeamInvitation::all();
         foreach ($invitation as $item) {
diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index 900bae99c..0d7e63dd2 100644
--- a/app/Jobs/DockerCleanupJob.php
+++ b/app/Jobs/DockerCleanupJob.php
@@ -10,6 +10,7 @@ use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
@@ -23,6 +24,11 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
 
     public ?string $usageBefore = null;
 
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
     public function __construct(public Server $server, public bool $manualCleanup = false) {}
 
     public function handle(): void