Fix count request for DoctrineAdapter and use Doctrine Paginator

Author: AlexandrePetrone

src/Adapter/Doctrine/DoctrineAdapter.php

@@ -15,6 +15,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mezcalito\UxSearchBundle\Adapter\AdapterInterface;
 use Mezcalito\UxSearchBundle\Search\Filter\RangeFilter;
 use Mezcalito\UxSearchBundle\Search\Filter\TermFilter;
@@ -44,9 +45,9 @@ public function search(Query $query, SearchInterface $search): ResultSet
     {
         $helper = new QueryBuilderHelper($this->manager, $query, $search);
 
-        $results = $helper->getResultsQuery()->getQuery()->getResult();
+        $paginator = new Paginator($helper->getResultsQuery()->getQuery(), fetchJoinCollection: true);
         $hits = [];
-        foreach ($results as $item) {
+        foreach ($paginator as $item) {
             $hits[] = new Hit($item, 1);
         }
 

src/Adapter/Doctrine/QueryBuilderHelper.php

@@ -36,7 +36,7 @@ public function __construct(
     public function getTotalResultsQuery(): QueryBuilder
     {
         $qb = $this->createBaseQueryBuilder()
-            ->select(\sprintf('count(%s) AS total', $this->getIdentifierField()));
+            ->select(\sprintf('count(DISTINCT (%s)) AS total', $this->getIdentifierField()));
 
         $this->applyQueryString($qb);
 

tests/Adapter/Doctrine/QueryBuilderHelperTest.php

@@ -32,7 +32,7 @@ public function testTotalResultsQuery()
     {
         $dql = $this->helper->getTotalResultsQuery()->getQuery()->getDQL();
 
-        $this->assertEquals('SELECT count(o.id) AS total FROM Mezcalito\UxSearchBundle\Tests\Fixtures\Adapter\Doctrine\Foo o', $dql);
+        $this->assertEquals('SELECT count(DISTINCT (o.id)) AS total FROM Mezcalito\UxSearchBundle\Tests\Fixtures\Adapter\Doctrine\Foo o', $dql);
     }
 
     public function testTotalResultsWithFilterQuery()
@@ -43,7 +43,7 @@ public function testTotalResultsWithFilterQuery()
         $dql = $qb->getQuery()->getDQL();
         $params = $qb->getParameter('o_brand_terms');
 
-        $this->assertEquals('SELECT count(o.id) AS total FROM Mezcalito\UxSearchBundle\Tests\Fixtures\Adapter\Doctrine\Foo o WHERE o.brand in (:o_brand_terms)', $dql);
+        $this->assertEquals('SELECT count(DISTINCT (o.id)) AS total FROM Mezcalito\UxSearchBundle\Tests\Fixtures\Adapter\Doctrine\Foo o WHERE o.brand in (:o_brand_terms)', $dql);
         $this->assertEquals(['A', 'B'], $params->getValue());
     }