Fixed #79. Ignore Email global scope if app is running in console.

RickDBCN · Sep 15, 2024 · 73b33f1 · 73b33f1
1 parent 912a931
commit 73b33f1
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/Models/Email.php b/src/Models/Email.php
@@ -53,10 +53,12 @@ public function team(): BelongsTo
     protected static function booted(): void
     {
         static::addGlobalScope('teams', function (Builder $query) {
-            if (auth()->check() && Filament::getTenant()) {
-                $query->whereBelongsTo(auth()->user()?->teams);
-            } else {
-                $query->whereTeamId(null);
+            if (!app()->runningInConsole()) {
+                if (auth()->check() && Filament::getTenant()) {
+                    $query->whereBelongsTo(auth()->user()?->teams);
+                } else {
+                    $query->whereTeamId(null);
+                }
             }
         });
     }
@@ -66,34 +68,33 @@ public static function boot()
         parent::boot();
 
         self::deleting(function ($record) {
+            $folderPath = "";
             $storageDisk = config('filament-email.attachments_disk', 'local');
-            $folderPath = null;
-            if (! empty($record->attachments)) {
+            if (!empty($record->attachments)) {
                 foreach ($record->attachments as $attachment) {
                     $filePath = Storage::disk($storageDisk)->path($attachment['path']);
                     if (empty($folderPath)) {
                         $parts = explode(DIRECTORY_SEPARATOR, $attachment['path']);
                         array_pop($parts);
                         $folderPath = implode(DIRECTORY_SEPARATOR, $parts);
                     }
-                    if (! Storage::directoryExists($folderPath) && Storage::disk($storageDisk)->exists($attachment['path'])) {
+                    if (Storage::disk($storageDisk)->exists($attachment['path'])) {
                         Storage::disk($storageDisk)->delete($attachment['path']);
                     }
                 }
             }
-
-            if (! empty($record->raw_body) && count(explode(DIRECTORY_SEPARATOR, $record->raw_body)) === 3) {
-                if (! Storage::disk($storageDisk)->directoryExists($record->raw_body) && Storage::disk($storageDisk)->exists($record->raw_body)) {
+            if (!empty($record->raw_body) && count(explode(DIRECTORY_SEPARATOR, $record->raw_body)) === 3) {
+                if (Storage::disk($storageDisk)->exists($record->raw_body)) {
                     if (empty($folderPath)) {
                         $parts = explode(DIRECTORY_SEPARATOR, $record->raw_body);
                         array_pop($parts);
                         $folderPath = implode(DIRECTORY_SEPARATOR, $parts);
                     }
                     Storage::disk($storageDisk)->delete($record->raw_body);
                 }
-                if (Storage::disk($storageDisk)->directoryExists($folderPath)) {
-                    Storage::disk($storageDisk)->deleteDirectory($folderPath);
-                }
+            }
+            if (!empty($folderPath) && Storage::disk($storageDisk)->directoryExists($folderPath)) {
+                Storage::disk($storageDisk)->deleteDirectory($folderPath);
             }
         });
     }