Fix included items being repeated on JsonApiResource

Author: d8vjork

src/Http/Resources/CollectsWithIncludes.php

@@ -2,12 +2,8 @@
 
 namespace SkoreLabs\JsonApi\Http\Resources;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-
 /**
  * @property \Illuminate\Support\Collection $collection
- * @property array $with
  */
 trait CollectsWithIncludes
 {
@@ -20,31 +16,7 @@ protected function withIncludes()
     {
         /** @var \SkoreLabs\JsonApi\Http\Resources\JsonApiResource $jsonResource */
         foreach ($this->collection->toArray() as $jsonResource) {
-            if ($jsonResource->with) {
-                $this->addIncluded(Arr::get($jsonResource->with, 'included'));
-            }
-        }
-
-        $included = $this->uniqueIncludes();
-
-        if ($included) {
-            $this->with['included'] = $included;
+            $this->addIncluded($jsonResource);
         }
     }
-
-    /**
-     * Post-process for unique relationship includes.
-     *
-     * @return array
-     */
-    protected function uniqueIncludes()
-    {
-        $includedCollection = Collection::make(
-            Arr::get($this->with, 'included', [])
-        )->flatten();
-
-        return $includedCollection->unique(static function (JsonApiResource $resource) {
-            return implode('', $resource->getResourceIdentifier());
-        })->values()->all();
-    }
 }

src/Http/Resources/RelationshipsWithIncludes.php

@@ -73,24 +73,38 @@ protected function processModelRelation(Model $model)
     {
         $modelResource = new JsonApiResource($model, $this->authorize);
 
-        $this->addIncluded([$modelResource],
-            Arr::get($modelResource->with, 'included', [])
-        );
+        $this->addIncluded($modelResource);
 
         return $modelResource->getResourceIdentifier();
     }
 
     /**
      * Set included data to resource's with.
      *
-     * @param array $arrays,...
+     * @param $resource
      *
      * @return void
      */
-    protected function addIncluded(...$arrays)
+    protected function addIncluded(JsonApiResource $resource)
     {
-        Arr::set($this->with, 'included',
-            array_merge(Arr::get($this->with, 'included', []), ...$arrays)
-        );
+        $itemsCol = Collection::make([
+            $resource,
+            array_values($this->getIncluded()),
+            array_values($resource->getIncluded())
+        ])->flatten();
+
+        Arr::set($this->with, 'included', $itemsCol->unique(static function ($resource) {
+            return implode('', $resource->getResourceIdentifier());
+        })->values()->all());
+    }
+
+    /**
+     * Get resource included relationships.
+     *
+     * @return array
+     */
+    public function getIncluded()
+    {
+        return Arr::get($this->with, 'included', []);
     }
 }