Merge pull request #20 from Raistlfiren/hotfix-19

Fix for issues #19
xiaohutai · Jul 22, 2016 · 98bee8b · 98bee8b
2 parents b2fe711 + 40c4096
commit 98bee8b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 33 deletions.
diff --git a/src/Action/SearchAction.php b/src/Action/SearchAction.php
@@ -45,11 +45,6 @@ public function handle($contentType = null, Request $request, ParameterCollectio
 
         $queryParameters = array_merge($parameters->getQueryParameters(), $parameters->getParametersByType('search'));
 
-        if ($contentType === null) {
-            //Remove search order off of id, since ambigious...
-            unset($queryParameters['order']);
-        }
-
         /** @var PagingResultSet $results */
         $set = $this->query
             ->getContent($baselink, $queryParameters);

diff --git a/src/Converter/JSONAPIConverter.php b/src/Converter/JSONAPIConverter.php
@@ -55,7 +55,7 @@ public function grabParameters($converter, Request $request)
 
         $parameters['page']['size'] = $request->query->get('page[size]', false, true);
         $parameters['page']['number'] = $request->query->get('page[number]', false, true);
-        $parameters['order'] = $request->query->get('sort', false);
+        $parameters['sort'] = $request->query->get('sort', false);
         $parameters['filters'] = $request->query->get('filter', false);
         $parameters['contains'] = $request->query->get('contains', false);
         $parameters['includes'] = $request->query->get('include', false);

diff --git a/src/Converter/Parameter/ParameterCollection.php b/src/Converter/Parameter/ParameterCollection.php
@@ -23,7 +23,7 @@ public function getQueryParameters()
 
         //Loop through the parameters and add them to an array
         foreach ($this as $key => $value) {
-            if (in_array($key, ['order', 'filters', 'contains', 'page'])) {
+            if (in_array($key, ['sort', 'filters', 'contains', 'page'])) {
                 $queryParameters = array_merge($value->getParameter(), $queryParameters);
             }
         }

diff --git a/src/Storage/Query/Handler/PagingHandler.php b/src/Storage/Query/Handler/PagingHandler.php
@@ -19,11 +19,12 @@ class PagingHandler
     public function __invoke(ContentQueryParser $contentQuery)
     {
         $set = new PagingResultSet();
+        $cleanSearchQuery = $contentQuery->getService('search');
 
         foreach ($contentQuery->getContentTypes() as $contenttype) {
             //Find out if we are searching or just doing a simple query
             if ($searchParam = $contentQuery->getParameter('filter')) {
-                $query = $contentQuery->getService('search');
+                $query = clone $cleanSearchQuery;
             } else {
                 $query = $contentQuery->getService('select');
             }
@@ -40,7 +41,7 @@ public function __invoke(ContentQueryParser $contentQuery)
 
             //Get Page from the new directive handler that allows pagination
             $paginate = $contentQuery->getDirective('paginate');
-            
+
             //Set the default limitto the pagination size, since it defaults to null
             $contentQuery->setDirective('limit', $paginate->getSize());
 
@@ -58,24 +59,25 @@ public function __invoke(ContentQueryParser $contentQuery)
             $qb = clone $query->getQueryBuilder();
 
             $query2
-                ->resetQueryParts(['groupBy', 'maxResults', 'firstResult'])
+                ->resetQueryParts(['maxResults', 'firstResult', 'orderBy'])
                 ->setFirstResult(null)
                 ->setMaxResults(null)
                 ->select("COUNT(*) as total");
 
-            $totalItems = $repo->findResult($query2);
+            $totalItems = count($repo->findResults($query2));
 
             $result = $repo->findResults($qb);
             if ($result) {
                 $set->add($result, $contenttype);
-                $set->setTotalResults($totalItems);
+                $set->setTotalResults((int) $totalItems);
 
                 /** @var Page $page */
                 $page = $contentQuery->getDirective('paginate');
                 $set->setTotalPages($totalItems, $page->getSize());
             }
-
-            return $set;
         }
+
+        return $set;
+
     }
 }
diff --git a/src/Storage/Query/PagingResultSet.php b/src/Storage/Query/PagingResultSet.php
@@ -15,7 +15,7 @@ class PagingResultSet extends QueryResultset
 {
 
     /** @var int $totalResults */
-    protected $totalResults;
+    protected $totalResults = 0;
 
     /** @var int $totalPages */
     protected $totalPages;
@@ -61,7 +61,7 @@ public function getTotalResults()
      */
     public function setTotalResults($totalResults)
     {
-        $this->totalResults = $totalResults;
+        $this->totalResults += $totalResults;
         return $this;
     }
 }
diff --git a/src/Storage/Repository.php b/src/Storage/Repository.php
@@ -47,21 +47,4 @@ public function findResults(QueryBuilder $query)
             return false;
         }
     }
-
-    /**
-     * Since the queries are built already, we don't need to run all of the other mappings
-     * before. Now we can just fetch the results of the query instead of running everything else.
-     * This fetches a single result (count) and returns the total.
-     * @param QueryBuilder $query
-     * @return bool|mixed
-     */
-    public function findResult(QueryBuilder $query)
-    {
-        $result = $query->execute()->fetch();
-        if ($result) {
-            return $result['total'];
-        } else {
-            return false;
-        }
-    }
 }