Mise ne place d'un récupération personalisé de l'User (pour permettre join flexibles).

src/Muzich/CoreBundle/Entity/FollowGroup.php

@@ -33,7 +33,7 @@ class FollowGroup
   /**
    * Groupe suivis
    * 
-   * @ORM\ManyToOne(targetEntity="Group", inversedBy="follower")
+   * @ORM\ManyToOne(targetEntity="Group", inversedBy="followers")
    * @ORM\JoinColumn(name="group_id", referencedColumnName="id")
    */
   protected $group;

src/Muzich/CoreBundle/Entity/FollowUser.php

@@ -25,7 +25,7 @@ class FollowUser
   /**
    * User suiveur
    * 
-   * @ORM\ManyToOne(targetEntity="User", inversedBy="followed")
+   * @ORM\ManyToOne(targetEntity="User", inversedBy="followeds_users")
    * @ORM\JoinColumn(name="follower_id", referencedColumnName="id")
    */
   protected $follower;
@@ -33,7 +33,7 @@ class FollowUser
   /**
    * User suivis
    * 
-   * @ORM\ManyToOne(targetEntity="User", inversedBy="follower")
+   * @ORM\ManyToOne(targetEntity="User", inversedBy="followers_users")
    * @ORM\JoinColumn(name="followed_id", referencedColumnName="id")
    */
   protected $followed;

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -8,6 +8,46 @@ class UserRepository extends EntityRepository
 {
   
   /**
+   * Retourne une Query construite selon les paramètres fournis.
+   * 
+   * @param int $user_id
+   * @param array $join
+   * @return  Doctrine\ORM\Query
+   */
+  public function findOneById($user_id, $join_list)
+  {
+    $select = 'u';
+    $join = '';
+    
+    if (in_array('followeds_users', $join_list))
+    {
+      $select .= ', fdu, fdu_u';
+      $join   .= ' JOIN u.followeds_users fdu JOIN fdu.followed fdu_u';
+    }
+    
+    if (in_array('followers_users', $join_list))
+    {
+      $select .= ', fru, fru_u';
+      $join   .= ' JOIN u.followers_users fru JOIN fru.follower fru_u';
+    }
+    
+    if (in_array('followeds_groups', $join_list))
+    {
+      $select .= ', fdg, fdg_g';
+      $join   .= ' JOIN u.followed_groups fdg JOIN fdg.group fdg_g';
+    }
+    
+    return $this->getEntityManager()
+      ->createQuery("
+        SELECT $select FROM MuzichCoreBundle:User u
+        $join
+        WHERE u.id = :uid
+      ")
+      ->setParameter('uid', $user_id)
+    ;
+  }
+  
+  /**
    * Retourne les tag id préférés de l'user.
    * 
    * @param int $user_id

src/Muzich/CoreBundle/lib/Controller.php

@@ -59,11 +59,22 @@ class Controller extends BaseController
   /**
    * Retourne l'objet User.
    * 
+   * @param array $params
    * @return User
    */
-  protected function getUser()
+  protected function getUser($personal_query = false, $params = array())
   {
-    return $this->container->get('security.context')->getToken()->getUser();
+    if (!$personal_query)
+    {
+      return $this->container->get('security.context')->getToken()->getUser();
+    }
+    else
+    {
+      return $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+        $this->container->get('security.context')->getToken()->getUser()->getId(),
+        array_key_exists('join', $params) ? $params['join'] : array()
+      )->getSingleResult();
+    }
   }
   
   /**

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -15,7 +15,9 @@ class MynetworkController extends Controller
    */
   public function indexAction()
   {
-    $user = $this->getUser();
+    $user = $this->getUser(true, array('join' => array(
+      'followeds_users', 'followers_users', 'followeds_groups'
+    )));
     
     $followeds_users = $user->getFollowedsUsers();
     $followeds_groups = $user->getFollowedGroups();
@@ -68,6 +70,12 @@ class MynetworkController extends Controller
     }
   }
   
+  /**
+   * Retourne le résultat de recherche sur les users et groupes.
+   * 
+   * @param string $search
+   * @return array 
+   */
   protected function doSearchAction($search)
   {
     $string = str_replace('%', '#', $search->getString());