Merge pull request #590 from MrHash/master

Handling HasChild ES bug
ruflin · Apr 20, 2014 · 6262edc · 6262edc
2 parents 5606b41 + b90edfc
commit 6262edc
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 3 deletions.
diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,8 @@
 CHANGES
 
+2014-04-20
+- Handling of HasChild type parsing bug #585
+
 2014-04-19
 - Release v1.1.1.0
 - Update to elasticsearch 1.1.1 http://www.elasticsearch.org/downloads/1-1-1/

diff --git a/lib/Elastica/Filter/HasChild.php b/lib/Elastica/Filter/HasChild.php
@@ -20,12 +20,12 @@ class HasChild extends AbstractFilter
      */
     public function __construct($query, $type = null)
     {
+        $this->setType($type);
         if ($query instanceof AbstractFilter) {
             $this->setFilter($query);
         } else {
             $this->setQuery($query);
         }
-        $this->setType($type);
     }
 
     /**

diff --git a/lib/Elastica/Query/HasChild.php b/lib/Elastica/Query/HasChild.php
@@ -21,8 +21,8 @@ class HasChild extends AbstractQuery
      */
     public function __construct($query, $type = null)
     {
-        $this->setQuery($query);
         $this->setType($type);
+        $this->setQuery($query);
     }
 
     /**

diff --git a/test/lib/Elastica/Test/Filter/HasChildTest.php b/test/lib/Elastica/Test/Filter/HasChildTest.php
@@ -107,6 +107,26 @@ public function testQueryInsideHasChildSearch()
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testTypeInsideHasChildSearch()
+    {
+        $index = $this->prepareSearchData();
+
+        $f = new \Elastica\Query\Match();
+        $f->setField('alt.name', 'testname');
+        $filter = new HasChild($f, 'child');
+
+        $searchQuery = new \Elastica\Query();
+        $searchQuery->setFilter($filter);
+        $searchResults = $index->search($searchQuery);
+
+        $this->assertEquals(1, $searchResults->count());
+
+        $result = $searchResults->current()->getData();
+        $expected = array('id' => 'parent2', 'user' => 'parent2', 'email' => 'parent2@test.com');
+
+        $this->assertEquals($expected, $result);
+    }
 
     private function prepareSearchData()
     {
@@ -115,12 +135,16 @@ private function prepareSearchData()
         $index->create(array(), true);
 
         $parentType = $index->getType('parent');
-
+        
         $childType = $index->getType('child');
         $childMapping = new \Elastica\Type\Mapping($childType);
         $childMapping->setParent('parent');
         $childMapping->send();
 
+        $altType = $index->getType('alt');
+        $altDoc = new Document('alt1', array('name' => 'altname'));
+        $altType->addDocument($altDoc);
+
         $parent1 = new Document('parent1', array('id' => 'parent1', 'user' => 'parent1', 'email' => 'parent1@test.com'));
         $parentType->addDocument($parent1);
         $parent2 = new Document('parent2', array('id' => 'parent2', 'user' => 'parent2', 'email' => 'parent2@test.com'));
@@ -132,6 +156,9 @@ private function prepareSearchData()
         $child2 = new Document('child2', array('id' => 'child2', 'user' => 'child2', 'email' => 'child2@test.com'));
         $child2->setParent('parent2');
         $childType->addDocument($child2);
+        $child3 = new Document('child3', array('id' => 'child3', 'user' => 'child3', 'email' => 'child3@test.com', 'alt' => array(array('name' => 'testname'))));
+        $child3->setParent('parent2');
+        $childType->addDocument($child3);
 
         $index->refresh();
         return $index;

diff --git a/test/lib/Elastica/Test/Query/HasChildTest.php b/test/lib/Elastica/Test/Query/HasChildTest.php
@@ -2,6 +2,7 @@
 
 namespace Elastica\Test\Query;
 
+use Elastica\Document;
 use Elastica\Query\HasChild;
 use Elastica\Query\MatchAll;
 use Elastica\Test\Base as BaseTest;
@@ -47,4 +48,60 @@ public function testSetScope()
 
         $this->assertEquals($expectedArray, $query->toArray());
     }
+
+    public function testTypeInsideHasChildSearch()
+    {
+        $index = $this->prepareSearchData();
+
+        $f = new \Elastica\Query\Match();
+        $f->setField('alt.name', 'testname');
+        $query = new HasChild($f, 'child');
+
+        $searchQuery = new \Elastica\Query();
+        $searchQuery->setQuery($query);
+        $searchResults = $index->search($searchQuery);
+
+        $this->assertEquals(1, $searchResults->count());
+
+        $result = $searchResults->current()->getData();
+        $expected = array('id' => 'parent2', 'user' => 'parent2', 'email' => 'parent2@test.com');
+
+        $this->assertEquals($expected, $result);
+    }    
+
+    private function prepareSearchData()
+    {
+        $client = $this->_getClient();
+        $index = $client->getIndex('has_child_test');
+        $index->create(array(), true);
+
+        $parentType = $index->getType('parent');
+
+        $childType = $index->getType('child');
+        $childMapping = new \Elastica\Type\Mapping($childType);
+        $childMapping->setParent('parent');
+        $childMapping->send();
+
+        $altType = $index->getType('alt');
+        $altDoc = new Document('alt1', array('name' => 'altname'));
+        $altType->addDocument($altDoc);
+
+        $parent1 = new Document('parent1', array('id' => 'parent1', 'user' => 'parent1', 'email' => 'parent1@test.com'));
+        $parentType->addDocument($parent1);
+        $parent2 = new Document('parent2', array('id' => 'parent2', 'user' => 'parent2', 'email' => 'parent2@test.com'));
+        $parentType->addDocument($parent2);
+
+        $child1 = new Document('child1', array('id' => 'child1', 'user' => 'child1', 'email' => 'child1@test.com'));
+        $child1->setParent('parent1');
+        $childType->addDocument($child1);
+        $child2 = new Document('child2', array('id' => 'child2', 'user' => 'child2', 'email' => 'child2@test.com'));
+        $child2->setParent('parent2');
+        $childType->addDocument($child2);
+        $child3 = new Document('child3', array('id' => 'child3', 'user' => 'child3', 'email' => 'child3@test.com', 'alt' => array(array('name' => 'testname'))));
+        $child3->setParent('parent2');
+        $childType->addDocument($child3);
+
+        $index->refresh();
+        return $index;
+    }
 }