ignore offset if limit is not set, default offset to 0, fix style according psr-12

Author: rizkyarlin

src/Exception/InvalidPaginatorRequestException.php

@@ -8,7 +8,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Laravel\Lumen\Routing\Controller;
-use LIQRGV\QueryFilter\Exception\InvalidPaginatorRequestException;
 use LIQRGV\QueryFilter\Exception\ModelNotFoundException;
 use LIQRGV\QueryFilter\Exception\NotModelException;
 use LIQRGV\QueryFilter\Struct\FilterStruct;
@@ -68,7 +67,7 @@ private function createModelBuilderStruct(Request $request): ModelBuilderStruct
         $filterQuery = $queryParam->get('filter') ?? [];
         $sortQuery = $queryParam->get('sort') ?? null;
         $limitQuery = $queryParam->get('limit') ?? null;
-        $offsetQuery = $queryParam->get('offset') ?? null;
+        $offsetQuery = $queryParam->get('offset') ?? 0;
 
         $baseModelName = $this->getBaseModelName($request);
         $filters = $this->parseFilter($filterQuery);
@@ -162,9 +161,6 @@ private function parseSorter(?string $sortQuery): ?array
     }
 
     private function parsePaginator($limitQuery, $offsetQuery){
-        if ($limitQuery xor $offsetQuery){
-            throw new InvalidPaginatorRequestException();
-        }
         return [
             "limit" => $limitQuery,
             "offset" => $offsetQuery
@@ -210,8 +206,9 @@ private function applySorter(Builder $builder, array $sorter)
 
     private function applyPaginator(Builder $builder, array $paginator): Builder
     {
-        if ($paginator['limit'])
+        if ($paginator['limit']){
             return $builder->limit($paginator['limit'])->offset($paginator['offset']);
+        }
         return $builder;
     }
 

src/RequestParser.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Config;
-use LIQRGV\QueryFilter\Exception\InvalidPaginatorRequestException;
 use LIQRGV\QueryFilter\Exception\ModelNotFoundException;
 use LIQRGV\QueryFilter\Exception\NotModelException;
 use LIQRGV\QueryFilter\Mocks\MockModelController;
@@ -430,23 +429,4 @@ function testPagination()
         $this->assertEquals(100, $query->limit);
         $this->assertEquals(50, $query->offset);
     }
-
-    function testInvalidPaginatorRequest()
-    {
-        $this->expectException(InvalidPaginatorRequestException::class);
-        $uri = 'some_model';
-        $controllerClass = MockModelController::class;
-        $query = new ParameterBag([
-            "offset" => "50"
-        ]);
-        $requestParserOptions = [
-            'model_namespaces' => [
-                'LIQRGV\QueryFilter\Mocks',
-            ]
-        ];
-
-        $request = $this->createControllerRequest($uri, $controllerClass, $query, $requestParserOptions);
-        $requestParser = new RequestParser($request);
-        $requestParser->getBuilder();
-    }
 }