Remove unused FilamentCast and ProfileData classes; refactor FilamentData structure and FilamentService implementation for streamlined filament handling.

Author: andrey-helldar

.gitignore

@@ -28,3 +28,4 @@ yarn-error.log
 /.junie
 /.ai
 /.output.txt
+/routes/playground.php

app/Data/Casts/ArrayToIntegerCast.php

@@ -11,7 +11,7 @@
 
 class ArrayToIntegerCast implements Cast
 {
-    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): int
     {
         if (is_array($value)) {
             return (int) array_first($value);

app/Data/Casts/OrcaSlicer/FilamentCast.php

@@ -4,9 +4,6 @@
 
 use App\Data\Casts\ArrayToFloatCast;
 use App\Data\Casts\ArrayToIntegerCast;
-use App\Data\Casts\OrcaSlicer\FilamentMachineCast;
-use App\Data\Casts\OrcaSlicer\FilamentTitleCast;
-use Illuminate\Support\Str;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapName;
 use Spatie\LaravelData\Attributes\MapOutputName;
@@ -18,16 +15,14 @@
 class FilamentData extends Data
 {
     public function __construct(
+        #[MapInputName('filament_settings_id')]
         #[MapOutputName('external_id')]
-        public string $settingId,
+        public string $settingsId,
 
-        #[MapInputName('name')]
-        #[WithCast(FilamentTitleCast::class)]
-        public string $title,
+        #[MapInputName('default_filament_colour')]
+        public ?string $color = null,
 
-        #[MapInputName('name')]
-        #[WithCast(FilamentMachineCast::class)]
-        public string $machine,
+        public ?string $inherits = null,
 
         #[WithCast(ArrayToFloatCast::class)]
         public float $pressureAdvance = 0,
@@ -42,12 +37,4 @@ public function __construct(
         #[WithCast(ArrayToIntegerCast::class)]
         public int $nozzleTemperatureInitialLayer = 0,
     ) {}
-
-    public static function prepareForPipeline(array $properties): array
-    {
-        $properties['filament_id'] ??= Str::slug($properties['name']);
-        $properties['setting_id']  ??= $properties['filament_id'];
-
-        return $properties;
-    }
 }

app/Data/OrcaSlicer/FilamentData.php

@@ -5,73 +5,42 @@
 namespace App\Services\OrcaSlicer;
 
 use App\Data\OrcaSlicer\FilamentData;
-use App\Exceptions\FilamentProfileNotFoundException;
+use App\Enums\SourceType;
+use App\Models\Map;
 use Illuminate\Container\Attributes\Config;
 use Illuminate\Container\Attributes\Storage;
 use Illuminate\Filesystem\FilesystemAdapter;
-
-use function array_merge;
-use function file_exists;
-use function file_get_contents;
-use function implode;
-use function json_decode;
-use function report;
+use Illuminate\Support\Str;
 
 class FilamentService
 {
     public function __construct(
         #[Storage('orca_slicer')]
         protected FilesystemAdapter $storage,
         #[Config('orca_slicer.directory')]
-        protected string $directory
+        protected string $directory,
     ) {}
 
-    public function get(string $vendor, string $profile, array $meta): ?FilamentData
-    {
-        if (! $parameters = $this->parameters($vendor, $profile)) {
-            return null;
-        }
-
-        $parameters['machine'] = $profile;
-        $parameters['meta']    = $meta;
+    public function get(FilamentData $filament): FilamentData {}
 
-        return FilamentData::from($parameters);
-    }
-
-    protected function parameters(string $vendor, string $profile): array
+    protected function findPath(string $profile, string $key): ?string
     {
-        $parameters = $this->load($vendor, $profile);
-
-        if (! $parent = $parameters['inherits'] ?? false) {
-            return $parameters;
-        }
-
-        $previous = $this->parameters($vendor, $parent);
-
-        return array_merge($previous, $parameters);
+        return Map::query()
+            ->where('type', SourceType::Filament)
+            ->where('profile', $profile)
+            ->where('key', $key)
+            ->first()?->path;
     }
 
-    protected function load(string $vendor, string $profile): array
+    protected function profile(string $key): string
     {
-        $path = $this->path($vendor, $profile);
-
-        if (! file_exists($path)) {
-            report(new FilamentProfileNotFoundException($vendor, $profile, $path));
-
-            return [];
-        }
-
-        return json_decode(file_get_contents($this->path($vendor, $profile)), true);
+        return Str::before($key, ' ');
     }
 
-    protected function path(string $vendor, string $profile): string
+    protected function read(string $filename): array
     {
-        return $this->storage->path(implode(DIRECTORY_SEPARATOR, [
-            $this->directory,
-            'resources/profiles',
-            $vendor,
-            'filament',
-            $profile . '.json',
-        ]));
+        return $this->storage->json(
+            $this->directory . '/resources/profiles/' . $filename
+        );
     }
 }