feat(plus): add song interaction tests

alexsnowb · Jul 6, 2024 · 928a2eb · 928a2eb
1 parent de44bc7
commit 928a2eb
Show file tree

Hide file tree

Showing 20 changed files with 264 additions and 116 deletions.
diff --git a/app/Events/SongsBatchLiked.php → app/Events/MultipleSongsLiked.php b/app/Events/SongsBatchLiked.php → app/Events/MultipleSongsLiked.php
@@ -6,7 +6,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 
-class SongsBatchLiked extends Event
+class MultipleSongsLiked extends Event
 {
     use SerializesModels;
 

diff --git a/app/Events/SongsBatchUnliked.php → app/Events/MultipleSongsUnliked.php b/app/Events/SongsBatchUnliked.php → app/Events/MultipleSongsUnliked.php
@@ -6,7 +6,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 
-class SongsBatchUnliked extends Event
+class MultipleSongsUnliked extends Event
 {
     use SerializesModels;
 

diff --git a/app/Http/Controllers/API/Interaction/BatchLikeController.php b/app/Http/Controllers/API/Interaction/BatchLikeController.php
diff --git a/app/Http/Controllers/API/LikeMultipleSongsController.php b/app/Http/Controllers/API/LikeMultipleSongsController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\API\InteractWithMultipleSongsRequest;
+use App\Models\Song;
+use App\Models\User;
+use App\Services\InteractionService;
+use Illuminate\Contracts\Auth\Authenticatable;
+
+class LikeMultipleSongsController extends Controller
+{
+    /** @param User $user */
+    public function __invoke(
+        InteractWithMultipleSongsRequest $request,
+        InteractionService $interactionService,
+        Authenticatable $user
+    ) {
+        $songs = Song::query()->findMany($request->songs);
+        $songs->each(fn (Song $song) => $this->authorize('access', $song));
+
+        return response()->json($interactionService->likeMany($songs, $user));
+    }
+}
diff --git a/app/Http/Controllers/API/MakeSongsPublicController.php b/app/Http/Controllers/API/MakeSongsPublicController.php
@@ -19,7 +19,7 @@ public function __invoke(
         SongService $songService,
         Authenticatable $user
     ) {
-        $songs = Song::find($request->songs);
+        $songs = Song::query()->find($request->songs);
         $songs->each(fn ($song) => $this->authorize('own', $song));
 
         $songService->makeSongsPublic($songs);

diff --git a/...ction/HandlePlaybackStartedController.php → ...ontrollers/API/RegisterPlayController.php b/...ction/HandlePlaybackStartedController.php → ...ontrollers/API/RegisterPlayController.php
@@ -1,24 +1,29 @@
 <?php
 
-namespace App\Http\Controllers\API\Interaction;
+namespace App\Http\Controllers\API;
 
 use App\Events\PlaybackStarted;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\API\Interaction\IncreasePlayCountRequest;
 use App\Http\Resources\InteractionResource;
+use App\Models\Song;
 use App\Models\User;
 use App\Services\InteractionService;
 use Illuminate\Contracts\Auth\Authenticatable;
 
-class HandlePlaybackStartedController extends Controller
+class RegisterPlayController extends Controller
 {
     /** @param User $user */
     public function __invoke(
         IncreasePlayCountRequest $request,
         InteractionService $interactionService,
-        Authenticatable $user
+        ?Authenticatable $user
     ) {
-        $interaction = $interactionService->increasePlayCount($request->song, $user);
+        /** @var Song $song */
+        $song = Song::query()->findOrFail($request->song);
+        $this->authorize('access', $song);
+
+        $interaction = $interactionService->increasePlayCount($song, $user);
         event(new PlaybackStarted($interaction->song, $interaction->user));
 
         return InteractionResource::make($interaction);

diff --git a/app/Http/Controllers/API/SongController.php b/app/Http/Controllers/API/SongController.php
@@ -53,7 +53,7 @@ public function show(Song $song)
     public function update(SongUpdateRequest $request)
     {
         // Don't use SongRepository::findMany() because it'd be already catered to the current user.
-        Song::find($request->songs)->each(fn (Song $song) => $this->authorize('edit', $song));
+        Song::query()->find($request->songs)->each(fn (Song $song) => $this->authorize('edit', $song));
 
         $updatedSongs = $this->songService->updateSongs($request->songs, SongUpdateData::fromRequest($request));
         $albums = $this->albumRepository->getMany($updatedSongs->pluck('album_id')->toArray());
@@ -76,7 +76,7 @@ public function update(SongUpdateRequest $request)
     public function destroy(DeleteSongsRequest $request)
     {
         // Don't use SongRepository::findMany() because it'd be already catered to the current user.
-        Song::find($request->songs)->each(fn (Song $song) => $this->authorize('delete', $song));
+        Song::query()->findMany($request->songs)->each(fn (Song $song) => $this->authorize('delete', $song));
 
         $this->songService->deleteSongs($request->songs);
 

diff --git a/.../Interaction/ToggleLikeSongController.php → ...trollers/API/ToggleLikeSongController.php b/.../Interaction/ToggleLikeSongController.php → ...trollers/API/ToggleLikeSongController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\API\Interaction;
+namespace App\Http\Controllers\API;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\API\ToggleLikeSongRequest;
 use App\Http\Resources\InteractionResource;
+use App\Models\Song;
 use App\Models\User;
 use App\Repositories\SongRepository;
 use App\Services\InteractionService;
@@ -19,9 +20,10 @@ public function __invoke(
         InteractionService $interactionService,
         ?Authenticatable $user
     ) {
-        $song = $songRepository->getOne($request->song, $user);
+        /** @var Song $song */
+        $song = Song::query()->findOrFail($request->song);
         $this->authorize('access', $song);
 
-        return InteractionResource::make($interactionService->toggleLike($request->song, $user));
+        return InteractionResource::make($interactionService->toggleLike($song, $user));
     }
 }
diff --git a/app/Http/Controllers/API/UnlikeMultipleSongsController.php b/app/Http/Controllers/API/UnlikeMultipleSongsController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\API\InteractWithMultipleSongsRequest;
+use App\Models\Song;
+use App\Models\User;
+use App\Services\InteractionService;
+use Illuminate\Contracts\Auth\Authenticatable;
+
+class UnlikeMultipleSongsController extends Controller
+{
+    /** @param User $user */
+    public function __invoke(
+        InteractWithMultipleSongsRequest $request,
+        InteractionService $interactionService,
+        Authenticatable $user
+    ) {
+        $songs = Song::query()->findMany($request->songs);
+        $songs->each(fn (Song $song) => $this->authorize('access', $song));
+
+        $interactionService->unlikeMany($songs, $user);
+
+        return response()->noContent();
+    }
+}
diff --git a/.../Requests/API/BatchInteractionRequest.php → .../API/InteractWithMultipleSongsRequest.php b/.../Requests/API/BatchInteractionRequest.php → .../API/InteractWithMultipleSongsRequest.php
@@ -8,7 +8,7 @@
 /**
  * @property array<string> $songs
  */
-class BatchInteractionRequest extends Request
+class InteractWithMultipleSongsRequest extends Request
 {
     /** @return array<mixed> */
     public function rules(): array

diff --git a/app/Http/Requests/API/Interaction/IncreasePlayCountRequest.php b/app/Http/Requests/API/Interaction/IncreasePlayCountRequest.php
@@ -3,17 +3,18 @@
 namespace App\Http\Requests\API\Interaction;
 
 use App\Http\Requests\API\Request;
+use Illuminate\Validation\Rule;
 
 /**
- * @property string $song The song's ID
+ * @property-read string $song The song's ID
  */
 class IncreasePlayCountRequest extends Request
 {
     /** @return array<mixed> */
     public function rules(): array
     {
         return [
-            'song' => 'required',
+            'song' => ['required', Rule::exists('songs', 'id')],
         ];
     }
 }
diff --git a/app/Http/Requests/API/ToggleLikeSongRequest.php b/app/Http/Requests/API/ToggleLikeSongRequest.php
@@ -5,4 +5,11 @@
 /** @property-read string $song */
 class ToggleLikeSongRequest extends Request
 {
+    /** @return array<mixed> */
+    public function rules(): array
+    {
+        return [
+            'song' => 'required|exists:songs,id',
+        ];
+    }
 }
diff --git a/app/Listeners/LoveMultipleTracksOnLastfm.php b/app/Listeners/LoveMultipleTracksOnLastfm.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners;
 
-use App\Events\SongsBatchLiked;
+use App\Events\MultipleSongsLiked;
 use App\Services\LastfmService;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
@@ -12,7 +12,7 @@ public function __construct(private LastfmService $lastfm)
     {
     }
 
-    public function handle(SongsBatchLiked $event): void
+    public function handle(MultipleSongsLiked $event): void
     {
         $this->lastfm->batchToggleLoveTracks($event->songs, $event->user, true);
     }

diff --git a/app/Listeners/UnloveMultipleTracksOnLastfm.php b/app/Listeners/UnloveMultipleTracksOnLastfm.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners;
 
-use App\Events\SongsBatchUnliked;
+use App\Events\MultipleSongsUnliked;
 use App\Services\LastfmService;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
@@ -12,7 +12,7 @@ public function __construct(private LastfmService $lastfm)
     {
     }
 
-    public function handle(SongsBatchUnliked $event): void
+    public function handle(MultipleSongsUnliked $event): void
     {
         $this->lastfm->batchToggleLoveTracks($event->songs, $event->user, false);
     }

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -4,10 +4,10 @@
 
 use App\Events\LibraryChanged;
 use App\Events\MediaScanCompleted;
+use App\Events\MultipleSongsLiked;
+use App\Events\MultipleSongsUnliked;
 use App\Events\PlaybackStarted;
 use App\Events\SongLikeToggled;
-use App\Events\SongsBatchLiked;
-use App\Events\SongsBatchUnliked;
 use App\Listeners\DeleteNonExistingRecordsPostSync;
 use App\Listeners\LoveMultipleTracksOnLastfm;
 use App\Listeners\LoveTrackOnLastfm;
@@ -26,11 +26,11 @@ class EventServiceProvider extends BaseServiceProvider
             LoveTrackOnLastfm::class,
         ],
 
-        SongsBatchLiked::class => [
+        MultipleSongsLiked::class => [
             LoveMultipleTracksOnLastfm::class,
         ],
 
-        SongsBatchUnliked::class => [
+        MultipleSongsUnliked::class => [
             UnloveMultipleTracksOnLastfm::class,
         ],