Fix & change includes (adding pivot models)

Author: d8vjork

src/Http/Resources/CollectsWithIncludes.php

@@ -2,6 +2,9 @@
 
 namespace SkoreLabs\JsonApi\Http\Resources;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
 /**
  * @property \Illuminate\Support\Collection $collection
  */
@@ -14,9 +17,20 @@ trait CollectsWithIncludes
      */
     protected function withIncludes()
     {
+        $collectionIncludes = Collection::make(
+            Arr::get($this->with, 'includes', [])
+        );
+
         /** @var \SkoreLabs\JsonApi\Http\Resources\JsonApiResource $jsonResource */
         foreach ($this->collection->toArray() as $jsonResource) {
-            $this->addIncluded($jsonResource);
+            /** @var \SkoreLabs\JsonApi\Http\Resources\JsonApiResource $resource */
+            foreach ($jsonResource->getIncluded() as $resource) {
+                $collectionIncludes->push($resource);
+            }
         }
+
+        Arr::set($this->with, 'includes', $this->checkUniqueness(
+            $collectionIncludes
+        )->values()->all());
     }
 }

src/Http/Resources/RelationshipsWithIncludes.php

@@ -2,10 +2,10 @@
 
 namespace SkoreLabs\JsonApi\Http\Resources;
 
-use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Collection as DatabaseCollection;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 
 /**
  * @property mixed $resource
@@ -45,7 +45,7 @@ protected function attachRelations(Model $model)
         $relations = array_filter($model->getRelations());
 
         foreach ($relations as $relation => $relationObj) {
-            if ($relationObj instanceof Collection) {
+            if ($relationObj instanceof DatabaseCollection) {
                 /** @var \Illuminate\Database\Eloquent\Model $relationModel */
                 foreach ($relationObj->all() as $relationModel) {
                     $this->relationships[$relation]['data'][] = $this->processModelRelation(
@@ -54,7 +54,7 @@ protected function attachRelations(Model $model)
                 }
             }
 
-            if ($relationObj instanceof Model && !$relationObj instanceof Pivot) {
+            if ($relationObj instanceof Model) {
                 $this->relationships[$relation]['data'] = $this->processModelRelation(
                     $relationObj
                 );
@@ -72,10 +72,14 @@ protected function attachRelations(Model $model)
     protected function processModelRelation(Model $model)
     {
         $modelResource = new JsonApiResource($model, $this->authorize);
+        $modelIdentifier = $modelResource->getResourceIdentifier();
 
-        $this->addIncluded($modelResource);
+        if (!empty(Arr::get($modelIdentifier, $model->getKeyName(), null))) {
+            $this->addIncluded($modelResource);
+            return $modelIdentifier;
+        }
 
-        return $modelResource->getResourceIdentifier();
+        return [];
     }
 
     /**
@@ -93,9 +97,9 @@ protected function addIncluded(JsonApiResource $resource)
             array_values($resource->getIncluded()),
         ])->flatten();
 
-        Arr::set($this->with, 'included', $itemsCol->unique(static function ($resource) {
-            return implode('', $resource->getResourceIdentifier());
-        })->values()->all());
+        Arr::set($this->with, 'included', $this->checkUniqueness(
+            $itemsCol
+        )->values()->all());
     }
 
     /**
@@ -107,4 +111,18 @@ public function getIncluded()
     {
         return Arr::get($this->with, 'included', []);
     }
+
+    /**
+     * Check and return unique resources on a collection.
+     *
+     * @param \Illuminate\Support\Collection
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    protected function checkUniqueness(Collection $collection)
+    {
+        return $collection->unique(static function ($resource) {
+            return implode('', $resource->getResourceIdentifier());
+        });
+    }
 }