Merge pull request #48 from tailflow/next

Release v1.2.3

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();
     }
 

src/Testing/InteractsWithJsonFields.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Orion\Testing;
+
+use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Support\Facades\DB;
+
+trait InteractsWithJsonFields
+{
+    protected function castFieldsToJson(array $fields): array
+    {
+        return collect($fields)->map(function ($value) {
+            if (is_array($value) || $value instanceof Jsonable) {
+                return $this->castFieldToJson($value);
+            }
+
+            return $value;
+        })->toArray();
+    }
+
+    protected function castFieldToJson($value)
+    {
+        if ($value instanceof Jsonable) {
+            $value = $value->toJson();
+        } else {
+            $value = json_encode($value);
+        }
+
+        if (config('database.default') === 'mysql') {
+            $value = DB::raw("CAST('{$value}' AS JSON)");
+        }
+        if (config('database.default') === 'pgsql') {
+            $value = DB::raw("'{$value}'::jsonb");
+        }
+
+        return $value;
+    }
+}

src/Testing/InteractsWithResources.php

@@ -326,7 +326,7 @@ protected function assertResourcesToggled($response, string $relation, Model $pa
 
     protected function assertResourceAttached(string $relation, Model $parentModel, Model $relationModel, array $pivotFields = []): void
     {
-        $pivotFields = $this->castPivotFields($pivotFields);
+        $pivotFields = $this->castFieldsToJson($pivotFields);
 
         $this->assertDatabaseHas($parentModel->{$relation}()->getTable(), array_merge([
             $parentModel->{$relation}()->getForeignPivotKeyName() => $parentModel->getKey(),
@@ -346,7 +346,7 @@ protected function assertResourcePivotUpdated($response, string $relation, Model
     {
         $this->assertResponseContent(['updated' => [$relationModel->getKey()]], $response, $exact);
 
-        $pivotFields = $this->castPivotFields($pivotFields);
+        $pivotFields = $this->castFieldsToJson($pivotFields);
 
         $this->assertDatabaseHas($parentModel->{$relation}()->getTable(), array_merge([
             $parentModel->{$relation}()->getForeignPivotKeyName() => $parentModel->getKey(),
@@ -397,23 +397,6 @@ protected function assertJsonSame(array $expected, $response): void
         self::assertSame($expected, $actual);
     }
 
-    protected function castPivotFields(array $pivotFields): array
-    {
-        return collect($pivotFields)->map(function ($pivotFieldValue) {
-            if (is_array($pivotFieldValue)) {
-                $pivotFieldValue = json_encode($pivotFieldValue);
-                if (config('database.default') === 'mysql') {
-                    $pivotFieldValue = DB::raw("CAST('{$pivotFieldValue}' AS JSON)");
-                }
-                if (config('database.default') === 'pgsql') {
-                    $pivotFieldValue = DB::raw("'{$pivotFieldValue}'::jsonb");
-                }
-            }
-
-            return $pivotFieldValue;
-        })->toArray();
-    }
-
     protected function buildSyncMap(array $attached = [], array $detached = [], array $updated = [], array $remained = []): array
     {
         return [

tests/Feature/TestCase.php

@@ -3,13 +3,14 @@
 namespace Orion\Tests\Feature;
 
 use Orion\Testing\InteractsWithAuthorization;
+use Orion\Testing\InteractsWithJsonFields;
 use Orion\Testing\InteractsWithResources;
 use Orion\Tests\Fixtures\App\Models\User;
 use Orion\Tests\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {
-    use InteractsWithResources, InteractsWithAuthorization;
+    use InteractsWithResources, InteractsWithJsonFields, InteractsWithAuthorization;
 
     protected function setUp(): void
     {