Evolution #27: Optimisation Ajout d'element.

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -121,9 +121,10 @@ class CoreController extends Controller
     $user = $this->getUser();
     $em = $this->getDoctrine()->getEntityManager();
     
+    $element = new Element();
     $form = $this->createForm(
       new ElementAddForm(),
-      array(),
+      $element,
       array(
        'tags'   => $this->getTagsArray(),
         // Ligne non obligatoire (cf. verif du contenu du form -> ticket)
@@ -136,14 +137,12 @@ class CoreController extends Controller
       $form->bindRequest($this->getRequest());
       if ($form->isValid())
       {
-        $data = $form->getData();
-        $element = new Element();
 
         // On utilise le gestionnaire d'élément
         $factory = new ElementManager($element, $em, $this->container);
-        $factory->proceedFill($data, $user);
+        $factory->proceedFill($user);
         
-        // Si on a précisé un groupe
+        // Si on a précisé un groupe dans lequel mettre l'element
         if ($group_slug)
         {
           $group = $this->findGroupWithSlug($group_slug);

src/Muzich/CoreBundle/ElementFactory/ElementManager.php

@@ -70,22 +70,20 @@ class ElementManager
    * @param array $params
    * @param User $owner
    */
-  public function proceedFill($params, User $owner)
+  public function proceedFill(User $owner)
   {
-    $this->element->setName($params['name']);
-    $this->element->setUrl($params['url']);
     $this->element->setOwner($owner);
-    $this->element->setTagsWithIds($this->em, $params['tags']);
-    $this->setGroup($params);
+    $this->element->setTagsWithIds($this->em, $this->element->getTags());
+    $this->setGroup();
     $this->determineType();
     $this->proceedExtraFields();
   }
   
-  protected function setGroup($params)
+  protected function setGroup()
   {
-    if ($params['group'])
+    if ($this->element->getGroup())
     {
-      $group = $this->em->getRepository('MuzichCoreBundle:Group')->findOneById($params['group']);
+      $group = $this->em->getRepository('MuzichCoreBundle:Group')->findOneById($this->element->getGroup());
       $this->element->setGroup($group);
     }
   }

src/Muzich/CoreBundle/Entity/Element.php

@@ -181,7 +181,7 @@ class Element
   
   public function __construct($url = null)
   {
-    $this->tags = new ArrayCollection();
+    //$this->tags = new ArrayCollection();
     $this->url = $url;
   }
   
@@ -260,7 +260,7 @@ class Element
    *
    * @param Group $group
    */
-  public function setGroup(Group $group)
+  public function setGroup($group)
   {
       $this->group = $group;
   }
@@ -336,14 +336,15 @@ class Element
   }
   
   /**
-   * Ajoute des relation vers des tags.
+   * Etablie des relation vers des tags.
+   * (Supprime les anciens tags, au niveau de l'objet seulement)
    * 
    * @param array $ids 
    */
   public function setTagsWithIds(EntityManager $em, $ids)
   {
     $tags = $em->getRepository('MuzichCoreBundle:Tag')->findByIds($ids)->execute();
-
+    $this->tags = null;
     // Pour les nouveaux ids restants
     foreach ($tags as $tag)
     {      

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -132,7 +132,7 @@ class ElementRepository extends EntityRepository
       $where_user
       $where_group
       $where_favorite
-      ORDER BY e.created, e.name DESC "
+      ORDER BY e.created DESC, e.name DESC"
     ;
     $params['uid'] = $user_id;
     

src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php

@@ -26,28 +26,20 @@ class ElementFactoryTest extends UnitTest
     
     $youtube_width = '425';
     $youtube_height = '350';
-    
-    $data = array(
-      'name'    => 'Mon bel element',
-      'url'     => 'http://www.youtube.com/watch?v=WC8qb_of04E',
-      'tags'    => array($hardtek->getId(), $tribe->getId()),
-      'group'   => ''
-    );
-    
+        
     $element = new Element();
+    $element->setName('Mon bel element');
+    $element->setTags(array($hardtek->getId(), $tribe->getId()));
+    $element->setUrl('http://www.youtube.com/watch?v=WC8qb_of04E');
     
     $factory = new ElementManager($element, $r->getEntityManager(), $this->_container);
-    $factory->proceedFill($data, $bux);
-    
-    $tags = new ArrayCollection();
-    $tags->add($hardtek);
-    $tags->add($tribe);
+    $factory->proceedFill($bux);
     
     $url = 'http://www.youtube.com/v/WC8qb_of04E&rel=1';
     
     $this->assertEquals($element->getName(), 'Mon bel element');
     $this->assertEquals($element->getUrl(), 'http://www.youtube.com/watch?v=WC8qb_of04E');
-    $this->assertEquals($element->getTags(), $tags);
+    $this->assertEquals($element->getTags(), array($hardtek, $tribe));
     $this->assertEquals($element->getEmbed(), 
       '<object width="'.$youtube_width.'" height="'.$youtube_height.'" >'
      .'<param name="movie" value="'.$url.'"></param><param name="wmode" value="transparent">'

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

@@ -71,7 +71,7 @@ class ElementSearcherTest extends UnitTest
       ->createQuery("SELECT e
       FROM MuzichCoreBundle:Element e
       WHERE e.owner = :suid
-      ORDER BY e.created DESC")
+      ORDER BY e.created DESC, e.name DESC")
       ->setParameter('suid', $jean->getId())
       ->setMaxResults(20)
       ->getResult()
@@ -102,7 +102,7 @@ class ElementSearcherTest extends UnitTest
       FROM MuzichCoreBundle:Element e
       JOIN e.elements_favorites fav2
       WHERE fav2.user = :fuid
-      ORDER BY e.created, e.name DESC")
+      ORDER BY e.created DESC, e.name DESC")
       ->setParameter('fuid', $paul->getId())
       ->setMaxResults(20)
       ->getResult()
@@ -136,7 +136,7 @@ class ElementSearcherTest extends UnitTest
       FROM MuzichCoreBundle:Element e 
       LEFT JOIN e.tags t 
       WHERE (t.id = :tidHardtek OR t.id = :tidTribe)
-      ORDER BY e.created, e.name DESC")
+      ORDER BY e.created DESC, e.name DESC")
       ->setParameters(array(
         'tidHardtek' => $hardtek->getId(),
         'tidTribe'   => $tribe->getId()
@@ -178,7 +178,7 @@ class ElementSearcherTest extends UnitTest
 //      JOIN e.owner eu  LEFT JOIN eu.followers_users f LEFT JOIN g.followers gf
 //      WHERE (t.id = :tidHardtek OR t.id = :tidTribe)
 //       AND (f.follower = :userid OR gf.follower = :useridg)
-//      ORDER BY e.created, e.name DESC")
+//      ORDER BY e.created DESC, e.name DESC")
 //      ->setParameters(array(
 //        'tidHardtek' => $hardtek->getId(),
 //        'tidTribe'   => $tribe->getId(),