merge: 스포티파이 유사곡 검색 오류 수정

Fix/#94 스포티파이 유사곡 검색 오류
Central-MakeUs · Aug 18, 2024 · f8afb52 · f8afb52
2 parents 960b1a9 + a59b8bb
commit f8afb52
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/play/pluv/music/application/MusicService.java b/src/main/java/play/pluv/music/application/MusicService.java
@@ -20,9 +20,8 @@ public class MusicService {
   private final MusicExplorerComposite musicExplorerComposite;
   private final MusicTransferContextManager musicTransferContextManager;
 
-  //TODO : 추후 필요없는 파라미터 삭제
   public List<MusicSearchResponse> searchMusics(
-      final Long memberId, final MusicStreaming musicStreaming, final MusicSearchRequest request
+      final MusicStreaming musicStreaming, final MusicSearchRequest request
   ) {
     final String accessToken = request.destinationAccessToken();
     final List<PlayListMusic> playListMusics = request.toPlayListMusics();

diff --git a/src/main/java/play/pluv/music/controller/MusicController.java b/src/main/java/play/pluv/music/controller/MusicController.java
@@ -27,28 +27,28 @@ public class MusicController {
 
   @PostMapping("/spotify/search")
   public BaseResponse<List<MusicSearchResponse>> searchSpotifyMusics(
-      final JwtMemberId jwtMemberId, @Valid @RequestBody final MusicSearchRequest musicSearchRequest
+      @Valid @RequestBody final MusicSearchRequest musicSearchRequest
   ) {
     final var responses = musicService
-        .searchMusics(jwtMemberId.memberId(), SPOTIFY, musicSearchRequest);
+        .searchMusics(SPOTIFY, musicSearchRequest);
     return BaseResponse.ok(responses);
   }
 
   @PostMapping("/youtube/search")
   public BaseResponse<List<MusicSearchResponse>> searchYoutubeMusics(
-      final JwtMemberId jwtMemberId, @Valid @RequestBody final MusicSearchRequest musicSearchRequest
+      @Valid @RequestBody final MusicSearchRequest musicSearchRequest
   ) {
     final var responses = musicService
-        .searchMusics(jwtMemberId.memberId(), YOUTUBE, musicSearchRequest);
+        .searchMusics(YOUTUBE, musicSearchRequest);
     return BaseResponse.ok(responses);
   }
 
   @PostMapping("/apple/search")
   public BaseResponse<List<MusicSearchResponse>> searchAppleMusics(
-      final JwtMemberId jwtMemberId, @Valid @RequestBody final MusicSearchRequest musicSearchRequest
+      @Valid @RequestBody final MusicSearchRequest musicSearchRequest
   ) {
     final var responses = musicService
-        .searchMusics(jwtMemberId.memberId(), APPLE, musicSearchRequest);
+        .searchMusics(APPLE, musicSearchRequest);
     return BaseResponse.ok(responses);
   }
 

diff --git a/src/main/java/play/pluv/oauth/spotify/SpotifyApiClient.java b/src/main/java/play/pluv/oauth/spotify/SpotifyApiClient.java
@@ -47,7 +47,7 @@ SpotifyAccessTokenResponse getAccessToken(
       @RequestParam final MultiValueMap<String, String> params
   );
 
-  @GetExchange(url = "https://api.spotify.com/v1/search")
+  @GetExchange(url = "https://api.spotify.com/v1/search?limit=5")
   SpotifySearchMusicResponse searchMusic(
       @RequestHeader("Authorization") final String accessToken,
       @RequestParam final MultiValueMap<String, String> params

diff --git a/src/test/java/play/pluv/api/MusicApiTest.java b/src/test/java/play/pluv/api/MusicApiTest.java
@@ -86,7 +86,7 @@ public class MusicApiTest extends ApiTest {
 
     final String requestBody = objectMapper.writeValueAsString(검색_요청);
 
-    when(musicService.searchMusics(any(), any(), any())).thenReturn(검색_결과);
+    when(musicService.searchMusics(any(), any())).thenReturn(검색_결과);
     setAccessToken(token, memberId);
 
     mockMvc.perform(post("/music/spotify/search")
@@ -107,7 +107,7 @@ public class MusicApiTest extends ApiTest {
     final String requestBody = objectMapper.writeValueAsString(검색_요청);
 
     setAccessToken(token, memberId);
-    when(musicService.searchMusics(any(), any(), any())).thenReturn(검색_결과);
+    when(musicService.searchMusics(any(), any())).thenReturn(검색_결과);
 
     mockMvc.perform(post("/music/youtube/search")
             .contentType(APPLICATION_JSON_VALUE)
@@ -126,7 +126,7 @@ public class MusicApiTest extends ApiTest {
 
     final String requestBody = objectMapper.writeValueAsString(검색_요청);
 
-    when(musicService.searchMusics(any(), any(), any())).thenReturn(검색_결과);
+    when(musicService.searchMusics(any(), any())).thenReturn(검색_결과);
     setAccessToken(token, memberId);
 
     mockMvc.perform(post("/music/apple/search")

diff --git a/src/test/java/play/pluv/music/application/MusicServiceTest.java b/src/test/java/play/pluv/music/application/MusicServiceTest.java
@@ -27,7 +27,7 @@ class MusicServiceTest extends ApplicationTest {
         List.of(new MusicQuery("좋은 날", "아이유", "KRA381001057", "imageUrl"))
     );
 
-    final List<MusicSearchResponse> actual = musicService.searchMusics(3L, SPOTIFY, request);
+    final List<MusicSearchResponse> actual = musicService.searchMusics(SPOTIFY, request);
     final List<MusicSearchResponse> expected = List.of(
         new MusicSearchResponse(true, true,
             new SourceMusicResponse("좋은 날", "아이유", "imageUrl"),