Big changes

.gitignore

@@ -27,3 +27,4 @@ yarn-error.log
 /.zed
 /.junie
 /.ai
+/.output.txt

app/Concerns/WithColor.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Models\Color;
+
+trait WithColor
+{
+    protected array $colors = [];
+
+    protected array $colorMap = [
+        'Yellow' => '#FFFF00',
+        'Green'  => '#00FF00',
+        'Blue'   => '#0000FF',
+        'Grey'   => '#808080',
+        'White'  => '#FFFFFF',
+        'Gold'   => '#FFCF40',
+    ];
+
+    protected function color(string $name): Color
+    {
+        return $this->colors[$name] ??= Color::firstOrCreate([
+            'title' => $name,
+            'hex'   => $this->colorMap[$name] ?? '#000000',
+        ]);
+    }
+}

app/Concerns/WithFilaments.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Models\Filament;
+use App\Models\FilamentType;
+use App\Models\Vendor;
+
+trait WithFilaments
+{
+    protected array $filamentTypes = [];
+
+    protected array $filaments = [];
+
+    protected function filamentType(string $value): FilamentType
+    {
+        return $this->filamentTypes[$value] ??= FilamentType::firstOrCreate(['title' => $value]);
+    }
+
+    protected function filament(Vendor $vendor, FilamentType $filamentType): Filament
+    {
+        $key = $vendor->id . '-' . $filamentType->id;
+
+        return $this->filaments[$key] ??= $vendor->filaments()->updateOrCreate([
+            'filament_type_id' => $filamentType->id,
+        ]);
+    }
+}

app/Concerns/WithNozzles.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Models\Nozzle;
+
+trait WithNozzles
+{
+    protected array $nozzles = [];
+
+    protected function nozzle(string|float $value): Nozzle
+    {
+        return $this->nozzles[(string) $value] ??= Nozzle::firstOrCreate(['title' => $value]);
+    }
+}

app/Concerns/WithVendor.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Models\Vendor;
+
+trait WithVendor
+{
+    protected array $vendors = [];
+
+    protected function vendor(string $name): Vendor
+    {
+        return $this->vendors[$name] ??= Vendor::firstOrCreate(['title' => $name]);
+    }
+}

app/Console/Commands/OrcaSlicer/ImportCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\OrcaSlicer;
+
+use App\Services\OrcaSlicer\DownloadService;
+use App\Services\OrcaSlicer\FilamentTypeService;
+use App\Services\OrcaSlicer\MachineService;
+use App\Services\OrcaSlicer\MapService;
+use App\Services\OrcaSlicer\NozzleService;
+use Illuminate\Console\Command;
+
+class ImportCommand extends Command
+{
+    protected $signature = 'orca-slicer:import';
+
+    protected $description = 'Update resources from OrcaSlicer';
+
+    public function handle(
+        DownloadService $download,
+        MapService $map,
+        MachineService $machine,
+        NozzleService $nozzle,
+        FilamentTypeService $filament,
+    ): void {
+        //$this->components->task('Clean up', fn () => $download->cleanup());
+        //$this->components->task('Download', fn () => $download->download());
+        //$this->components->task('Extract', fn () => $download->extract());
+        //$this->components->task('Release', fn () => $download->release());
+        $this->components->task('Import map', fn () => $map->import());
+        $this->components->task('Import machines', fn () => $machine->import());
+        $this->components->task('Import nozzles', fn () => $nozzle->import());
+        $this->components->task('Import filaments', fn () => $filament->import());
+    }
+}

app/Enums/SourceType.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+enum SourceType: string
+{
+    case Machine  = 'machine';
+    case Filament = 'filament';
+    case Process  = 'process';
+}

app/Http/Controllers/HomeController.php

@@ -4,27 +4,24 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\UserFilament;
+use App\Http\Requests\HomeFilterRequest;
+use App\Services\Pages\HomeService;
 use Inertia\Inertia;
 
 class HomeController
 {
-    public function __invoke()
+    public function __invoke(HomeFilterRequest $request, HomeService $home)
     {
-        $settings = UserFilament::query()
-            ->with([
-                'machine.vendor',
-                'filament' => ['vendor', 'type'],
-                'color',
-            ])
-            ->orderBy('machine_id')
-            ->orderBy('filament_id')
-            ->orderBy('color_id')
-            ->orderBy('id')
-            ->get();
-
         return Inertia::render('welcome', [
-            'settings' => $settings,
+            'userFilaments' => $home->userFilaments(
+                $request->integer('machine_id'),
+                $request->integer('filament_type_id'),
+                $request->integer('color_id'),
+            ),
+            'machines'      => $home->machines(),
+            'filamentTypes' => $home->filamentTypes(),
+            'colors'        => $home->colors(),
+            'filters'       => $request->validated(),
         ]);
     }
 }

app/Http/Requests/HomeFilterRequest.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class HomeFilterRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'machine_id'       => ['nullable', 'integer', 'min:0'],
+            'filament_type_id' => ['nullable', 'integer', 'min:0'],
+            'color_id'         => ['nullable', 'integer', 'min:0'],
+        ];
+    }
+}

app/Models/Color.php

@@ -7,6 +7,7 @@
 use App\Casts\HexCast;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Color extends Model
@@ -24,4 +25,9 @@ protected function casts(): array
             'hex' => HexCast::class,
         ];
     }
+
+    public function userFilament(): HasMany
+    {
+        return $this->hasMany(UserFilament::class);
+    }
 }

app/Models/Filament.php

@@ -6,6 +6,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -16,6 +17,7 @@ class Filament extends Model
     protected $fillable = [
         'vendor_id',
         'filament_type_id',
+        'external_id',
     ];
 
     public function vendor(): Relation
@@ -27,4 +29,9 @@ public function type(): Relation
     {
         return $this->belongsTo(FilamentType::class, 'filament_type_id', 'id');
     }
+
+    public function userFilament(): HasMany
+    {
+        return $this->hasMany(UserFilament::class);
+    }
 }

app/Models/FilamentType.php

@@ -4,9 +4,9 @@
 
 namespace App\Models;
 
-use App\Casts\FilamentTypeTitleCast;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class FilamentType extends Model
@@ -17,10 +17,15 @@ class FilamentType extends Model
         'title',
     ];
 
-    protected function casts(): array
+    public function userFilaments(): HasManyThrough
     {
-        return [
-            'title' => FilamentTypeTitleCast::class,
-        ];
+        return $this->hasManyThrough(
+            UserFilament::class,
+            Filament::class,
+            'filament_type_id',
+            'filament_id',
+            'id',
+            'id'
+        );
     }
 }

app/Models/Machine.php

@@ -8,6 +8,7 @@
 use App\Events\SluggableEvent;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -34,6 +35,11 @@ protected function casts(): array
 
     public function vendor(): Relation
     {
-        return $this->belongsTo(Vendor::class);
+        return $this->belongsTo(Vendor::class, 'vendor_id', 'id');
+    }
+
+    public function userFilament(): HasMany
+    {
+        return $this->hasMany(UserFilament::class);
     }
 }