diff --git a/src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentForSinglePostResponse.java b/src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentForSinglePostResponse.java index 56ad5678a..16294294c 100644 --- a/src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentForSinglePostResponse.java +++ b/src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentForSinglePostResponse.java @@ -12,7 +12,7 @@ public record RootCommentDto( Long creatorId, String creatorProfileImageUrl, String creatorNickname, - String alias, + String aliasName, String aliasColor, String postDate, // 댓글 작성 시각 (~ 전 형식) String content, @@ -27,7 +27,7 @@ public record ReplyDto( Long creatorId, String creatorProfileImageUrl, String creatorNickname, - String alias, + String aliasName, String aliasColor, String postDate, // 댓글 작성 시각 (~ 전 형식) String content, diff --git a/src/main/java/konkuk/thip/comment/application/mapper/CommentQueryMapper.java b/src/main/java/konkuk/thip/comment/application/mapper/CommentQueryMapper.java index b7661feb6..a60ae3ea3 100644 --- a/src/main/java/konkuk/thip/comment/application/mapper/CommentQueryMapper.java +++ b/src/main/java/konkuk/thip/comment/application/mapper/CommentQueryMapper.java @@ -23,14 +23,15 @@ public interface CommentQueryMapper { @Mapping(target = "isLike", expression = "java(likedCommentIds.contains(root.commentId()))") @Mapping(target = "isDeleted", constant = "false") @Mapping(target = "postDate", expression = "java(DateUtil.formatBeforeTime(root.createdAt()))") - CommentForSinglePostResponse.RootCommentDto toRoot(CommentQueryDto root, - @Context Set likedCommentIds); + @Mapping(target = "aliasName", source = "root.alias") + CommentForSinglePostResponse.RootCommentDto toRoot(CommentQueryDto root, @Context Set likedCommentIds); /** * 개별 답글 매핑 */ @Mapping(target = "isLike", expression = "java(likedCommentIds.contains(child.commentId()))") @Mapping(target = "postDate", expression = "java(DateUtil.formatBeforeTime(child.createdAt()))") + @Mapping(target = "aliasName", source = "child.alias") CommentForSinglePostResponse.RootCommentDto.ReplyDto toReply(CommentQueryDto child, @Context Set likedCommentIds); /** diff --git a/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetMemberListResponse.java b/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetMemberListResponse.java index 9feef8915..1c031a928 100644 --- a/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetMemberListResponse.java +++ b/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetMemberListResponse.java @@ -14,7 +14,7 @@ public record MemberSearchResult( Long userId, String nickname, String imageUrl, - String alias, + String aliasName, int followerCount ) {} } \ No newline at end of file diff --git a/src/main/java/konkuk/thip/room/application/service/RoomGetMemberListService.java b/src/main/java/konkuk/thip/room/application/service/RoomGetMemberListService.java index f31b87275..38a35814c 100644 --- a/src/main/java/konkuk/thip/room/application/service/RoomGetMemberListService.java +++ b/src/main/java/konkuk/thip/room/application/service/RoomGetMemberListService.java @@ -51,7 +51,7 @@ public RoomGetMemberListResponse getRoomMemberList(Long roomId) { .userId(userId) .nickname(user.getNickname()) .imageUrl(user.getAlias().getImageUrl()) - .alias(user.getAlias().getValue()) + .aliasName(user.getAlias().getValue()) .followerCount(user.getFollowerCount()) .build(); }) diff --git a/src/test/java/konkuk/thip/room/adapter/in/web/RoomGetMemberListApiTest.java b/src/test/java/konkuk/thip/room/adapter/in/web/RoomGetMemberListApiTest.java index ea08d89eb..2d6df62db 100644 --- a/src/test/java/konkuk/thip/room/adapter/in/web/RoomGetMemberListApiTest.java +++ b/src/test/java/konkuk/thip/room/adapter/in/web/RoomGetMemberListApiTest.java @@ -151,17 +151,17 @@ void getRoomMemberList_success() throws Exception { .andExpect(jsonPath("$.data.userList[0].userId").value(user1.getUserId().intValue())) .andExpect(jsonPath("$.data.userList[0].nickname").exists()) .andExpect(jsonPath("$.data.userList[0].imageUrl").exists()) - .andExpect(jsonPath("$.data.userList[0].alias").exists()) + .andExpect(jsonPath("$.data.userList[0].aliasName").exists()) .andExpect(jsonPath("$.data.userList[0].followerCount").isNumber()) .andExpect(jsonPath("$.data.userList[1].userId").value(user2.getUserId().intValue())) .andExpect(jsonPath("$.data.userList[1].nickname").exists()) .andExpect(jsonPath("$.data.userList[1].imageUrl").exists()) - .andExpect(jsonPath("$.data.userList[1].alias").exists()) + .andExpect(jsonPath("$.data.userList[1].aliasName").exists()) .andExpect(jsonPath("$.data.userList[1].followerCount").isNumber()) .andExpect(jsonPath("$.data.userList[2].userId").value(user3.getUserId().intValue())) .andExpect(jsonPath("$.data.userList[2].nickname").exists()) .andExpect(jsonPath("$.data.userList[2].imageUrl").exists()) - .andExpect(jsonPath("$.data.userList[2].alias").exists()) + .andExpect(jsonPath("$.data.userList[2].aliasName").exists()) .andExpect(jsonPath("$.data.userList[2].followerCount").isNumber()); }