Making to be possible search with null in findBy (exists query) just …

…like is in querybuilder
andsalves · Nov 7, 2017 · 89febb4 · 89febb4
1 parent 8976032
commit 89febb4
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/Persister/ElasticEntityPersister.php b/src/Persister/ElasticEntityPersister.php
@@ -18,6 +18,8 @@
 use DoctrineElastic\Mapping\MetaField;
 use DoctrineElastic\Mapping\Type;
 use DoctrineElastic\Query\ElasticQueryExecutor;
+use DoctrineElastic\Query\Walker\Helper\WalkerHelper;
+use DoctrineElastic\Query\Walker\OperatorsMap;
 
 /**
  * Entity Persister for this doctrine elastic extension
@@ -48,13 +50,17 @@ class ElasticEntityPersister {
     /** @var ElasticEntityManager */
     private $em;
 
+    /** @var WalkerHelper */
+    private $walkerHelper;
+
     public function __construct(ElasticEntityManager $em, $className) {
         $this->className = $className;
         $this->annotationReader = new AnnotationReader();
         $this->queryExecutor = new ElasticQueryExecutor($em);
         $this->hydrator = new AnnotationEntityHydrator();
         $this->validateEntity();
         $this->em = $em;
+        $this->walkerHelper = new WalkerHelper();
     }
 
     public function getReflectionClass() {
@@ -90,8 +96,8 @@ private function validateEntity() {
 
     public function loadAll(array $criteria = [], array $orderBy = null, $limit = null, $offset = null) {
         $type = $this->getEntityType();
-        $sort = $must = [];
-        $body = ['query' => ['bool' => ['must' => $must]]];
+        $sort = [];
+        $body = ['query' => ['bool' => ['must' => []]]];
         /** @var Field $annotationProperty */
         $fieldAnnotations = $this->hydrator->extractSpecAnnotations($this->className, Field::class);
         /** @var MetaField[] $metaFieldAnnotations */
@@ -115,10 +121,8 @@ public function loadAll(array $criteria = [], array $orderBy = null, $limit = nu
             if ($annotation->name === '_parent') {
                 $searchParams->setParent($criteria[$columnName]);
             } else {
-                $must[] = array(
-                    'match' => array(
-                        $annotation->name => $criteria[$columnName],
-                    )
+                $this->walkerHelper->addBodyStatement(
+                    $annotation->name, OperatorsMap::EQ, $criteria[$columnName], $body
                 );
             }
         }
@@ -133,8 +137,6 @@ public function loadAll(array $criteria = [], array $orderBy = null, $limit = nu
             }
         }
 
-        $body['query']['bool']['must'] = $must;
-
         $searchParams->setIndex($type->getIndex());
         $searchParams->setType($type->getName());
         $searchParams->setBody($body);
@@ -195,6 +197,7 @@ public function executeInserts() {
      * @param Type $type
      * @param string $className
      * @throws ElasticConstraintException
+     * @throws ElasticOperationException
      */
     private function createTypeIfNotExists(Type $type, $className) {
         foreach ($type->getChildClasses() as $childClass) {