Merge pull request #2 from LulububuApps/feature/reintroduce-count

Feature/reintroduce count

Author: 0x6368

Service/IndexService.php

@@ -308,14 +308,35 @@ private function executeSearch(Search $search): array
 
     public function getIndexDocumentCount(): int
     {
-        $body = [
-            'index' => $this->getIndexName(),
-            'body' => [],
-        ];
+        return $this->count();
+    }
+
+    /**
+     * Counts documents by given search.
+     *
+     * @param Search|null $search
+     * @param array  $params
+     * @param bool   $returnRaw If set true returns raw response gotten from client.
+     *
+     * @return int|array
+     */
+    public function count(Search $search = null, array $params = [], $returnRaw = false)
+    {
+        $body = array_merge(
+            [
+                'index' => $this->getIndexName(),
+                'body' => $search !== null ? $search->toArray() : [],
+            ],
+            $params
+        );
 
         $results = $this->getClient()->count($body);
 
-        return $results['count'];
+        if ($returnRaw) {
+            return $results;
+        } else {
+            return $results['count'];
+        }
     }
 
     public function remove($id, $routing = null)

Tests/Functional/Service/IndexServiceTest.php

@@ -15,6 +15,7 @@
 use ONGR\App\Entity\DummyDocumentInTheEntityDirectory;
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
 use ONGR\ElasticsearchBundle\Test\AbstractElasticsearchTestCase;
+use ONGR\ElasticsearchDSL\Query\FullText\SimpleQueryStringQuery;
 
 /**
  * Functional tests for orm manager.
@@ -120,4 +121,37 @@ public function testIndexConfigOverride()
 
         $this->assertEquals(['localhost:9200'], $hosts);
     }
+
+    public function testCount()
+    {
+        $index = $this->getIndex(DummyDocument::class);
+
+        $search = $index->createSearch();
+        $search->addQuery(new SimpleQueryStringQuery('foo'));
+
+        $count = $index->count($search);
+
+        $this->assertEquals(2, $count);
+    }
+
+    public function testRawCount()
+    {
+        $index = $this->getIndex(DummyDocument::class);
+
+        $search = $index->createSearch();
+        $search->addQuery(new SimpleQueryStringQuery('bar'));
+
+        $result = $index->count($search, [], true);
+
+        $this->assertEquals(1, $result['count']);
+    }
+
+    public function testIndexDocumentCount()
+    {
+        $index = $this->getIndex(DummyDocument::class);
+
+        $count = $index->getIndexDocumentCount();
+
+        $this->assertEquals(3, $count);
+    }
 }