Refactor FilamentData and UserProfileService: add UserFilamentNotFoundException, set default color, improve filament retrieval, and handle missing filaments gracefully.

Author: andrey-helldar

app/Data/OrcaSlicer/FilamentData.php

@@ -19,14 +19,14 @@ public function __construct(
         #[WithCast(ArrayToStringCast::class)]
         public string $externalId,
 
-        #[MapInputName('default_filament_colour')]
-        #[WithCast(ArrayToStringCast::class)]
-        public string $color,
-
         public string $name,
 
         public string $inherits,
 
+        #[MapInputName('default_filament_colour')]
+        #[WithCast(ArrayToStringCast::class)]
+        public string $color = '#000000',
+
         #[WithCast(ArrayToFloatCast::class)]
         public float $pressureAdvance = 0,
 

app/Exceptions/UserFilamentNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+use OutOfRangeException;
+
+class UserFilamentNotFoundException extends OutOfRangeException
+{
+    public function __construct(string $vendor, string $filament)
+    {
+        parent::__construct("Vendor: [$vendor] Filament: [$filament]");
+    }
+}

app/Services/OrcaSlicer/UserProfileService.php

@@ -6,6 +6,7 @@
 
 use App\Concerns\WithColor;
 use App\Data\OrcaSlicer\FilamentData;
+use App\Exceptions\UserFilamentNotFoundException;
 use App\Models\Filament;
 use App\Models\Machine;
 use App\Models\User;
@@ -24,8 +25,17 @@ public function import(User $user, Machine $machine, FilamentData $profile): voi
     {
         $vendor = $this->vendor($profile);
 
-        $filament = $this->filament($vendor, $profile->inherits ?: $profile->externalId);
-        $color    = $this->color($profile->color);
+        $value = $profile->inherits ?: $profile->externalId;
+
+        $filament = $this->filament($vendor, $value);
+
+        if (! $filament) {
+            report(new UserFilamentNotFoundException($vendor, $value));
+
+            return;
+        }
+
+        $color = $this->color($profile->color);
 
         $content = $this->filament->get($profile)->toArray();
 
@@ -36,20 +46,20 @@ public function import(User $user, Machine $machine, FilamentData $profile): voi
         ], $content);
     }
 
-    protected function filament(string $vendor, string $filament): Filament
+    protected function filament(string $vendor, string $filament): ?Filament
     {
         $path = $vendor . '/filament/' . $filament . '.json';
 
-        $detected = $this->filamentType->detect($vendor, $filament, $path);
+        $typeId = $this->filamentType->detect($filament, $path);
 
         return Filament::query()
             ->whereRelation('vendor', 'title', 'ilike', '%' . $vendor . '%')
-            ->whereRelation('type', 'title', $detected)
-            ->firstOrFail();
+            ->where('filament_type_id', $typeId)
+            ->first();
     }
 
     protected function vendor(FilamentData $filament): string
     {
-        return Str::of($filament->inherits ?: $filament->externalId)->before(' ')->trim()->toString();
+        return Str::of($filament->externalId)->before(' ')->trim()->toString();
     }
 }