Evolution #832: Element: Prise en compte anciens count_favorited & count_playlisted

src/Muzich/CoreBundle/Command/MigrationUpgradeCommand.php

@@ -9,6 +9,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 //use Muzich\CoreBundle\Managers\CommentsManager;
 use Muzich\CoreBundle\Util\StrictCanonicalizer;
+use Muzich\CoreBundle\Entity\Element;
 
 class MigrationUpgradeCommand extends ContainerAwareCommand
 {
@@ -72,10 +73,17 @@ class MigrationUpgradeCommand extends ContainerAwareCommand
       foreach ($elements as $element)
       {
         $element->setSlug($canonicalizer->canonicalize_stricter($element->getName()));
-        $output->write('.');
+        $this->updateCountFavorited($element);
+        $this->updateCountPlaylisted($element);
+        
+        $output->writeln('<info>Element '.$element->getName().' favorited ...'.$element->getCountFavorited().'</info>');
+        $output->writeln('<info>Element '.$element->getName().' playlisted ...'.$element->getCountPlaylisted().'</info>');
+        
+        //$output->write('.');
         $em->persist($element);
       }
       
+      $output->writeln('');
       $output->writeln('<info>Save in Database ...</info>');
       $em->flush();
       $output->writeln('<info>Terminé !</info>');
@@ -86,4 +94,49 @@ class MigrationUpgradeCommand extends ContainerAwareCommand
       $output->writeln('<error>Versions saisies non prises en charges</error>');
     }
   }
+  
+  protected function updateCountFavorited(Element $element)
+  {
+    $em = $this->getContainer()->get('doctrine')->getEntityManager();
+    
+    // Compter le nombre de favoris de cet élement 
+    // + Effectué par un autre que le proprio
+    // + Qui ont l'email confirmé
+    
+    $count = $em->createQueryBuilder()
+      ->select('COUNT(DISTINCT element)')
+      ->from('MuzichCoreBundle:UsersElementsFavorites', 'fav')
+      ->join('fav.user', 'owner')
+      ->join('fav.element', 'element')
+      ->where('fav.user != :element_owner_id AND owner.email_confirmed = 1')
+      ->andWhere('fav.element = :element_id')
+      ->setParameter('element_owner_id', $element->getOwner()->getId())
+      ->setParameter('element_id', $element->getId())
+      ->getQuery()
+      ->getSingleScalarResult()
+    ;
+    $element->setCountFavorited($count);
+  }
+  
+  protected function updateCountPlaylisted(Element $element)
+  {
+    $em = $this->getContainer()->get('doctrine')->getEntityManager();
+    
+    // Compter le nombre d'user qui ont l'element dans une playlist
+    // + Effectué par un user différent que le proprio
+    // + Qui ont l'email confirmé
+    
+    $count = $em->createQueryBuilder()
+      ->select('COUNT(DISTINCT user)')
+      ->from('MuzichCoreBundle:Playlist', 'playlist')
+      ->join('playlist.owner', 'user')
+      ->where('playlist.elements LIKE :element_id AND playlist.owner != :element_owner_id AND user.email_confirmed = 1')
+      ->setParameter('element_owner_id', $element->getOwner()->getId())
+      ->setParameter('element_id', '%"id":"'.$element->getId().'"%')
+      ->getQuery()
+      ->getSingleScalarResult()
+    ;
+    $element->setCountPlaylisted($count);
+  }
+  
 }

src/Muzich/CoreBundle/Command/RecalculateReputationCommand.php

@@ -33,8 +33,8 @@ class RecalculateReputationCommand extends ContainerAwareCommand
     $output->writeln('#');
 
     $output->writeln('<info>Début du traitement ...</info>');
-    $this->recalculateUserScores($input, $output);
     $this->recalculateElementScores($input, $output);
+    $this->recalculateUserScores($input, $output);
     
     $output->writeln('<info>Saving in database ...</info>');
     $em->flush();
@@ -87,34 +87,11 @@ class RecalculateReputationCommand extends ContainerAwareCommand
        ->getResult()      
       ;
       
-      $coef_element_point = $this->getContainer()->getParameter('reputation_element_point_value');
+      //$coef_element_point = $this->getContainer()->getParameter('reputation_element_point_value');
       $element_points = 0;
       foreach ($elements as $element)
       {
         $element_points += $element->getPoints();
-        // Point déjà ajoutés a l'user
-        $element_points -= ($element->getCountFavorited()*$this->getContainer()->getParameter('reputation_element_favorite_value'));
-      }
-      
-      /*
-       * On calcule pour les favoris
-       */
-      $coef_element_fav = $this->getContainer()->getParameter('reputation_element_favorite_value');
-      $count_favs = 0;
-      $fav = $em->createQuery(
-        "SELECT COUNT(f) FROM MuzichCoreBundle:UsersElementsFavorites f"
-        . " JOIN f.element e JOIN f.user fu"
-        . " WHERE e.owner = :uid AND f.user != :uid AND fu.email_confirmed = 1"
-      )->setParameter('uid', $user->getId())
-       ->getScalarResult()      
-      ;
-      
-      if (count($fav))
-      {
-        if (count($fav[0]))
-        {
-          $count_favs = $fav[0][1];
-        }
       }
       
       /*
@@ -160,8 +137,7 @@ class RecalculateReputationCommand extends ContainerAwareCommand
       }
 
       $points = 
-          ($element_points * $coef_element_point)
-        + ($count_favs     * $coef_element_fav)
+          $element_points
         + ($count_follow   * $coef_follow)
         + ($count_tag_prop * $coef_tag_prop)
       ;

src/Muzich/CoreBundle/Security/Context.php

@@ -116,6 +116,12 @@ class Context
       ),
       self::ACTION_USER_FOLLOW => array(
         self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_PLAYLIST_ADD_ELEMENT => array(
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_PLAYLIST_REMOVE_ELEMENT => array(
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
       )
     )
   );