Merge branch 'feature/viewprofile' into unstable

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Muzich\CoreBundle\Controller;
+
+use Muzich\CoreBundle\lib\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Muzich\CoreBundle\Entity\FollowUser;
+use Doctrine\ORM\Query;
+
+class CoreController extends Controller
+{
+  
+  /**
+   * 
+   * @param string $type
+   * @param int $id
+   * @param string $salt 
+   */
+  public function followAction($type, $id, $token)
+  {
+    $user = $this->getUser();
+    // Vérifications préléminaires
+    if ($user->getPersonalHash() != $token || !in_array($type, array('user', 'group')) || !is_numeric($id))
+    {
+      throw $this->createNotFoundException();
+    }
+    
+    $em = $this->getDoctrine()->getEntityManager();
+    $FollowUser = $em
+      ->getRepository('MuzichCoreBundle:Follow' . ucfirst($type))
+      ->findOneBy(
+        array(
+          'follower' => $user->getId(),
+          ($type == 'user') ? 'followed' : 'group' => $id
+        )
+      )
+    ;
+    
+    if ($FollowUser)
+    {
+      // L'utilisateur suis déjà, on doit détruire l'entité
+      $em->remove($FollowUser);
+      $em->flush();
+    }
+    else
+    {
+      $followed_user = $em->getRepository('MuzichCoreBundle:User')->find($id);
+
+      if (!$followed_user) {
+          throw $this->createNotFoundException('No user found for id '.$id);
+      }
+      
+      $FollowUser = new FollowUser();
+      $FollowUser->setFollowed($followed_user);
+      $FollowUser->setFollower($user);
+      
+      $em->persist($FollowUser);
+      $em->flush();
+    }
+    
+    if ($this->getRequest()->isXmlHttpRequest())
+    {
+      
+    }
+    else
+    {
+      return $this->redirect($this->container->get('request')->headers->get('referer'));
+    }
+  }
+  
+}

src/Muzich/CoreBundle/Entity/User.php

@@ -272,4 +272,57 @@ class User extends BaseUser
     return $this->getUsername();
   }
   
+  /**
+   * Retourn si l'user_id transmis fait partis des enregistrements
+   * followed de l'objet.
+   * 
+   * @param int $user_id 
+   * @return boolean
+   */
+  public function isFollowingUser($user_id)
+  {
+    foreach ($this->followeds_users as $followed_user)
+    {
+      if ($followed_user->getFollowed()->getId() == $user_id)
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  /**
+   * Retourn si l'user_id transmis est l'un des User suivis
+   * 
+   * @param Symfony\Bundle\DoctrineBundle\Registry doctrine
+   * @param int $user_id 
+   * @return boolean
+   */
+  public function isFollowingUserByQuery($doctrine, $user_id)
+  {
+    return $doctrine
+      ->getRepository('MuzichCoreBundle:User')
+      ->isFollowingUser($this->getId(), $user_id)
+    ;
+  }
+  
+  /**
+   * Retourn si l'group_id transmis est l'un des groupe suivis
+   * 
+   * @param Symfony\Bundle\DoctrineBundle\Registry doctrine
+   * @param int $user_id 
+   * @return boolean
+   */
+  public function isFollowingGroupByQuery($doctrine, $group_id)
+  {
+    return $doctrine
+      ->getRepository('MuzichCoreBundle:User')
+      ->isFollowingGroup($this->getId(), $group_id)
+    ;
+  }
+  
+  public function getPersonalHash()
+  {
+    return hash('sha256', $this->getSalt().$this->getUsername());
+  }
 }

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
 
 class UserRepository extends EntityRepository
 {
@@ -18,6 +19,8 @@ class UserRepository extends EntityRepository
   {
     $select = 'u';
     $join = '';
+    $where = '';
+    $parameters = array('uid' => $user_id);
     
     if (in_array('followeds_users', $join_list))
     {
@@ -37,13 +40,23 @@ class UserRepository extends EntityRepository
       $join   .= ' JOIN u.followed_groups fdg JOIN fdg.group fdg_g';
     }
     
+//    if (array_key_exists('followed_user_id', $join_list))
+//    {
+//      $select .= ', fu, fu_u';
+//      $join   .= ' LEFT JOIN u.followeds_users fu WITH fu.followed = :fuid LEFT JOIN fu.followed fu_u';
+//      $parameters = array_merge($parameters, array(
+//        'fuid' => $join_list['followed_user_id']
+//      ));
+//    }
+    
     return $this->getEntityManager()
       ->createQuery("
         SELECT $select FROM MuzichCoreBundle:User u
         $join
         WHERE u.id = :uid
+        $where
       ")
-      ->setParameter('uid', $user_id)
+      ->setParameters($parameters)
     ;
   }
   
@@ -116,5 +129,39 @@ class UserRepository extends EntityRepository
     ;
   }
   
+  public function isFollowingUser($follower_id, $followed_id)
+  {
+    $result = $this->getEntityManager()
+      ->createQuery("
+        SELECT COUNT(fu.id) FROM MuzichCoreBundle:FollowUser fu
+        WHERE fu.follower = :frid AND fu.followed = :fdid
+      ")
+      ->setParameters(array(
+        'frid' => $follower_id,
+        'fdid' => $followed_id
+      ))
+      ->getSingleResult(Query::HYDRATE_ARRAY)
+    ;
+    
+    return $result[1];
+  }
+  
+  public function isFollowingGroup($follower_id, $group_id)
+  {
+    $result = $this->getEntityManager()
+      ->createQuery("
+        SELECT COUNT(fg.id) FROM MuzichCoreBundle:FollowGroup fg
+        WHERE fg.follower = :frid AND fg.group = :fdgid
+      ")
+      ->setParameters(array(
+        'frid' => $follower_id,
+        'fdgid' => $group_id
+      ))
+      ->getSingleResult(Query::HYDRATE_ARRAY)
+    ;
+    
+    return $result[1];
+  }
+  
 }
   

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -3,4 +3,9 @@
 search_elements:
    pattern:  /search-elements
    defaults: { _controller: MuzichCoreBundle:Search:searchElements }
+   
+follow:
+   pattern:  /follow/{type}/{id}/{token}
+   defaults: { _controller: MuzichCoreBundle:Core:follow }
+   
      

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -16,18 +16,23 @@ class ShowController extends Controller
   public function showUserAction($slug)
   {
     try {
+      
       $viewed_user = $this->getDoctrine()
         ->getRepository('MuzichCoreBundle:User')
         ->findOneBySlug($slug)
         ->getSingleResult()
       ;
+      $user = $this->getUser();
+      
     } catch (\Doctrine\ORM\NoResultException $e) {
         throw $this->createNotFoundException('Utilisateur introuvable.');
     }
     
     return array(
       'viewed_user' => $viewed_user,
-      'elements' => $this->getShowedEntityElements($viewed_user->getId(), 'User')
+      'elements'    => $this->getShowedEntityElements($viewed_user->getId(), 'User'),
+      'following'   => $user->isFollowingUserByQuery($this->getDoctrine(), $viewed_user->getId()),
+      'user'        => $user
     );
   }
   
@@ -39,18 +44,23 @@ class ShowController extends Controller
   public function showGroupAction($slug)
   {
     try {
+      
       $group = $this->getDoctrine()
         ->getRepository('MuzichCoreBundle:Group')
         ->findOneBySlug($slug)
         ->getSingleResult()
       ;
+      $user = $this->getUser();
+      
     } catch (\Doctrine\ORM\NoResultException $e) {
         throw $this->createNotFoundException('Groupe introuvable.');
     }
     
     return array(
-      'group' => $group,
-      'elements' => $this->getShowedEntityElements($group->getId(), 'Group')
+      'group'       => $group,
+      'elements'    => $this->getShowedEntityElements($group->getId(), 'Group'),
+      'following'   => $user->isFollowingGroupByQuery($this->getDoctrine(), $group->getId()),
+      'user'        => $user
     );
   }
   

src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig

@@ -3,6 +3,16 @@
 {% block title %}{% endblock %}
 
 {% block content %}
+
+  {% if following %}
+    <a href="" class="follow_link following" >
+      Ne plus suivre
+    </a>
+  {% else %}
+    <a href="" class="follow_link notfollowing" >
+      Suivre
+    </a>
+  {% endif %}
     
   <h2>{{ group.name }}</h2>
   

src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig

@@ -4,6 +4,14 @@
 
 {% block content %}
     
+  <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash }) }}" class="follow_link following" >
+    {% if following %}
+      Ne plus suivre
+    {% else %}
+      Suivre
+    {% endif %}
+  </a>
+
   <h2>{{ viewed_user.name }}</h2>
   
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}

web/bundles/muzichhome/css/home.css

@@ -1,13 +1,7 @@
-/* 
-    Document   : home
-    Created on : 10 sept. 2011, 12:49:23
-    Author     : bux
-    Description:
-        Purpose of the stylesheet follows.
-*/
 
-/* 
-   TODO customize this sample style
-   Syntax recommendation http://www.w3.org/TR/REC-CSS2/
-*/
 
+#container .follow_link
+{
+  float: right;
+  text-decoration: none;
+}