Evolution #783: Scores Element: favoris, Users playlists

src/Muzich/CoreBundle/Command/RecalculateReputationCommand.php

@@ -184,7 +184,9 @@ class RecalculateReputationCommand extends ContainerAwareCommand
     
     foreach ($elements as $element)
     {
-      $element->setPoints($this->getElementScore($element));
+      $element_score = $this->getElementScore($element);
+      $element->setPoints($element_score);
+      $output->writeln('<info>Element "'.$element->getName().'": '.$element_score.' score</info>');
       $em->persist($element);
     }
     

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -456,11 +456,12 @@ class ElementController extends Controller
     }
     
     // On ajoute un vote a l'élément
-    $element->addVoteGood($this->getUser()->getId());
+    $element->addVoteGood($this->getUser()->getId(), $this->container->getParameter('reputation_element_point_value'));
     // Puis on lance les actions propagés par ce vote
     $event = new EventElement($this->container);
     $event->onePointAdded($element);
     
+    $this->getDoctrine()->getManager()->persist($element->getOwner());
     $this->getDoctrine()->getManager()->persist($element);
     $this->getDoctrine()->getManager()->flush();
     
@@ -515,11 +516,12 @@ class ElementController extends Controller
     }
     
     // Retrait du vote good
-    $element->removeVoteGood($this->getUser()->getId());
+    $element->removeVoteGood($this->getUser()->getId(), $this->container->getParameter('reputation_element_point_value'));
     // Puis on lance les actions propagés par retrait de vote
     $event = new EventElement($this->container);
     $event->onePointRemoved($element);
     
+    $this->getDoctrine()->getManager()->persist($element->getOwner());
     $this->getDoctrine()->getManager()->persist($element);
     $this->getDoctrine()->getManager()->flush();
     

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php

@@ -65,7 +65,7 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     {
       foreach ($vote_ids as $id)
       {
-        $element->addVoteGood($id);
+        $element->addVoteGood($id, $this->container->getParameter('reputation_element_point_value'));
       }
     }
     

src/Muzich/CoreBundle/Entity/Element.php

@@ -865,7 +865,7 @@ class Element
    * 
    * @param int $user_id 
    */
-  public function addVoteGood($user_id)
+  public function addVoteGood($user_id, $score_action)
   {
     $votes = $this->getVoteGoodIds();
     if (!count($votes))
@@ -876,7 +876,7 @@ class Element
     if (!$this->hasVoteGood($user_id))
     {
       $votes[] = (string)$user_id;
-      $this->setPoints(count($votes));
+      $this->setPoints($this->getPoints()+$score_action);
     }
     $this->setVoteGoodIds($votes);
   }
@@ -886,7 +886,7 @@ class Element
    * 
    * @param int $user_id 
    */
-  public function removeVoteGood($user_id)
+  public function removeVoteGood($user_id, $score_action)
   {
     if (count($votes = $this->getVoteGoodIds()))
     {
@@ -899,7 +899,7 @@ class Element
         }
       }
       
-      $this->setPoints(count($votes_n));
+      $this->setPoints($this->getPoints()-$score_action);
       $this->setVoteGoodIds($votes_n);
     }
   }

src/Muzich/CoreBundle/Propagator/EventElement.php

@@ -231,45 +231,14 @@ class EventElement extends EventPropagator
     $this->container->get('doctrine')->getEntityManager()->persist($proposition->getUser());
   }
   
-  /**
-   * Intervien lorsque l'évènement est supprimé.
-   * Il doit retirer au propriétaire:
-   * * Les points de l'élément
-   * * Les points du aux mises en favoris
-   * 
-   * @param Element $element 
-   */
+  /** @param Element $element */
   public function elementRemoved(Element $element)
   {
-    // L'utilisateur n'a plus droits aux points de l'élément.
     $ur = new UserReputation($element->getOwner());
+    
     $ur->removePoints(
       $element->getPoints() * $this->container->getParameter('reputation_element_point_value')
     );
-    
-    // Ni aux points liés aux mises en favoris
-    $fav = $this->container->get('doctrine')->getEntityManager()->createQuery(
-      "SELECT COUNT(f) FROM MuzichCoreBundle:UsersElementsFavorites f"
-      . " JOIN f.element e"
-      . " WHERE e.owner = :uid AND f.user != :uid AND e.id = :eid"
-    )->setParameters(array(
-      'uid' => $element->getOwner()->getId(),
-      'eid' => $element->getId()
-    ))
-     ->getScalarResult()      
-    ;
-
-    if (count($fav))
-    {
-      if (count($fav[0]))
-      {
-        $count_favs = $fav[0][1];
-        $ur = new UserReputation($element->getOwner());
-        $ur->removePoints(
-          $count_favs * $this->container->getParameter('reputation_element_favorite_value')
-        );
-      }
-    }
   }
   
 }

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

@@ -0,0 +1,332 @@
+<?php
+
+namespace Muzich\CoreBundle\Tests\Controller;
+
+use Muzich\CoreBundle\lib\FunctionalTest;
+use Muzich\CoreBundle\Tests\lib\Security\ContextTestCases;
+
+class ScoreTest extends FunctionalTest
+{
+  
+  protected $scores_reference = array(
+    'User' => array(
+      "admin"  => 0,
+      "bux"    => 22,
+      "jean"   => 18,
+      "paul"   => 14,
+      "bob"    => 1,
+      "joelle" => 9
+    ),
+    'Element' => array(
+      "Heretik System Popof - Resistance" => 5, 
+      "Dtc che passdrop"                  => 0, 
+      "Antropod - Polakatek"              => 0, 
+      "KoinkOin - H5N1"                   => 0, 
+      "DJ FAB"                            => 6, 
+      "Dj antoine"                        => 1, 
+      "Acrotek Hardtek G01"               => 1, 
+      "All Is Full Of Pain"               => 0, 
+      "RE-FUCK (ReVeRB_FBC) mix."         => 1, 
+      "CardioT3K - Juggernaut Trap"       => 1, 
+      "DUDELDRUM"                         => 1, 
+      "Infected Mushroom - Psycho"        => 2, 
+      "Infected mushroom - Muse Breaks"   => 1, 
+      "Cents Pas - Joëlle"                => 2, 
+      "Cents Pas - Joëlle (bis)"          => 2, 
+      "UKF Dubstep Mix - August "         => 1, 
+      "Dubstep Beatbox"                   => 3, 
+      "SOULFLY - Prophecy"                => 1, 
+      "AZYD AZYLUM Live au Café Provisoire"             => 3, 
+      "Babylon Pression - Des Tasers et des Pauvres"    => 1, 
+      "Ed Cox - La fanfare des teuffeurs (Hardcordian)" => 2, 
+    )
+  );
+  
+  protected function init()
+  {
+    $this->client = self::createClient();
+    $this->tests_cases = new ContextTestCases($this->client, $this);
+  }
+  
+  protected function checkScores()
+  {
+    foreach ($this->scores_reference as $object_type => $objects_scores)
+    {
+      foreach ($objects_scores as $name => $score)
+      {
+        $this->assertEquals($score, $this->getEntityScore($object_type, $name));
+      }
+    }
+  }
+  
+  protected function getEntityScore($object_type, $name)
+  {
+    if ($object_type == 'Element')
+    {
+      return $this->findOneBy('Element', $name)->getPoints();
+    }
+    if ($object_type == 'User')
+    {
+      return $this->findUserByUsername($name)->getReputation();
+    }
+  }
+  
+  public function testScores()
+  {
+    $this->init(); 
+    $this->checkScores();
+    
+    $this->checkAddVoteGood();
+    $this->checkRemoveVoteGood();
+    
+    $this->checkAddToFavorites();
+    $this->checkRemoveFromFavorites();
+    
+    $this->checkWithPlaylists();
+    $this->checkTagsPropositions();
+    $this->checkFollowing();
+    $this->checkDeleteElement();
+  }
+  
+  protected function checkAddVoteGood()
+  {
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->elementAddGoodPoint(
+      $this->findOneBy('Element', "Cents Pas - Joëlle (bis)"),
+      $this->findUserByUsername('paul'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['joelle'] += 1;
+    $this->scores_reference['Element']['Cents Pas - Joëlle (bis)'] += 1;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+  protected function stringResponseIsSuccess($response_string)
+  {
+    $response_array = json_decode($response_string, true);
+    $this->assertEquals('success', $response_array['status']);
+  }
+  
+  protected function checkRemoveVoteGood()
+  {
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->elementRemoveGoodPoint(
+      $this->findOneBy('Element', "Cents Pas - Joëlle (bis)"),
+      $this->findUserByUsername('paul'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['joelle'] -= 1;
+    $this->scores_reference['Element']['Cents Pas - Joëlle (bis)'] -= 1;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+  protected function checkAddToFavorites()
+  {
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->elementAddToFavorites(
+      $this->findOneBy('Element', "Cents Pas - Joëlle (bis)"),
+      $this->findUserByUsername('paul'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['joelle'] += 5;
+    $this->scores_reference['Element']['Cents Pas - Joëlle (bis)'] += 5;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+  protected function checkRemoveFromFavorites()
+  {
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->elementRemoveFromFavorites(
+      $this->findOneBy('Element', "Cents Pas - Joëlle (bis)"),
+      $this->findUserByUsername('paul'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['joelle'] -= 5;
+    $this->scores_reference['Element']['Cents Pas - Joëlle (bis)'] -= 5;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+  protected function checkWithPlaylists()
+  {
+    $this->connectUser('joelle');
+    
+    $response = $this->tests_cases->playlistCreate(
+      $this->findOneBy('Element', "Babylon Pression - Des Tasers et des Pauvres")->getId(),
+      "JoellePlaylist:)");
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 1;
+    $this->scores_reference['Element']['Babylon Pression - Des Tasers et des Pauvres'] += 1;
+    $this->checkScores();
+    
+    $response = $this->tests_cases->playlistCreate(
+      $this->findOneBy('Element', "Babylon Pression - Des Tasers et des Pauvres")->getId(),
+      "EncoreUnePlaylistAJoelle)");
+    $this->stringResponseIsSuccess($response);
+    $this->checkScores();
+    
+    $response = $this->tests_cases->playlistAddElement(
+      $this->findOneBy('Playlist', "JoellePlaylist:)")->getId(),
+      $this->findOneBy('Element', "Babylon Pression - Des Tasers et des Pauvres")->getId());
+    $this->stringResponseIsSuccess($response);
+    $this->checkScores();
+    
+    $response = $this->tests_cases->playlistAddElement(
+      $this->findOneBy('Playlist', "JoellePlaylist:)")->getId(),
+      $this->findOneBy('Element', "Ed Cox - La fanfare des teuffeurs (Hardcordian)")->getId());
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 1;
+    $this->scores_reference['Element']['Ed Cox - La fanfare des teuffeurs (Hardcordian)'] += 1;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->playlistCreate(
+      $this->findOneBy('Element', "Babylon Pression - Des Tasers et des Pauvres")->getId(),
+      "TrololoPaul");
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 1;
+    $this->scores_reference['Element']['Babylon Pression - Des Tasers et des Pauvres'] += 1;
+    $this->checkScores();
+    
+    $response = $this->tests_cases->playlistRemoveElement(
+      $this->findOneBy('Playlist', "TrololoPaul")->getId(),
+      0);
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] -= 1;
+    $this->scores_reference['Element']['Babylon Pression - Des Tasers et des Pauvres'] -= 1;
+    $this->checkScores();
+    
+    
+    $this->disconnectUser();
+  }
+  
+  protected function checkTagsPropositions()
+  {
+    $this->connectUser('joelle');
+    
+    $response = $this->tests_cases->elementProposeTags(
+      $this->findOneBy('Element', "Ed Cox - La fanfare des teuffeurs (Hardcordian)"),
+      $this->findUserByUsername('joelle'),
+      array($this->findOneBy('Tag', "Hardtek")->getId()));
+    $this->stringResponseIsSuccess($response);
+    $this->checkScores();
+    
+    $this->disconnectUser();
+    $this->connectUser('bux');
+            
+    $response = $this->tests_cases->elementAcceptTagsProposition(
+      $this->findUserByUsername('bux'),
+      $this->getLastTagsProposition($this->findOneBy('Element', "Ed Cox - La fanfare des teuffeurs (Hardcordian)")));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['joelle'] += 12;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+  protected function checkFollowing()
+  {
+    $this->connectUser('joelle');
+    
+    $response = $this->tests_cases->followUser(
+      $this->findUserByUsername('paul')->getId());
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['paul'] += 10;
+    $this->checkScores();
+    
+    $response = $this->tests_cases->followUser(
+      $this->findUserByUsername('paul')->getId());
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['paul'] -= 10;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+  protected function checkDeleteElement()
+  {
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->elementAddGoodPoint(
+      $this->findOneBy('Element', "KoinkOin - H5N1"),
+      $this->findUserByUsername('paul'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 1;
+    $this->scores_reference['Element']["KoinkOin - H5N1"] += 1;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+    $this->connectUser('joelle');
+    
+    $response = $this->tests_cases->elementAddGoodPoint(
+      $this->findOneBy('Element', "KoinkOin - H5N1"),
+      $this->findUserByUsername('joelle'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 1;
+    $this->scores_reference['Element']["KoinkOin - H5N1"] += 1;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+    
+    $this->connectUser('paul');
+    
+    $response = $this->tests_cases->elementAddToFavorites(
+      $this->findOneBy('Element', "KoinkOin - H5N1"),
+      $this->findUserByUsername('paul'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 5;
+    $this->scores_reference['Element']["KoinkOin - H5N1"] += 5;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+    
+    $this->connectUser('jean');
+    
+    $response = $this->tests_cases->playlistCreate(
+      $this->findOneBy('Element', "KoinkOin - H5N1")->getId(),
+      "4564564752478942892489)");
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] += 1;
+    $this->scores_reference['Element']['KoinkOin - H5N1'] += 1;
+    $this->checkScores();
+    
+    $this->disconnectUser();
+    $this->connectUser('bux');
+    
+    $response = $this->tests_cases->elementDelete(
+      $this->findOneBy('Element', "KoinkOin - H5N1"),
+      $this->findUserByUsername('bux'));
+    $this->stringResponseIsSuccess($response);
+    
+    $this->scores_reference['User']['bux'] -= 8;
+    unset($this->scores_reference['Element']['KoinkOin - H5N1']);
+    $this->checkScores();
+    
+    $this->disconnectUser();
+  }
+  
+}

src/Muzich/CoreBundle/Tests/lib/Security/ContextTestCases.php

@@ -6,6 +6,10 @@ use Muzich\CoreBundle\lib\Test\Client;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Muzich\CoreBundle\Security\Context as SecurityContext;
 use Symfony\Component\DomCrawler\Crawler;
+use Muzich\CoreBundle\Entity\Element;
+use Muzich\CoreBundle\Entity\User;
+use Muzich\CoreBundle\Entity\Playlist;
+use Muzich\CoreBundle\Entity\ElementTagsProposition;
 
 class ContextTestCases
 {
@@ -222,19 +226,24 @@ class ContextTestCases
   public function followUserResponseIs($success, $condition)
   {
     return $this->ajaxResponseSatisfyConditions(
-      $this->getAjaxRequestContentResponse(
-        'GET',
-        $this->test->generateUrl('follow', array(
-          'type' => 'user', 
-          'id' => 0,
-          'token' => 'notoken'
-        ))
-      ), 
+      $this->followUser(0), 
       $success, 
       $condition
     );
   }
   
+  public function followUser($user_id)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('follow', array(
+        'type'  => 'user', 
+        'id'    => $user_id,
+        'token' => $this->test->getUser()->getPersonalHash($user_id)
+      ))
+    );
+  }
+  
   public function getFavoritesTagsResponseIs($success, $condition)
   {
     return $this->ajaxResponseSatisfyConditions(
@@ -380,6 +389,8 @@ class ContextTestCases
       array(), 
       array('HTTP_X-Requested-With' => 'XMLHttpRequest')
     );
+    
+    return $this->test->getClient()->getResponse()->getContent();
   }
 
 
@@ -539,4 +550,86 @@ class ContextTestCases
     );
   }
   
+  public function elementAddGoodPoint(Element $element, User $user)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('ajax_element_add_vote_good', array(
+        'element_id' => $element->getId(),
+        'token'      => $user->getPersonalHash($element->getId()),
+        '_locale'    => 'fr'
+      ))
+    );
+  }
+  
+  public function elementRemoveGoodPoint(Element $element, User $user)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('ajax_element_remove_vote_good', array(
+        'element_id' => $element->getId(),
+        'token'      => $user->getPersonalHash($element->getId()),
+        '_locale'    => 'fr'
+      ))
+    );
+  }
+  
+  public function elementAddToFavorites(Element $element, User $user)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('favorite_add', array(
+        'id'    => $element->getId(),
+        'token' => $user->getPersonalHash($element->getId())
+      ))
+    );
+  }
+  
+  public function elementRemoveFromFavorites(Element $element, User $user)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('favorite_remove', array(
+        'id'    => $element->getId(),
+        'token' => $user->getPersonalHash($element->getId())
+      ))
+    );
+  }
+  
+  public function elementProposeTags(Element $element, User $user, $tags_ids)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'POST',
+      $this->test->generateUrl('ajax_element_propose_tags_proceed', 
+        array('element_id' => $element->getId(), 'token' => $user->getPersonalHash())
+      ), 
+      array(
+        'element_tag_proposition_'.$element->getId() => array(
+          'tags' => json_encode($tags_ids)
+        )
+      )
+    );
+  }
+  
+  public function elementAcceptTagsProposition(User $user, ElementTagsProposition $proposition)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('ajax_element_proposed_tags_accept', array(
+        'proposition_id' => $proposition->getId(),
+        'token'          => $user->getPersonalHash($proposition->getId())
+      ))
+    );
+  }
+  
+  public function elementDelete(Element $element, User $user)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('element_remove', array(
+        'element_id' => $element->getId(), 'token' => $user->getPersonalHash($element->getId())
+      ))
+    );
+  }
+  
 }

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -9,6 +9,7 @@ use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\StreamOutput;
+use Muzich\CoreBundle\Entity\Element;
 
 class FunctionalTest extends WebTestCase
 {
@@ -88,7 +89,7 @@ class FunctionalTest extends WebTestCase
     ;
   }
   
-  protected function connectUser($login, $password, $client = null, $success = true)
+  protected function connectUser($login, $password = 'toor', $client = null, $success = true)
   {
     if (!$client)
     {
@@ -581,4 +582,20 @@ class FunctionalTest extends WebTestCase
     return $this->getContainer()->get('form.csrf_provider')->generateCsrfToken($intention);
   }
   
+  public function getLastTagsProposition(Element $element)
+  {
+    $propositions = $this->getDoctrine()->getManager()
+      ->createQuery('SELECT p FROM MuzichCoreBundle:ElementTagsProposition p'
+        .' WHERE p.element = :eid ORDER BY p.id DESC')
+      ->setMaxResults(1)
+      ->setParameters(array(
+        'eid' => $element->getId()
+      ))
+      ->getResult()
+    ;
+    
+    $this->assertEquals(1, count($propositions));
+    return $propositions[0];
+  }
+  
 }

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -74,6 +74,7 @@ class FavoriteController extends Controller
     if ($this->getRequest()->isXmlHttpRequest())
     {
       return $this->jsonResponse(array(
+        'status'        => 'success',
         'favorite'      => true,
         'link_new_url'  => $this->generateUrl('favorite_remove', array(
             'id'    => $id,
@@ -138,6 +139,7 @@ class FavoriteController extends Controller
     if ($this->getRequest()->isXmlHttpRequest())
     {
       return $this->jsonResponse(array(
+        'status'        => 'success',
         'favorite'      => true,
         'link_new_url'  => $this->generateUrl('favorite_add', array(
             'id'    => $id,