Merge pull request #83 from Team-B1ND/Refactor/#76

fix: melon chart
Team-B1ND · Jun 12, 2024 · 54a12d4 · 54a12d4
2 parents 1fad289 + 3e4b0a9
commit 54a12d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/wakeupsong/handler/WakeupSongController.java b/dodam-api/src/main/java/b1nd/dodamapi/wakeupsong/handler/WakeupSongController.java
@@ -78,7 +78,7 @@ public Response deleteMyWakeupSong(@PathVariable int id) {
  }
 
  @GetMapping("/chart")
- public ResponseData<CompletableFuture<List<ChartRes>>> getChart() {
+ public CompletableFuture<ResponseData<List<ChartRes>>> getChart() {
  return wakeupSongUseCase.getChartList();
  }
 }
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/wakeupsong/usecase/WakeupSongUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/wakeupsong/usecase/WakeupSongUseCase.java
@@ -155,8 +155,8 @@ public Response deleteMyWakeupSong(int id) {
  return Response.ok("기상송 신청 취소 성공");
  }
 
- public ResponseData<CompletableFuture<List<ChartRes>>> getChartList() {
- return ResponseData.ok("차트 조회 성공", chartClient.getList());
+ public CompletableFuture<ResponseData<List<ChartRes>>> getChartList() {
+ return chartClient.getList().thenApply(res -> ResponseData.ok("차트 조회 성공", res));
  }
 
  public ResponseData<List<YoutubeRes>> getYoutubeList(String keyword) {