Playlists tests: pick and unpick

src/Muzich/CoreBundle/Repository/PlaylistRepository.php

@@ -51,17 +51,20 @@ class PlaylistRepository extends EntityRepository
   }
   
   public function getUserPublicPlaylistsOrOwnedOrPickedQueryBuilder(User $viewed_user, User $current_user = null)
-  {
-    if (!$current_user)
+  {    
+    if ($current_user)
     {
-      return $this->getUserPublicPlaylistsOrOwnedQueryBuilder($viewed_user, $current_user);
+      if ($viewed_user->getId() == $current_user->getId())
+      {
+        return $this->getUserPublicPlaylistsOrOwnedQueryBuilder($viewed_user, $current_user)
+          ->leftJoin('p.user_playlists_pickeds', 'pickers')
+          ->orWhere('pickers.user = :picker_id')
+          ->setParameter('picker_id', $current_user->getId())
+        ;
+      }
     }
     
-    return $this->getUserPublicPlaylistsOrOwnedQueryBuilder($viewed_user, $current_user)
-      ->leftJoin('p.user_playlists_pickeds', 'pickers')
-      ->orWhere('pickers.user = :picker_id')
-      ->setParameter('picker_id', $current_user->getId())
-    ;
+    return $this->getUserPublicPlaylistsOrOwnedQueryBuilder($viewed_user, $current_user);
   }
   
   public function findOnePlaylistOwned($playlist_id, User $user)

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

@@ -432,4 +432,32 @@ class PlaylistControllerTest extends FunctionalTest
     $this->isResponseSuccess();
   }
   
+  public function testPickAndUnpick()
+  {
+    $this->init();
+    $this->initReadContextData();
+    $this->users['jean'] = $this->findUserByUsername('jean');
+    $this->connectUser('jean', 'toor');
+    
+    $this->checkReadPlaylists($this->users['jean'], array());
+    $this->pickPlaylist($this->playlists['bob_pub']);
+    $this->checkReadPlaylists($this->users['jean'], array($this->playlists['bob_pub']));
+    $this->unPickPlaylist($this->playlists['bob_pub']);
+    $this->checkReadPlaylists($this->users['jean'], array());
+  }
+  
+  protected function pickPlaylist($playlist)
+  {
+    $response = $this->tests_cases->playlistPick($playlist->getId());
+    $this->jsonResponseIsSuccess($response);
+  }
+  
+  protected function unPickPlaylist($playlist)
+  {
+    $this->tests_cases->playlistUnPick($playlist->getId());
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseSuccess();
+  }
+  
 }

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

@@ -420,34 +420,44 @@ class ContextTestCases
   
   public function playlistUnpickResponseIs($success, $condition)
   {
-    return $this->ajaxResponseSatisfyConditions(
-      $this->getAjaxRequestContentResponse(
-        'GET',
-        $this->test->generateUrl('playlist_unpick', array(
-          'playlist_id' => 0,
-          '_locale'     => 'fr'
-        ))
-      ), 
+    $this->playlistUnPick(0);
+    return $this->responseSatisfyConditions(
+      $this->test->getClient()->getResponse(), 
       $success, 
-      $condition
+      $condition, 
+      $this->test->getUser()
     );
   }
   
+  public function playlistUnPick($playlist_id)
+  {
+    $this->test->goToPage($this->test->generateUrl('playlist_unpick', array(
+      'playlist_id' => $playlist_id,
+      '_locale'     => 'fr'
+    )));
+  }
+  
   public function playlistPickResponseIs($success, $condition)
   {
+    $this->playlistPick(0);
     return $this->ajaxResponseSatisfyConditions(
-      $this->getAjaxRequestContentResponse(
-        'GET',
-        $this->test->generateUrl('playlist_pick', array(
-          'playlist_id' => 0,
-          '_locale'     => 'fr'
-        ))
-      ), 
+      $this->test->getClient()->getResponse()->getContent(), 
       $success, 
       $condition
     );
   }
   
+  public function playlistPick($playlist_id)
+  {
+    return $this->getAjaxRequestContentResponse(
+      'GET',
+      $this->test->generateUrl('playlist_pick', array(
+        'playlist_id' => $playlist_id,
+        '_locale'     => 'fr'
+      ))
+    );
+  }
+  
   public function playlistShowResponseIs($success, $condition)
   {
     $this->playlistShow('bux', 0);

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -114,7 +114,7 @@ class EditController extends Controller
   public function unpickAction($playlist_id)
   {
     if (($uncondition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_PLAYLIST_UNPICK)) !== false)
-      return $this->jsonResponseError($uncondition);
+      throw $this->createNotFoundException();
     
     $playlist_manager = $this->getPlaylistManager();