Merge branch 'feature/mynetwork' into feature/viewprofile

app/AppKernel.php

@@ -24,6 +24,7 @@ class AppKernel extends Kernel
             new Muzich\UserBundle\MuzichUserBundle(),
             new Muzich\IndexBundle\MuzichIndexBundle(),
             new Muzich\HomeBundle\MuzichHomeBundle(),
+            new Muzich\MynetworkBundle\MuzichMynetworkBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

app/config/routing.yml

@@ -1,3 +1,7 @@
+MuzichMynetworkBundle:
+    resource: "@MuzichMynetworkBundle/Resources/config/routing.yml"
+    prefix:   /
+
 # Internal routing configuration to handle ESI
 #_internal:
 #   resource: "@FrameworkBundle/Resources/config/routing/internal.xml"

src/Muzich/CoreBundle/Entity/Group.php

@@ -14,6 +14,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
  * 
  * @ORM\Entity
  * @ORM\Table(name="m_group")
+ * @ORM\Entity(repositoryClass="Muzich\CoreBundle\Repository\GroupRepository")
  */
 class Group
 {

src/Muzich/CoreBundle/Entity/User.php

@@ -71,7 +71,7 @@ class User extends BaseUser
    * Cet attribut contient les enregistrements FollowGroup lié 
    * a cet utilisateur dans le cadre des groupes suivis.
    * 
-   * @ORM\OneToMany(targetEntity="FollowGroup", mappedBy="user")
+   * @ORM\OneToMany(targetEntity="FollowGroup", mappedBy="follower")
    */
   protected $followed_groups;
   
@@ -184,7 +184,12 @@ class User extends BaseUser
    */
   public function getFollowedsUsers()
   {
-    return $this->followeds_users;
+    $users = array();
+    foreach ($this->followeds_users as $follow_user)
+    {
+      $users[] = $follow_user->getFollowed();
+    }
+    return $users;
   }
 
   /**
@@ -194,7 +199,12 @@ class User extends BaseUser
    */
   public function getFollowersUsers()
   {
-    return $this->followers_users;
+    $users = array();
+    foreach ($this->followers_users as $follow_user)
+    {
+      $users[] = $follow_user->getFollower();
+    }
+    return $users;
   }
 
   /**
@@ -214,7 +224,12 @@ class User extends BaseUser
    */
   public function getFollowedGroups()
   {
-    return $this->followed_groups;
+    $groups = array();
+    foreach ($this->followed_groups as $follow_group)
+    {
+      $groups[] = $follow_group->getGroup();
+    }
+    return $groups;
   }
 
   /**

src/Muzich/CoreBundle/Repository/GroupRepository.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Muzich\CoreBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+class GroupRepository extends EntityRepository
+{
+  
+  /**
+   * Retourne un tableau d'user correspondant a un chaine de caractère
+   * La recherche est effectué sur le username.
+   * 
+   * @param type $string
+   * @return Doctrine\ORM\Query
+   */
+  public function findByString($string)
+  {
+    return $this->getEntityManager()
+      ->createQuery("
+        SELECT g FROM MuzichCoreBundle:Group g
+        WHERE UPPER(g.name) LIKE :str
+        ORDER BY g.name ASC"
+      )
+      ->setParameters(array(
+        'str' => '%'.strtoupper(trim($string)).'%'
+      ))
+    ;
+  }
+  
+}
+  

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -34,5 +34,27 @@ class UserRepository extends EntityRepository
     return $tag_ids;
   }
   
+  /**
+   * Retourne un tableau d'user correspondant a un chaine de caractère
+   * La recherche est effectué sur le username.
+   * 
+   * @param type $string
+   * @return Doctrine\ORM\Query
+   */
+  public function findByString($string)
+  {
+    return $this->getEntityManager()
+      ->createQuery("
+        SELECT u FROM MuzichCoreBundle:User u
+        WHERE UPPER(u.username) LIKE :str
+        OR UPPER(u.usernameCanonical) LIKE :str
+        ORDER BY u.username ASC"
+      )
+      ->setParameters(array(
+        'str' => '%'.strtoupper(trim($string)).'%'
+      ))
+    ;
+  }
+  
 }
   

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -15,7 +15,7 @@
 	<link href="{{ asset('bundles/muzichcore/css/base.css') }}" rel="stylesheet" media="screen" type="text/css" />
 	<link href="{{ asset('bundles/muzichcore/css/main.css') }}" rel="stylesheet" media="screen" type="text/css" />
   {% block css %}{% endblock %}
-	{#<script src="{{ asset('js/main.js') }}" type="text/javascript"></script>#}
+	<script src="{{ asset('bundles/muzichcore/js/jquery-1.6.4.min.js') }}" type="text/javascript"></script>
   {% block js %}{% endblock %}
 </head>
 <body>

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -65,7 +65,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
   }
   
   /**
-   * Récupération des paramètres de la recherche.
+   * @see SearcherInterface
    * 
    * @return array 
    */

src/Muzich/CoreBundle/Searcher/SearcherInterface.php

@@ -19,6 +19,11 @@ interface SearcherInterface
    */
   public function update($params);
   
+  /**
+   * Récupération des paramètres
+   */
+  public function getParams();
+  
 //  /**
 //   * Procédure qui construit la requete.
 //   */

src/Muzich/CoreBundle/Searcher/UserAndGroupSearcher.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Muzich\CoreBundle\Searcher;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+class UserAndGroupSearcher extends Searcher implements SearcherInterface
+{
+  
+  /**
+   * Chaine de caractère représentant la recherche.
+   * 
+   * @var string
+   * @Assert\NotBlank()
+   * @Assert\Type("string")
+   * @Assert\MinLength(3)
+   */
+  protected $string;
+  
+  /**
+   * @see SearcherInterface
+   * @param array $params 
+   */
+  public function init($params)
+  {
+    // Control des parametres transmis.
+    $this->checkParams($params, array(
+      'string' => "Muzich\CoreBundle\Searcher\UserAndGroupSearch::init(): \$params: Un string est nécéssaire"
+    ));
+    
+    // Mise a jour des attributs
+    $this->setAttributes(array('string', 'min_lenght'), $params);
+  }
+  
+  /**
+   * @see SearcherInterface
+   * @param array $params 
+   */
+  public function update($params)
+  {
+    // Mise a jour des attributs
+    $this->setAttributes(array(
+      'string', 'min_length'
+    ), $params);
+  }
+  
+  /**
+   * @see SearcherInterface
+   * 
+   * @return array 
+   */
+  public function getParams()
+  {
+    return array(
+      'string' => $this->string,
+      'min_length' => $this->min_length
+    );
+  }
+  
+  public function getString()
+  {
+    return $this->string;
+  }
+  
+  public function setString($string)
+  {
+    $this->string = $string;
+  }
+  
+}

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Muzich\MynetworkBundle\Controller;
+
+use Muzich\CoreBundle\lib\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Muzich\CoreBundle\Searcher\UserAndGroupSearcher;
+
+class MynetworkController extends Controller
+{
+  
+  /**
+   * 
+   * @Template()
+   */
+  public function indexAction()
+  {
+    $user = $this->getUser();
+    
+    $followeds_users = $user->getFollowedsUsers();
+    $followeds_groups = $user->getFollowedGroups();
+    $followers_users = $user->getFollowersUsers();
+    
+    return array(
+      'followeds_users' => $followeds_users,
+      'followeds_groups' => $followeds_groups,
+      'followers_users' => $followers_users
+    );
+  }
+  
+  /**
+   * Action qui affiche la page de recherche, et efectue la recherche
+   * d'utilisateurs et de groupes.
+   * 
+   * @Template()
+   */
+  public function searchAction()
+  {
+    $request = $this->getRequest();
+    $search = new UserAndGroupSearcher();
+    $results = array('users' => null, 'groups' => null);
+    
+    $search_form = $this->createFormBuilder($search)
+      ->add('string', 'text')
+    ->getForm();
+    
+    // Si l'utilisateur effectue la recherche
+    if ($request->getMethod() == 'POST')
+    {
+      $search_form->bindRequest($request);
+      if ($search_form->isValid())
+      {
+        $results = $this->doSearchAction($search);
+      }
+    }
+    
+    if ($this->getRequest()->isXmlHttpRequest())
+    {
+      
+    }
+    else
+    {
+      return array(
+        'search_form' => $search_form->createView(),
+        'results'     => $results,
+        'search_done' => $search->getString() ? true : false
+      );
+    }
+  }
+  
+  protected function doSearchAction($search)
+  {
+    $string = str_replace('%', '#', $search->getString());
+    
+    $users = $this->getDoctrine()
+      ->getRepository('MuzichCoreBundle:User')
+      ->findByString($string)
+      ->execute()
+    ;
+    
+    $groups = $this->getDoctrine()
+      ->getRepository('MuzichCoreBundle:Group')
+      ->findByString($string)
+      ->execute()
+    ;
+    
+    return array(
+      'users'  => $users,
+      'groups' => $groups
+    );
+  }
+  
+}

src/Muzich/MynetworkBundle/DependencyInjection/Configuration.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Muzich\MynetworkBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * This is the class that validates and merges configuration from your app/config files
+ *
+ * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
+ */
+class Configuration implements ConfigurationInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('muzich_mynetwork');
+
+        // Here you should define the parameters that are allowed to
+        // configure your bundle. See the documentation linked above for
+        // more information on that topic.
+
+        return $treeBuilder;
+    }
+}

src/Muzich/MynetworkBundle/DependencyInjection/MuzichMynetworkExtension.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Muzich\MynetworkBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+
+/**
+ * This is the class that loads and manages your bundle configuration
+ *
+ * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
+ */
+class MuzichMynetworkExtension extends Extension
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
+    }
+}

src/Muzich/MynetworkBundle/MuzichMynetworkBundle.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Muzich\MynetworkBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class MuzichMynetworkBundle extends Bundle
+{
+}

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

@@ -0,0 +1,13 @@
+
+mynetwork_index:
+  pattern:  /my-network
+  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:index }
+  
+mynetwork_search:
+  pattern:  /my-network/search
+  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:search }
+  
+#mynetwork_search:
+#  pattern:  /my-network/search/do
+#  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:search }
+  

src/Muzich/MynetworkBundle/Resources/config/services.yml

@@ -0,0 +1,7 @@
+parameters:
+#    muzich_mynetwork.example.class: Muzich\MynetworkBundle\Example
+
+services:
+#    muzich_mynetwork.example:
+#        class: %muzich_mynetwork.example.class%
+#        arguments: [@service_id, "plain_value", %parameter%]

src/Muzich/MynetworkBundle/Resources/translations/messages.fr.xliff

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="1">
+                <source>Symfony2 is great</source>
+                <target>J'aime Symfony2</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig

@@ -0,0 +1,46 @@
+{% extends "MuzichMynetworkBundle::layout.html.twig" %}
+
+{% block title %}Mon réseau{% endblock %}
+
+{% block content %}
+
+  <p>
+    <a href="{{ path('mynetwork_search') }}" >
+      Rechercher
+    </a>
+  </p>
+  
+  {% if followeds_users %}
+    <b>Utilisateurs</b>
+    <ul>
+    {% for user in followeds_users %} 
+      <li>
+        {{ user.username }}
+      </li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  
+  {% if followeds_groups %}
+    <b>Groupes</b>
+    <ul>
+    {% for group in followeds_groups %} 
+      <li>
+        {{ group.name }}
+      </li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  
+  {% if followers_users %}
+    <b>Vous êtes suivis par</b>
+    <ul>
+    {% for user in followers_users %} 
+      <li>
+        {{ user.username }}
+      </li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+
+{% endblock %}

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig

@@ -0,0 +1,62 @@
+{% extends "MuzichMynetworkBundle::layout.html.twig" %}
+
+{% block title %}Mon réseau{% endblock %}
+
+{% block content %}
+
+  <p>
+    <a href="{{ path('mynetwork_index') }}" >
+      Retour
+    </a>
+  </p>
+  
+  <b>Rechercher des utilisateurs et des groupes</b>
+  
+  <form action="{{ path('mynetwork_search') }}" method="post" {{ form_enctype(search_form) }}>
+    
+    {{ form_errors(search_form) }}
+
+    {{ form_row(search_form.string) }}
+
+    {{ form_rest(search_form) }}
+
+    <input type="submit" />
+  </form>
+  
+  {% if results.users|length or results.groups|length %}
+  
+    {% if results.users %}
+
+      <b>Utilisateurs</b>
+      
+      <ul>
+      {% for user in results.users %} 
+        <li>
+          {{ user.username }}
+        </li>
+      {% endfor %}
+      </ul>
+
+    {% endif %}
+  
+    {% if results.groups %}
+
+      <b>Groupes</b>
+      
+      <ul>
+      {% for group in results.groups %} 
+        <li>
+          {{ group.name }}
+        </li>
+      {% endfor %}
+      </ul>
+
+    {% endif %}
+  
+  {% elseif search_done %}
+      
+      <p>Il n'y a aucun résultat a votre recherche</p>
+      
+  {% endif %}
+
+{% endblock %}

src/Muzich/MynetworkBundle/Resources/views/layout.html.twig

@@ -0,0 +1,9 @@
+{% extends 'MuzichCoreBundle::layout.html.twig' %}
+
+{% block css %}
+	<link href="{{ asset('bundles/mynetwork/css/mynetwork.css') }}" rel="stylesheet" media="screen" type="text/css" />
+{% endblock %}
+
+{% block main_content %}
+    {% block content %}{% endblock %}
+{% endblock %}

src/Muzich/MynetworkBundle/Tests/Controller/DefaultControllerTest.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Muzich\MynetworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class DefaultControllerTest extends WebTestCase
+{
+    public function testIndex()
+    {
+        $client = static::createClient();
+
+        $crawler = $client->request('GET', '/hello/Fabien');
+
+        $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
+    }
+}

web/bundles/mynetwork/css/mynetwork.css

@@ -0,0 +1,7 @@
+/* 
+    Document   : mynetwork
+    Created on : 27 sept. 2011, 14:41:54
+    Author     : bux
+    Description:
+        Purpose of the stylesheet follows.
+*/