fix some bugs

Author: tobyzerner

src/Adapter/EloquentAdapter.php

@@ -15,7 +15,6 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use InvalidArgumentException;
 use Tobyz\JsonApiServer\Schema\Attribute;
 use Tobyz\JsonApiServer\Schema\HasMany;
@@ -65,7 +64,7 @@ public function get($query): array
 
     public function count($query): int
     {
-        return $query->count();
+        return $query->getQuery()->getCountForPagination();
     }
 
     public function getId($model): string
@@ -80,20 +79,22 @@ public function getAttribute($model, Attribute $attribute)
 
     public function getHasOne($model, HasOne $relationship, bool $linkage)
     {
-        $relation = $this->getEloquentRelation($model, $relationship);
-
         // If it's a belongs-to relationship and we only need to get the ID,
         // then we don't have to actually load the relation because the ID is
         // stored in a column directly on the model. We will mock up a related
         // model with the value of the ID filled.
-        if ($linkage && $relation instanceof BelongsTo) {
-            if ($key = $model->{$relation->getForeignKeyName()}) {
-                $related = $relation->getRelated();
+        if ($linkage) {
+            $relation = $this->getEloquentRelation($model, $relationship);
 
-                return $related->newInstance()->forceFill([$related->getKeyName() => $key]);
-            }
+            if ($relation instanceof BelongsTo) {
+                if ($key = $model->{$relation->getForeignKeyName()}) {
+                    $related = $relation->getRelated();
 
-            return null;
+                    return $related->newInstance()->forceFill([$related->getKeyName() => $key]);
+                }
+
+                return null;
+            }
         }
 
         return $this->getRelationValue($model, $relationship);

src/Handler/Concerns/IncludesData.php

@@ -16,6 +16,7 @@
 use Tobyz\JsonApiServer\JsonApi;
 use Tobyz\JsonApiServer\ResourceType;
 use Tobyz\JsonApiServer\Schema\Relationship;
+use function Tobyz\JsonApiServer\evaluate;
 use function Tobyz\JsonApiServer\run_callbacks;
 
 /**
@@ -95,6 +96,7 @@ private function loadRelationshipsAtLevel(array $models, array $relationshipPath
             if (
                 ! $field instanceof Relationship
                 || (! $field->isLinkage() && ! isset($include[$name]))
+                || $field->isVisible() === false
             ) {
                 continue;
             }
@@ -111,12 +113,12 @@ private function loadRelationshipsAtLevel(array $models, array $relationshipPath
 
                     $adapter->load($models, $nextRelationshipPath, $scope, $field->isLinkage());
                 }
-            }
 
-            if (isset($include[$name]) && is_string($type = $field->getType())) {
-                $relatedResource = $this->api->getResource($type);
+                if (isset($include[$name]) && is_string($type = $field->getType())) {
+                    $relatedResource = $this->api->getResource($type);
 
-                $this->loadRelationshipsAtLevel($models, $nextRelationshipPath, $relatedResource, $include[$name] ?? [], $request);
+                    $this->loadRelationshipsAtLevel($models, $nextRelationshipPath, $relatedResource, $include[$name] ?? [], $request);
+                }
             }
         }
     }

src/Handler/Index.php

@@ -11,6 +11,7 @@
 
 namespace Tobyz\JsonApiServer\Handler;
 
+use Illuminate\Support\Arr;
 use JsonApiPhp\JsonApi as Structure;
 use JsonApiPhp\JsonApi\Link\LastLink;
 use JsonApiPhp\JsonApi\Link\NextLink;
@@ -57,13 +58,11 @@ public function handle(Request $request): Response
 
         $include = $this->getInclude($request);
 
-        $this->filter($query, $request);
+        [$offset, $limit] = $this->paginate($query, $request);
         $this->sort($query, $request);
+        $this->filter($query, $request);
 
         $total = $schema->isCountable() ? $adapter->count($query) : null;
-
-        [$offset, $limit] = $this->paginate($query, $request);
-
         $models = $adapter->get($query);
 
         $this->loadRelationships($models, $include, $request);
@@ -107,7 +106,7 @@ private function buildUrl(Request $request, array $overrideParams = []): string
             }
         }
 
-        $queryString = http_build_query($queryParams);
+        $queryString = Arr::query($queryParams);
 
         return $selfUrl.($queryString ? '?'.$queryString : '');
     }

src/Serializer.php

@@ -101,7 +101,7 @@ private function addToMap(ResourceType $resource, $model, array $include, bool $
                 $value = $this->attribute($field, $resource, $model);
             } elseif ($field instanceof Schema\Relationship) {
                 $isIncluded = isset($include[$name]);
-                $relationshipInclude = $isIncluded ? ($relationshipInclude[$name] ?? []) : null;
+                $relationshipInclude = $isIncluded ? ($include[$name] ?? []) : null;
                 $links = $this->relationshipLinks($field, $url);
                 $meta = $this->meta($field->getMeta(), $model);
                 $members = array_merge($links, $meta);
@@ -160,7 +160,7 @@ private function toOne(Schema\HasOne $field, array $members, ResourceType $resou
     {
         $included = $include !== null;
 
-        $model = ($included && $getCallback = $field->getGetCallback())
+        $model = ($getCallback = $field->getGetCallback())
             ? $getCallback($model, $this->request)
             : $resource->getAdapter()->getHasOne($model, $field, ! $included);
 
@@ -179,7 +179,7 @@ private function toMany(Schema\HasMany $field, array $members, ResourceType $res
     {
         $included = $include !== null;
 
-        $models = ($included && $getCallback = $field->getGetCallback())
+        $models = ($getCallback = $field->getGetCallback())
             ? $getCallback($model, $this->request)
             : $resource->getAdapter()->getHasMany($model, $field, ! $included);