fix: simplify custom fields temporary storage

Use spl_object_id for temp storage key to avoid key mismatch during model save lifecycle

Author: ManukMinasyan

src/Models/Concerns/UsesCustomFields.php

@@ -36,76 +36,29 @@ public function __construct($attributes = [])
     }
 
     /**
-     * @var array<string, array<string, mixed>>
+     * @var array<int, array<string, mixed>>
      */
     protected static array $tempCustomFields = [];
 
-    /**
-     * Generate a unique key for storing temporary custom fields data.
-     */
-    protected function getTempCustomFieldsKey(): string
-    {
-        // Use class name + key for existing models, or object ID for new models
-        if ($this->exists) {
-            return static::class.':'.$this->getKey();
-        }
-
-        return static::class.':new:'.spl_object_id($this);
-    }
-
     protected static function bootUsesCustomFields(): void
     {
         static::saving(function (Model $model): void {
             $model->handleCustomFields();
         });
-    }
-
-    /**
-     * Override save to handle custom fields after saving.
-     */
-    public function save(array $options = []): bool
-    {
-        $result = parent::save($options);
 
-        if ($result) {
-            $this->saveCustomFieldsFromTemp();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Mutator to intercept custom_fields attribute and store it temporarily.
-     *
-     * @param  array<string, mixed>|null  $value
-     */
-    public function setCustomFieldsAttribute(?array $value): void
-    {
-        // Handle null value (when custom_fields is not provided)
-        if ($value === null) {
-            return;
-        }
-
-        // Store in temporary storage instead of attributes
-        $key = $this->getTempCustomFieldsKey();
-        self::$tempCustomFields[$key] = $value;
-
-        // Mark the model as dirty by updating the updated_at timestamp
-        // This ensures the model will be saved even if no other attributes changed
-        if ($this->usesTimestamps() && ! $this->isDirty('updated_at')) {
-            $this->updated_at = $this->freshTimestamp();
-        }
+        static::saved(function (Model $model): void {
+            $model->saveCustomFieldsFromTemp();
+        });
     }
 
     /**
      * Handle the custom fields before saving the model.
      */
     protected function handleCustomFields(): void
     {
-        if (isset($this->attributes['custom_fields']) && is_array($this->attributes['custom_fields'])) {
-            $key = $this->getTempCustomFieldsKey();
-            self::$tempCustomFields[$key] = $this->attributes['custom_fields'];
-            unset($this->attributes['custom_fields']);
+        if (isset($this->custom_fields) && is_array($this->custom_fields)) {
+            self::$tempCustomFields[spl_object_id($this)] = $this->custom_fields;
+            unset($this->custom_fields);
         }
     }
 
@@ -114,11 +67,11 @@ protected function handleCustomFields(): void
      */
     protected function saveCustomFieldsFromTemp(): void
     {
-        $key = $this->getTempCustomFieldsKey();
+        $objectId = spl_object_id($this);
 
-        if (isset(self::$tempCustomFields[$key]) && method_exists($this, 'saveCustomFields')) {
-            $this->saveCustomFields(self::$tempCustomFields[$key]);
-            unset(self::$tempCustomFields[$key]);
+        if (isset(self::$tempCustomFields[$objectId]) && method_exists($this, 'saveCustomFields')) {
+            $this->saveCustomFields(self::$tempCustomFields[$objectId]);
+            unset(self::$tempCustomFields[$objectId]);
         }
     }