refactor: rewrite duplicate methods

Author: KilianTrunk

src/Filament/Resources/ProductResource/Pages/CreateProduct.php

@@ -38,31 +38,6 @@ protected function mutateFormDataBeforeCreate(array $data): array
         return $data;
     }
 
-    protected function afterCreate(): void
-    {
-        if ($this->record) {
-            $state = $this->form->getRawState();
-            $propertyData = [];
-            foreach ($state as $key => $value) {
-                if (is_string($key) && str_starts_with($key, 'property_values_')) {
-                    $propertyId = str_replace('property_values_', '', $key);
-                    $propertyData[$propertyId] = $value;
-                }
-            }
-
-            foreach ($propertyData as $propertyId => $values) {
-                if ($values) {
-                    $valuesToAttach = is_array($values) ? $values : [$values];
-                    $valuesToAttach = array_filter($valuesToAttach);
-
-                    if (! empty($valuesToAttach)) {
-                        $this->record->propertyValues()->attach($valuesToAttach);
-                    }
-                }
-            }
-        }
-    }
-
     protected function getFormTenantFlags(): array
     {
         return ['is_active', 'has_free_delivery'];
@@ -91,9 +66,35 @@ protected function afterCreate(): void
         /** @var Product $product */
         $product = $this->record;
 
+        if (! $product) {
+            return;
+        }
+
         $state = $this->form->getState();
+        $rawState = $this->form->getRawState();
         $tenantData = $state['tenant_data'] ?? [];
 
+        // Handle property values
+        $propertyData = [];
+        foreach ($rawState as $key => $value) {
+            if (is_string($key) && str_starts_with($key, 'property_values_')) {
+                $propertyId = str_replace('property_values_', '', $key);
+                $propertyData[$propertyId] = $value;
+            }
+        }
+
+        foreach ($propertyData as $propertyId => $values) {
+            if ($values) {
+                $valuesToAttach = is_array($values) ? $values : [$values];
+                $valuesToAttach = array_filter($valuesToAttach);
+
+                if (! empty($valuesToAttach)) {
+                    $product->propertyValues()->attach($valuesToAttach);
+                }
+            }
+        }
+
+        // Handle tenant/group associations
         $isTenancyEnabled = (bool) config('eclipse-catalogue.tenancy.model');
         if ($isTenancyEnabled) {
             foreach ($tenantData as $tenantId => $data) {