Remove filter on URI when using lumen closure

Author: LIQRGV

src/RequestParser.php

@@ -39,7 +39,7 @@ class RequestParser
     public function __construct(Request $request)
     {
         $requestParserConfig = Config::get('request_parser');
-        if(is_null($requestParserConfig) || empty($requestParserConfig)) {
+        if (is_null($requestParserConfig) || empty($requestParserConfig)) {
             $this->modelNamespaces = ["App\\Models"];
         } else {
             $this->modelNamespaces = $requestParserConfig['model_namespaces'];
@@ -85,7 +85,8 @@ private function getBaseModelName(Request $request): string
 
         $exploded = explode("/", $request->getRequesturi());
         $lastURISegment = strtolower(end($exploded));
-        $camelizeURI = str_replace('_', '', ucwords($lastURISegment, '_'));
+        $lastURINoQuery = current(explode("?", $lastURISegment, 2));
+        $camelizeURI = str_replace('_', '', ucwords($lastURINoQuery, '_'));
         $modelCandidates[] = $camelizeURI;
 
         $modelName = $this->getModelFromNamespaces($camelizeURI, $this->modelNamespaces);
@@ -162,8 +163,12 @@ private function createModel(string $baseModelName)
     private function getControllerFromRoute($route)
     {
         if (is_array($route)) {
-            $controllerWithMethod = current($route[1]);
-            $splitedControllerMethod = explode('@', $controllerWithMethod);
+            $maybeControllerWithMethod = current($route[1]);
+            if ($maybeControllerWithMethod instanceof \Closure) {
+                return null;
+            }
+
+            $splitedControllerMethod = explode('@', $maybeControllerWithMethod);
             $routingHandler = current($splitedControllerMethod);
             $maybeController = new $routingHandler;
 

tests/RequestParserTest.php

@@ -140,6 +140,34 @@ function testFilterNormalViaClosure()
         $this->assertEquals([1], $builder->getBindings());
     }
 
+    function testFilterNormalViaClosureURIHasFilter()
+    {
+        $uri = 'some_model?filter[x][is]=1';
+        $routeResolverResult = [
+            function() {}
+        ];
+        $query = new ParameterBag([
+            "filter" => [
+                "x" => [
+                    "is" => 1
+                ]
+            ],
+        ]);
+        $requestParserOptions = [
+            'model_namespaces' => [
+                'LIQRGV\QueryFilter\Mocks',
+            ]
+        ];
+
+        $request = $this->createRequestWithRouteArray($uri, $routeResolverResult, $query, $requestParserOptions);
+
+        $requestParser = new RequestParser($request);
+        $builder = $requestParser->getBuilder();
+
+        $this->assertEquals("select * from \"some_models\" where \"x\" = ?", $builder->toSql());
+        $this->assertEquals([1], $builder->getBindings());
+    }
+
     function testFilterRouteIsArray()
     {
         $uri = 'some_model';