Merge pull request #24 from prgrms-web-devcourse-final-project/feat/block/4

[Fix] "@Nickname" 형식의 데이터 추가해서 응답하는 코드 추가

Author: moon-kun-woong

src/main/java/org/dfbf/soundlink/domain/blocklist/controller/BlockListController.java

@@ -24,7 +24,7 @@ public ResponseResult blockUser(
             @AuthenticationPrincipal Long userId,
             @RequestBody String tag
     ) {
-        return blockListService.blockUser(1L, tag);
+        return blockListService.blockUser(userId, tag);
     }
 
     @DeleteMapping
@@ -36,7 +36,7 @@ public ResponseResult unblockUser(
             @AuthenticationPrincipal Long userId,
             @RequestBody Long blocklistId
     ) {
-        return blockListService.unblockUser(1L, blocklistId);
+        return blockListService.unblockUser(userId, blocklistId);
     }
 
     @GetMapping("/mypage/blackListSearch")
@@ -45,6 +45,6 @@ public ResponseResult unblockUser(
             description = "해당 유저의 차단 목록을 가져옵니다."
     )
     public ResponseResult getBlockList(@AuthenticationPrincipal Long userId) {
-        return blockListService.getBlockListByUserId(1L);
+        return blockListService.getBlockListByUserId(userId);
     }
 }

src/main/java/org/dfbf/soundlink/domain/blocklist/dto/BlockRes.java

@@ -5,6 +5,7 @@
 public record BlockRes(
         Long userId,
         Long blockedUserId,
+        String nickname,
         Timestamp createdAt,
         Timestamp updatedAt
 ) {

src/main/java/org/dfbf/soundlink/domain/blocklist/service/BlockListService.java

@@ -98,6 +98,7 @@ public ResponseResult getBlockListByUserId(Long userId) {
                         .map(block -> new BlockRes(
                                 block.getUser().getUserId(),
                                 block.getBlockedUser().getUserId(),
+                                "@" + block.getBlockedUser().getNickname(),
                                 block.getCreatedAt(),
                                 block.getUpdatedAt()
                         )).collect(Collectors.toList())