fix: filling attributes in perform* methods overrides values set in hooks

Author: alexzarbn

src/Concerns/HandlesRelationStandardOperations.php

@@ -14,6 +14,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use Orion\Http\Requests\Request;
 use Orion\Http\Resources\CollectionResource;
@@ -215,7 +216,9 @@ protected function runStoreParentFetchQuery(Request $request, Builder $query, $p
      */
     protected function performStore(Request $request, Model $parentEntity, Model $entity, array $attributes, array $pivot): void
     {
-        $entity->fill($attributes);
+        $entity->fill(
+            Arr::except($attributes, array_keys($entity->getDirty()))
+        );
 
         if (!$parentEntity->{$this->getRelation()}() instanceof BelongsTo) {
             $parentEntity->{$this->getRelation()}()->save($entity, $this->preparePivotFields($pivot));
@@ -442,7 +445,9 @@ protected function runUpdateFetchQuery(Request $request, Relation $query, Model
      */
     protected function performUpdate(Request $request, Model $parentEntity, Model $entity, array $attributes, array $pivot): void
     {
-        $entity->fill($attributes);
+        $entity->fill(
+            Arr::except($attributes, array_keys($entity->getDirty()))
+        );
         $entity->save();
 
         $relation = $parentEntity->{$this->getRelation()}();

src/Concerns/HandlesStandardOperations.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Arr;
 use Orion\Http\Requests\Request;
 use Orion\Http\Resources\CollectionResource;
 use Orion\Http\Resources\Resource;
@@ -133,7 +134,9 @@ public function store(Request $request)
      */
     protected function performStore(Request $request, Model $entity, array $attributes): void
     {
-        $entity->fill($attributes);
+        $entity->fill(
+            Arr::except($attributes, array_keys($entity->getDirty()))
+        );
         $entity->save();
     }
 
@@ -275,7 +278,9 @@ protected function runUpdateFetchQuery(Request $request, Builder $query, $key):
      */
     protected function performUpdate(Request $request, Model $entity, array $attributes): void
     {
-        $entity->fill($attributes);
+        $entity->fill(
+            Arr::except($attributes, array_keys($entity->getDirty()))
+        );
         $entity->save();
     }