Mise a jour du code de l'Event new comment: L'objet ne reste pas en base après avoir été vu.

src/Muzich/CoreBundle/Actions/User/Event.php

@@ -35,7 +35,6 @@ class Event
   {
     $this->event->addId($element_id);
     $this->event->setType($type);
-    $this->event->setView(false);
     $this->event->setUser($this->user);
   }
 }

src/Muzich/CoreBundle/Entity/Event.php

@@ -60,15 +60,6 @@ class Event
    */
   protected $user;
   
-  /**
-   * Si $view est a vrai, cela se traduit par le fait que l'user a vue l'événement
-   * ou qu'il l'a supprimé.
-   * 
-   * @ORM\Column(type="boolean")
-   * @var type string
-   */
-  protected $view;
-  
   /*
    * 
    * getters / setters
@@ -120,16 +111,6 @@ class Event
     $this->user = $user;
   }
   
-  public function getView()
-  {
-    return $this->view;
-  }
-  
-  public function setView($view)
-  {
-    $this->view = $view;
-  }
-  
   /*
    * other methods
    * 

src/Muzich/CoreBundle/Propagator/EventElementComment.php

@@ -23,8 +23,7 @@ class EventElementComment extends EventPropagator
     {
       $event = $em->createQuery(
         'SELECT e FROM MuzichCoreBundle:Event e
-        WHERE e.user = :uid AND e.type = :type AND 
-          (e.view = \'FALSE\' OR e.view = \'0\')'
+        WHERE e.user = :uid AND e.type = :type'
       )->setParameters(array(
         'uid' => $element->getOwner()->getId(),
         'type' => Event::TYPE_COMMENT_ADDED_ELEMENT

src/Muzich/CoreBundle/Repository/EventRepository.php

@@ -7,14 +7,12 @@ use Doctrine\ORM\EntityRepository;
 class EventRepository extends EntityRepository
 {
   
-  public function getNotViewEvents($user_id)
+  public function getEvents($user_id)
   {
     $events = array();
     $result = $this->getEntityManager()
-      ->createQuery('
-        SELECT e FROM MuzichCoreBundle:Event e
-        WHERE e.user = :uid AND 
-        (e.view = \'FALSE\' OR e.view = \'0\')'
+      ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
+        WHERE e.user = :uid'
       )
       ->setParameter('uid', $user_id)
       ->getArrayResult()

src/Muzich/CoreBundle/Tests/Controller/EventTest.php

@@ -22,10 +22,8 @@ class EventTest extends FunctionalTest
     
     // Actuellement il n'y a aucun event d'ouvert pour bux (fixtures)
     $result = $this->getDoctrine()->getEntityManager()
-      ->createQuery('
-        SELECT e FROM MuzichCoreBundle:Event e
-        WHERE e.user = :uid AND 
-        (e.view = \'FALSE\' OR e.view = \'0\')'
+      ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
+        WHERE e.user = :uid'
       )
       ->setParameter('uid', $bux->getId())
       ->getArrayResult()
@@ -59,8 +57,7 @@ class EventTest extends FunctionalTest
     $result = $this->getDoctrine()->getEntityManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Event e
-        WHERE e.user = :uid AND 
-        (e.view = \'FALSE\' OR e.view = \'0\')'
+        WHERE e.user = :uid'
       )
       ->setParameter('uid', $bux->getId())
       ->getArrayResult()
@@ -97,8 +94,7 @@ class EventTest extends FunctionalTest
     $result = $this->getDoctrine()->getEntityManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Event e
-        WHERE e.user = :uid AND 
-        (e.view = \'FALSE\' OR e.view = \'0\')'
+        WHERE e.user = :uid'
       )
       ->setParameter('uid', $bux->getId())
       ->getArrayResult()
@@ -131,10 +127,8 @@ class EventTest extends FunctionalTest
     
     // bux a toujours 1 seul event en base
     $result = $this->getDoctrine()->getEntityManager()
-      ->createQuery('
-        SELECT e FROM MuzichCoreBundle:Event e
-        WHERE e.user = :uid AND 
-        (e.view = \'FALSE\' OR e.view = \'0\')'
+      ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
+        WHERE e.user = :uid'
       )
       ->setParameter('uid', $bux->getId())
       ->getArrayResult()
@@ -173,6 +167,16 @@ class EventTest extends FunctionalTest
     $url = $this->generateUrl('ajax_filter_remove_ids');
     $this->exist('div.more_filters a[href="'.$url.'"]');
     
+    // L'objet Event ne doit plus être en base maintenant qu'il a été vu
+    $result = $this->getDoctrine()->getEntityManager()
+      ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
+        WHERE e.user = :uid'
+      )
+      ->setParameter('uid', $bux->getId())
+      ->getArrayResult()
+    ;
+    $this->assertEquals(count($result), 0);
+    
     // Du coup on clique dessus pour revenir a un etat normal
     $this->crawler = $this->client->request(
       'GET', 

src/Muzich/UserBundle/Controller/EventController.php

@@ -10,7 +10,7 @@ class EventController extends Controller
   public function infoBarAction()
   {
     $events = $this->getDoctrine()->getRepository('MuzichCoreBundle:Event')
-      ->getNotViewEvents($this->getUserId())
+      ->getEvents($this->getUserId())
     ;
     
     return $this->render('MuzichUserBundle:Info:bar.html.twig', array(
@@ -56,8 +56,7 @@ class EventController extends Controller
     $es = $this->getElementSearcher();
     $es->setIds($event->getIds());
     $this->setElementSearcherParams($es->getParams());
-    $event->setView(true);
-    $this->getDoctrine()->getEntityManager()->persist($event);
+    $this->getDoctrine()->getEntityManager()->remove($event);
     $this->getDoctrine()->getEntityManager()->flush();
     
     // Si ajax