Anomalie #444: Err. 500 SearchElement: Tag strict ?

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -239,7 +239,7 @@ class ElementSearcherQueryBuilder
       ."having count(distinct et.tag_id) = ".count($tags);
       $rsm = new \Doctrine\ORM\Query\ResultSetMapping;
       $rsm->addScalarResult('element_id', 'element_id');
-      
+   
       $strict_element_ids_result = $this->em
         ->createNativeQuery($sql, $rsm)
         //->setParameter('ids', $tag_ids)
@@ -260,7 +260,7 @@ class ElementSearcherQueryBuilder
       // Ce else palie au bug du au cas ou $strict_element_ids est egal a array();
       else
       {
-        $this->query_ids->andWhere('1 == 2');
+        return false;
       }
     }
   }
@@ -307,7 +307,10 @@ class ElementSearcherQueryBuilder
     // Pour les demandes de "more" ou "nouveaux" elements.
     $this->buildLimits();
     // Si on recherche les tags de manière stricte
-    $this->buildStrict();
+    if ($this->buildStrict() === false)
+    {
+      return false;
+    }
     // Si on recherche des partages en demande de tags
     $this->buildNeedTags();
     
@@ -329,17 +332,29 @@ class ElementSearcherQueryBuilder
         ."possédant déjà une liste d'ids");
     }
     
-    $this->proceedIdsQuery($disable_limit);
+    if ($this->proceedIdsQuery($disable_limit) === false)
+    {
+      return false;
+    }
+    
     return $this->query_ids->getQuery();
   }
   
   protected function proceedElementsQuery()
   {
+    
     // On récupère les ids d'éléments
     if (!$this->es->hasIds())
     {
+      
+      if (($ids_query = $this->getIdsQuery()) === false)
+      {
+        return false;
+      }
+      
       // On va récupérer les ids en base en fonction des paramètres
-      $q_ids = $this->getIdsQuery()->getArrayResult();
+      $q_ids = $ids_query->getArrayResult();
+     
       $element_ids = array();
       if (count($q_ids))
       {

src/Muzich/CoreBundle/Tests/Searcher/ElementSearcherTest.php

@@ -7,51 +7,51 @@ use Muzich\CoreBundle\Searcher\ElementSearcher;
 
 class ElementSearcherTest extends UnitTest
 {  
-//  public function testInit()
-//  {
-//    $es = new ElementSearcher();
-//    $es->init($ia = array(
-//        'network'   => ElementSearcher::NETWORK_PERSONAL, 
-//        'tags'      => array(1 => '', 2 => '', 6 => ''), 
-//        'count'     => 20, 
-//        'user_id'   => 185, 
-//        'group_id'  => null, 
-//        'favorite'  => false,
-//        'ids'       => null,
-//        'ids_display' => null,
-//        'tag_strict' => false,
-//        'string'     => null
-//    ));
-//
-//    $this->assertEquals($ia, $es->getParams());
-//  }
-//  
-//  public function testUpdate()
-//  {
-//    $es = new ElementSearcher();
-//    $es->init($ia = array(
-//        'network'   => ElementSearcher::NETWORK_PERSONAL, 
-//        'tags'      => array(1 => '', 2 => '', 6 => ''), 
-//        'count'     => 20, 
-//        'user_id'   => 185, 
-//        'group_id'  => null, 
-//        'favorite'  => false
-//    ));
-//    $es->init($ua = array(
-//        'network'   => ElementSearcher::NETWORK_PUBLIC, 
-//        'tags'      => array(5 => '', 8 => '', 123 => ''), 
-//        'count'     => 21, 
-//        'user_id'   => 115, 
-//        'group_id'  => null, 
-//        'favorite'  => false,
-//        'ids'       => null,
-//        'ids_display' => null,
-//        'tag_strict' => false,
-//        'string'     => null
-//    ));
-//
-//    $this->assertEquals($ua, $es->getParams());
-//  }
+  public function testInit()
+  {
+    $es = new ElementSearcher();
+    $es->init($ia = array(
+        'network'   => ElementSearcher::NETWORK_PERSONAL, 
+        'tags'      => array(1 => '', 2 => '', 6 => ''), 
+        'count'     => 20, 
+        'user_id'   => 185, 
+        'group_id'  => null, 
+        'favorite'  => false,
+        'ids'       => null,
+        'ids_display' => null,
+        'tag_strict' => false,
+        'string'     => null
+    ));
+
+    $this->assertEquals($ia, $es->getParams());
+  }
+  
+  public function testUpdate()
+  {
+    $es = new ElementSearcher();
+    $es->init($ia = array(
+        'network'   => ElementSearcher::NETWORK_PERSONAL, 
+        'tags'      => array(1 => '', 2 => '', 6 => ''), 
+        'count'     => 20, 
+        'user_id'   => 185, 
+        'group_id'  => null, 
+        'favorite'  => false
+    ));
+    $es->init($ua = array(
+        'network'   => ElementSearcher::NETWORK_PUBLIC, 
+        'tags'      => array(5 => '', 8 => '', 123 => ''), 
+        'count'     => 21, 
+        'user_id'   => 115, 
+        'group_id'  => null, 
+        'favorite'  => false,
+        'ids'       => null,
+        'ids_display' => null,
+        'tag_strict' => false,
+        'string'     => null
+    ));
+
+    $this->assertEquals($ua, $es->getParams());
+  }
   
   protected function checkElementSearchResults($es_results, $array_names)
   {
@@ -406,6 +406,23 @@ class ElementSearcherTest extends UnitTest
       )
     );
     
+    $es = new ElementSearcher();
+    $es->init(array(
+      'network'   => ElementSearcher::NETWORK_PUBLIC,
+      'tags'      => array(
+        $metal->getId()      => 'Metal', 
+        $hardcore->getId()   => 'Hardcore',
+        $tribe->getId()      => 'Tribe'
+      ),
+      'count'      => 5,
+      'tag_strict' => true
+    ));
+    
+    $this->checkElementSearchResults(
+      $es->getElements($r, $bux->getId()), 
+      array()
+    );
+    
   }
   
 }