Evolution #387: Ordre des tags

src/Muzich/CoreBundle/Command/TagOrderCommand.php

@@ -19,6 +19,7 @@ class TagOrderCommand extends ContainerAwareCommand
     $this
       ->setName('tagengine:order')
       ->setDescription('Ordonne la liste des tags sur les pages utilisateurs')
+      ->addOption('force', null, InputOption::VALUE_NONE, 'Forcer les opérations sur tous les utilisateurs')
     ;
   }
   
@@ -38,12 +39,21 @@ class TagOrderCommand extends ContainerAwareCommand
     $output->writeln('<info>Gestion de l\'ordre des tags sur les pages de '
       .'partages favoris</info>');
  
-    $users = $em->createQuery(
-        "SELECT u FROM MuzichCoreBundle:User u"
-        . " WHERE u.datas LIKE :favupd"
-      )->setParameter('favupd', '%"'.User::DATA_FAV_UPDATED.'":true%')
-      ->getResult()
-    ;
+    if ($input->getOption('force'))
+    {
+      $users = $em->createQuery("SELECT u FROM MuzichCoreBundle:User u")
+        ->getResult()
+      ;
+    }
+    else
+    {
+      $users = $em->createQuery(
+          "SELECT u FROM MuzichCoreBundle:User u"
+          . " WHERE u.datas LIKE :favupd"
+        )->setParameter('favupd', '%"'.User::DATA_FAV_UPDATED.'":true%')
+        ->getResult()
+      ;
+    }
     
     if (count($users))
     {
@@ -77,12 +87,21 @@ class TagOrderCommand extends ContainerAwareCommand
     // diffusion
     $output->writeln('<info>Gestion de l\'ordre des tags sur les diffusions</info>');
  
-    $users = $em->createQuery(
-        "SELECT u FROM MuzichCoreBundle:User u"
-        . " WHERE u.datas LIKE :favupd"
-      )->setParameter('favupd', '%"'.User::DATA_DIFF_UPDATED.'":true%')
-      ->getResult()
-    ;
+    if ($input->getOption('force'))
+    {
+      $users = $em->createQuery("SELECT u FROM MuzichCoreBundle:User u")
+        ->getResult()
+      ;
+    }
+    else
+    {
+      $users = $em->createQuery(
+          "SELECT u FROM MuzichCoreBundle:User u"
+          . " WHERE u.datas LIKE :favupd"
+        )->setParameter('favupd', '%"'.User::DATA_DIFF_UPDATED.'":true%')
+        ->getResult()
+      ;
+    }
     
     if (count($users))
     {

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -198,7 +198,7 @@ class CoreController extends Controller
    *  Procédure d'ajout d'un element
    */
   public function elementAddAction($group_slug)
-  {   
+  {
     if (($response = $this->mustBeConnected()))
     {
       return $response;

src/Muzich/CoreBundle/Tests/Tag/TagReadTest.php

@@ -4,6 +4,7 @@ namespace Muzich\CoreBundle\Tests\Searcher;
 
 use Muzich\CoreBundle\lib\UnitTest;
 use Muzich\CoreBundle\Util\TagLike;
+use Muzich\CoreBundle\lib\Tag as TagLib;
 
 class TagReadTest extends UnitTest
 {  
@@ -210,4 +211,93 @@ class TagReadTest extends UnitTest
     $this->assertEquals($rtags, $tags);
   }
   
+  /*
+   * Test des opération de création d'une liste ordonné de tags en fonction 
+   * d'une liste d'élèments
+   */
+  public function testTagOrder()
+  {
+    $bux = $this->getUser('bux');
+    $joelle = $this->getUser('joelle');
+    $tag_lib = new TagLib();
+    
+    $hardtek  = $this->findOneBy('Tag', array('name' => 'Hardtek'));
+    $metal    = $this->findOneBy('Tag', array('name' => 'Metal'));
+    $electro  = $this->findOneBy('Tag', array('name' => 'Electro'));
+    $hardcore = $this->findOneBy('Tag', array('name' => 'Hardcore'));
+    $chanteuse = $this->findOneBy('Tag', array('name' => 'Chanteuse'));
+    $dubstep  = $this->findOneBy('Tag', array('name' => 'Dubstep'));
+    $medieval = $this->findOneBy('Tag', array('name' => 'Medieval'));
+    $beatbox = $this->findOneBy('Tag', array('name' => 'Beatbox'));
+    
+    /*
+     * Test de la récuparéation de l'ordre des tags
+     */
+    
+    $search = new \Muzich\CoreBundle\Searcher\ElementSearcher();
+    $search->init(array(
+      'user_id'  => $bux->getId()
+    ));
+    $elements = $search->getElements($this->getDoctrine(), $bux->getId());
+    
+    $tag_reference = $tag_lib->getOrderedTagsWithElements($elements);
+    
+    $this->assertEquals(array(
+      $hardtek->getId(),
+      $metal->getId(),
+      $electro->getId(),
+      $hardcore->getId()
+    ), $tag_reference);
+    
+    ////////////
+    
+    
+    $search = new \Muzich\CoreBundle\Searcher\ElementSearcher();
+    $search->init(array(
+      'user_id'  => $joelle->getId()
+    ));
+    $elements = $search->getElements($this->getDoctrine(), $bux->getId());
+    
+    $tag_reference = $tag_lib->getOrderedTagsWithElements($elements);
+    
+    $this->assertEquals(array(
+      $chanteuse->getId(),
+      $dubstep->getId(),
+      $medieval->getId(),
+      $beatbox->getId()
+    ), $tag_reference);
+    
+    /*
+     * Test du trie de tags en fonction d'une liste référente
+     */
+    
+    // Tag non ordonés
+    $tags_disordered = array(
+      $medieval,
+      $beatbox,
+      $hardcore,
+      $dubstep,
+      $chanteuse
+    );
+    
+    // On ordonne tout ça avec la référence calculé juste avant
+    $tags_ordered = $tag_lib->sortTagWithOrderedReference($tags_disordered, $tag_reference);
+    
+    $tags_ordered_ids = array();
+    foreach ($tags_ordered as $tag_ordered)
+    {
+      $tags_ordered_ids[] = $tag_ordered->getId();
+    }
+    
+    $this->assertEquals(
+      array(
+        $chanteuse->getId(),
+        $dubstep->getId(),
+        $medieval->getId(),
+        $beatbox->getId(),
+        $hardcore->getId()
+      ), $tags_ordered_ids
+    );
+  }
+  
 }

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -103,4 +103,26 @@ class UnitTest extends \PHPUnit_Framework_TestCase
     $this->getDoctrine()->getEntityManager()->flush();
   }
   
+  /**
+   *
+   * @return \Doctrine\ORM\EntityManager 
+   */
+  protected function getEntityManager()
+  {
+    return $this->getDoctrine()->getEntityManager();
+  }
+  
+  /**
+   * Raccourcis de findOneBy
+   * 
+   * @param string $entityName
+   * @param array $params
+   * @return object 
+   */
+  protected function findOneBy($entityName, array $params)
+  {
+    return $this->getEntityManager()->getRepository('MuzichCoreBundle:'.$entityName)
+      ->findOneBy($params);
+  }
+  
 }