Feature/ensov7

database/factories/DataImportFactory.php

@@ -3,7 +3,7 @@
 namespace LaravelEnso\DataImport\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Models\DataImport;
 
 class DataImportFactory extends Factory
@@ -18,7 +18,7 @@ public function definition()
             'params' => [],
             'successful' => 0,
             'failed' => 0,
-            'status' => Statuses::Waiting,
+            'status' => Status::Waiting->value,
         ];
     }
 }

database/factories/ImportFactory.php

@@ -3,7 +3,7 @@
 namespace LaravelEnso\DataImport\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Models\Import;
 
 class ImportFactory extends Factory
@@ -18,7 +18,7 @@ public function definition()
             'params' => [],
             'successful' => 0,
             'failed' => 0,
-            'status' => Statuses::Waiting,
+            'status' => Status::Waiting->value,
         ];
     }
 }

src/Commands/CancelStuck.php

@@ -3,7 +3,7 @@
 namespace LaravelEnso\DataImport\Commands;
 
 use Illuminate\Console\Command;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Models\Import;
 
 class CancelStuck extends Command
@@ -15,7 +15,7 @@ class CancelStuck extends Command
     public function handle()
     {
         Import::stuck()->update([
-            'status' => Statuses::Cancelled,
+            'status' => Status::Cancelled->value,
             'batch' => null,
         ]);
     }

src/Commands/Purge.php

@@ -3,7 +3,7 @@
 namespace LaravelEnso\DataImport\Commands;
 
 use Illuminate\Console\Command;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Models\Import;
 
 class Purge extends Command
@@ -16,7 +16,7 @@ public function handle()
     {
         Import::expired()->notDeletable()
             ->update([
-                'status' => Statuses::Cancelled,
+                'status' => Status::Cancelled->value,
                 'batch' => null,
             ]);
 

src/EnumServiceProvider.php

@@ -2,14 +2,10 @@
 
 namespace LaravelEnso\DataImport;
 
-use LaravelEnso\DataImport\Enums\CssClasses;
-use LaravelEnso\DataImport\Enums\Statuses;
 use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider;
 
 class EnumServiceProvider extends ServiceProvider
 {
     public $register = [
-        'importCssClasses' => CssClasses::class,
-        'importStatuses' => Statuses::class,
     ];
 }

src/Enums/CssClass.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace LaravelEnso\DataImport\Enums;
+
+use LaravelEnso\Enums\Contracts\Frontend;
+
+enum CssClass: string implements Frontend
+{
+    case Waiting = 'is-info';
+    case Processing = 'is-warning';
+    case Processed = 'is-primary';
+    case ExportingRejected = 'is-danger';
+    case Finalized = 'is-success';
+    case Cancelled = 'is-danger';
+
+    public static function registerBy(): string
+    {
+        return 'importCssClasses';
+    }
+}

src/Enums/Status.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace LaravelEnso\DataImport\Enums;
+
+use LaravelEnso\Enums\Contracts\Frontend;
+use LaravelEnso\Enums\Contracts\Mappable;
+use LaravelEnso\Enums\Contracts\Select;
+use LaravelEnso\Enums\Traits\Select as Options;
+
+enum Status: int implements Mappable, Select, Frontend
+{
+    use Options;
+
+    case Waiting = 10;
+    case Processing = 20;
+    case Processed = 23;
+    case ExportingRejected = 26;
+    case Finalized = 30;
+    case Cancelled = 40;
+
+    public function map(): string
+    {
+        return match ($this) {
+            self::Waiting => 'waiting',
+            self::Processing => 'processing',
+            self::Processed => 'processed',
+            self::ExportingRejected => 'exporting rejected',
+            self::Finalized => 'finalized',
+            self::Cancelled => 'cancelled',
+        };
+    }
+
+    public static function registerBy(): string
+    {
+        return 'importStatuses';
+    }
+
+    public static function isRunning(int $status): bool
+    {
+        return match ($status) {
+            self::Waiting->value => true,
+            self::Processing->value => true,
+            self::Processed->value => false,
+            self::ExportingRejected->value => false,
+            self::Finalized->value => false,
+            self::Cancelled->value => false,
+        };
+    }
+
+    public static function isDeletable(int $status): bool
+    {
+        return match ($status) {
+            self::Waiting->value => false,
+            self::Processing->value => false,
+            self::Processed->value => false,
+            self::ExportingRejected->value => false,
+            self::Finalized->value => true,
+            self::Cancelled->value => true,
+        };
+    }
+
+    public static function deletable(): array
+    {
+        return [self::Finalized->value, self::Cancelled->value];
+    }
+}

src/Jobs/Finalize.php

@@ -8,7 +8,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Config;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Models\Import;
 use LaravelEnso\DataImport\Notifications\ImportDone;
 use LaravelEnso\DataImport\Services\Notifiables;
@@ -24,7 +24,7 @@ public function __construct(private Import $import)
 
     public function handle()
     {
-        $this->import->update(['status' => Statuses::Finalized]);
+        $this->import->update(['status' => Status::Finalized->value]);
 
         $this->notify();
     }

src/Models/Import.php

@@ -14,7 +14,7 @@
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Conditionable;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Exceptions\Import as Exception;
 use LaravelEnso\DataImport\Jobs\Import as Job;
 use LaravelEnso\DataImport\Services\Options;
@@ -85,17 +85,17 @@ public function scopeStuck(Builder $query): Builder
             ->subHours(Config::get('enso.imports.cancelStuckAfter'));
 
         return $query->where('created_at', '<', $cancelStuckAfter)
-            ->whereNotIn('status', [Statuses::Finalized, Statuses::Cancelled]);
+            ->whereNotIn('status', [Status::Finalized->value, Status::Cancelled->value]);
     }
 
     public function scopeDeletable(Builder $query): Builder
     {
-        return $query->whereIn('status', Statuses::deletable());
+        return $query->whereIn('status', Status::deletable());
     }
 
     public function scopeNotDeletable(Builder $query): Builder
     {
-        return $query->whereNotIn('status', Statuses::deletable());
+        return $query->whereNotIn('status', Status::deletable());
     }
 
     public function extensions(): array
@@ -155,32 +155,32 @@ public function status(): int
     {
         return $this->running()
             ? $this->status
-            : Statuses::Finalized;
+            : Status::Finalized->value;
     }
 
     public function waiting(): bool
     {
-        return $this->status === Statuses::Waiting;
+        return $this->status === Status::Waiting->value;
     }
 
     public function cancelled(): bool
     {
-        return $this->status === Statuses::Cancelled;
+        return $this->status === Status::Cancelled->value;
     }
 
     public function processing(): bool
     {
-        return $this->status === Statuses::Processing;
+        return $this->status === Status::Processing->value;
     }
 
     public function finalized(): bool
     {
-        return $this->status === Statuses::Finalized;
+        return $this->status === Status::Finalized->value;
     }
 
     public function running(): bool
     {
-        return in_array($this->status, Statuses::running());
+        return Status::isRunning($this->status);
     }
 
     public function template(): Template
@@ -235,8 +235,8 @@ public function upload(UploadedFile $file): array
 
     public function forceDelete()
     {
-        if (! Statuses::isDeletable($this->status)) {
-            $this->update(['status' => Statuses::Cancelled]);
+        if (! Status::isDeletable($this->status)) {
+            $this->update(['status' => Status::Cancelled->value]);
         }
 
         $this->delete();
@@ -252,7 +252,7 @@ public function purge(): void
 
     public function delete()
     {
-        if (! Statuses::isDeletable($this->status)) {
+        if (! Status::isDeletable($this->status)) {
             throw Exception::deleteRunningImport();
         }
 
@@ -274,7 +274,7 @@ public function cancel()
         $this->batch()?->cancel();
 
         $this->update([
-            'status' => Statuses::Cancelled,
+            'status' => Status::Cancelled->value,
             'batch' => null,
         ]);
     }
@@ -302,7 +302,7 @@ public function restart(): void
         $this->update([
             'successful' => 0,
             'failed' => 0,
-            'status' => Statuses::Waiting,
+            'status' => Status::Waiting->value,
         ]);
 
         $this->import();

src/Services/Exporters/Rejected.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Models\Import;
 use LaravelEnso\DataImport\Models\RejectedChunk;
 use LaravelEnso\DataImport\Models\RejectedImport;
@@ -31,7 +31,7 @@ public function __construct(private Import $import)
 
     public function handle(): void
     {
-        $this->import->update(['status' => Statuses::ExportingRejected]);
+        $this->import->update(['status' => Status::ExportingRejected->value]);
 
         $this->initWriter();
 

src/Services/Importers/Import.php

@@ -8,7 +8,7 @@
 use LaravelEnso\DataImport\Contracts\AfterHook;
 use LaravelEnso\DataImport\Contracts\Authenticates;
 use LaravelEnso\DataImport\Contracts\BeforeHook;
-use LaravelEnso\DataImport\Enums\Statuses;
+use LaravelEnso\DataImport\Enums\Status;
 use LaravelEnso\DataImport\Jobs\Finalize;
 use LaravelEnso\DataImport\Jobs\RejectedExport;
 use LaravelEnso\DataImport\Jobs\Sheet;
@@ -36,7 +36,7 @@ public function handle(): void
     private function prepare(): self
     {
         if ($this->import->waiting()) {
-            $this->import->update(['status' => Statuses::Processing]);
+            $this->import->update(['status' => Status::Processing->value]);
         }
 
         return $this;