Récupération des playlists picked

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

@@ -58,6 +58,7 @@ class LoadUsersElementsFavoritesData  extends AbstractFixture implements Ordered
     // favoris de bux
     $bux = $this->entity_manager->merge($this->getReference('user_bux'));
     $paul = $this->entity_manager->merge($this->getReference('user_paul'));
+    $bob = $this->entity_manager->merge($this->getReference('user_bob'));
     
     $youtube_heretik_1 = $this->getReference('element_youtube_heretik_1');
     $youtube_djfab_1 = $this->getReference('element_youtube_djfab_1');
@@ -114,8 +115,17 @@ class LoadUsersElementsFavoritesData  extends AbstractFixture implements Ordered
     $playlist2 = $this->createPlaylist("Ma playlist perso",
     $bux, false, array($youtube_heretik_1, $youtube_djfab_1));
     
+    $playlist_bob = $this->createPlaylist("A travers l'espace",
+    $bob, true, array(
+      $this->getReference('element_infected_psycho'),
+      $this->getReference('element_infected_muse'),
+      $this->getReference('element_joelle_1'),
+      $this->getReference('element_joelle_2')
+    ));
+    
     $playlist_manager = new PlaylistManager($this->entity_manager);
     $playlist_manager->addPickedPlaylistToUser($paul, $playlist1);
+    $playlist_manager->addPickedPlaylistToUser($bux, $playlist_bob);
     
     $this->entity_manager->flush();
   }

src/Muzich/CoreBundle/Entity/Playlist.php

@@ -57,7 +57,7 @@ class Playlist
   protected $public = false;
   
   /**
-   * @ORM\OneToMany(targetEntity="UserPlaylistPicked", mappedBy="user")
+   * @ORM\OneToMany(targetEntity="UserPlaylistPicked", mappedBy="playlist")
    */
   protected $user_playlists_pickeds;
   

src/Muzich/CoreBundle/Entity/UserPlaylistPicked.php

@@ -26,7 +26,7 @@ class UserPlaylistPicked
   
   /**
    * @ORM\ManyToOne(targetEntity="Playlist", inversedBy="users_favorites")
-   * @ORM\JoinColumn(name="tag_id", referencedColumnName="id", onDelete="CASCADE")
+   * @ORM\JoinColumn(name="playlist_id", referencedColumnName="id", onDelete="CASCADE")
    */
   protected $playlist;
   

src/Muzich/CoreBundle/Managers/PlaylistManager.php

@@ -29,6 +29,14 @@ class PlaylistManager
     ;
   }
   
+  public function getUserPublicsOrOwnedOrPickedPlaylists(User $user_viewed, User $user = null)
+  {
+    return $this->entity_manager->getRepository('MuzichCoreBundle:Playlist')
+      ->getUserPublicPlaylistsOrOwnedOrPickedQueryBuilder($user_viewed, $user)
+      ->getQuery()->getResult()
+    ;
+  }
+  
   public function getOwnedsPlaylists(User $user)
   {
     return $this->getUserPublicsOrOwnedPlaylists($user, $user);

src/Muzich/CoreBundle/Repository/PlaylistRepository.php

@@ -45,11 +45,25 @@ class PlaylistRepository extends EntityRepository
     }
     
     return $this->getPlaylistsQueryBuilder()
-      ->where('p.owner = :owner_id')
+      ->where('p.owner = :owner_id OR pickers.user = :picker_id')
       ->setParameter('owner_id', $current_user->getId())
     ;
   }
   
+  public function getUserPublicPlaylistsOrOwnedOrPickedQueryBuilder(User $viewed_user, User $current_user = null)
+  {
+    if (!$current_user)
+    {
+      return $this->getUserPublicPlaylistsOrOwnedQueryBuilder($viewed_user, $current_user);
+    }
+    
+    return $this->getUserPublicPlaylistsOrOwnedQueryBuilder($viewed_user, $current_user)
+      ->leftJoin('p.user_playlists_pickeds', 'pickers')
+      ->orWhere('pickers.user = :picker_id')
+      ->setParameter('picker_id', $current_user->getId())
+    ;
+  }
+  
   public function findOnePlaylistOwned($playlist_id, User $user)
   {
     return $this->getPlaylistsQueryBuilder()

src/Muzich/PlaylistBundle/Controller/ShowController.php

@@ -18,13 +18,13 @@ class ShowController extends Controller
     
     return $this->render('MuzichPlaylistBundle:Show:user.html.twig', array(
       'viewed_user' => $viewed_user,
-      'playlists'   => $this->getPlaylistManager()->getUserPublicsOrOwnedPlaylists($viewed_user, $this->getUser(true))
+      'playlists'   => $this->getPlaylistManager()->getUserPublicsOrOwnedorPickedPlaylists($viewed_user, $this->getUserOrNullIfVisitor())
     ));
   }
   
   public function showAction($user_slug, $playlist_id)
   {
-    if (!($playlist = $this->getPlaylistManager()->findOneAccessiblePlaylistWithId($playlist_id, $this->getUser(true))))
+    if (!($playlist = $this->getPlaylistManager()->findOneAccessiblePlaylistWithId($playlist_id, $this->getUserOrNullIfVisitor())))
       throw $this->createNotFoundException();
     
     return $this->render('MuzichPlaylistBundle:Show:show.html.twig', array(
@@ -36,7 +36,7 @@ class ShowController extends Controller
   {
     $playlist_manager = $this->getPlaylistManager();
     
-    if (!($playlist = $playlist_manager->findOneAccessiblePlaylistWithId($playlist_id, $this->getUser(true))))
+    if (!($playlist = $playlist_manager->findOneAccessiblePlaylistWithId($playlist_id, $this->getUserOrNullIfVisitor())))
       throw $this->createNotFoundException();
     
     $autoplaym = new AutoplayManager($playlist_manager->getPlaylistElements($playlist, $offset), $this->container);