diff --git a/src/main/java/konkuk/thip/book/adapter/in/web/response/BookRecruitingRoomsResponse.java b/src/main/java/konkuk/thip/book/adapter/in/web/response/BookRecruitingRoomsResponse.java index fee2db4e5..da4076d98 100644 --- a/src/main/java/konkuk/thip/book/adapter/in/web/response/BookRecruitingRoomsResponse.java +++ b/src/main/java/konkuk/thip/book/adapter/in/web/response/BookRecruitingRoomsResponse.java @@ -3,16 +3,16 @@ import java.util.List; public record BookRecruitingRoomsResponse( - List recruitingRoomList, + List recruitingRoomList, Integer totalRoomCount, String nextCursor, boolean isLast ) { - public static BookRecruitingRoomsResponse of(List recruitingRoomList, Integer totalRoomCount, String nextCursor, boolean isLast) { + public static BookRecruitingRoomsResponse of(List recruitingRoomList, Integer totalRoomCount, String nextCursor, boolean isLast) { return new BookRecruitingRoomsResponse(recruitingRoomList, totalRoomCount, nextCursor, isLast); } - public record RecruitingRoomDto( + public record BookRecruitingRoomDto( Long roomId, String bookImageUrl, String roomName, diff --git a/src/main/java/konkuk/thip/book/adapter/in/web/response/BookSearchListResponse.java b/src/main/java/konkuk/thip/book/adapter/in/web/response/BookSearchListResponse.java index 863329f00..be5e8431a 100644 --- a/src/main/java/konkuk/thip/book/adapter/in/web/response/BookSearchListResponse.java +++ b/src/main/java/konkuk/thip/book/adapter/in/web/response/BookSearchListResponse.java @@ -7,7 +7,7 @@ import static konkuk.thip.book.adapter.out.api.naver.NaverApiUtil.PAGE_SIZE; public record BookSearchListResponse( - List searchResult, // 책 목록 + List searchResult, // 책 목록 int page, // 현재 페이지 (1부터 시작) int size, // 한 페이지에 포함되는 데이터 수 (페이지 크기) long totalElements, // 전체 데이터 개수 @@ -21,12 +21,12 @@ public static BookSearchListResponse of(NaverBookParseResult result, int page) { boolean last = (page >= totalPages); boolean first = (page == 1); - List bookDtos = result.naverBooks().stream() - .map(BookDto::of) + List bookSearchDtos = result.naverBooks().stream() + .map(BookSearchDto::of) .toList(); return new BookSearchListResponse( - bookDtos, + bookSearchDtos, page, PAGE_SIZE, totalElements, @@ -35,15 +35,15 @@ public static BookSearchListResponse of(NaverBookParseResult result, int page) { first ); } - public record BookDto( + public record BookSearchDto( String title, String imageUrl, String authorName, String publisher, String isbn ) { - public static BookDto of(NaverBookParseResult.NaverBook naverBook) { - return new BookDto( + public static BookSearchDto of(NaverBookParseResult.NaverBook naverBook) { + return new BookSearchDto( naverBook.title(), naverBook.imageUrl(), naverBook.author(), diff --git a/src/main/java/konkuk/thip/book/application/mapper/BookQueryMapper.java b/src/main/java/konkuk/thip/book/application/mapper/BookQueryMapper.java index e65264d07..2b789b5b4 100644 --- a/src/main/java/konkuk/thip/book/application/mapper/BookQueryMapper.java +++ b/src/main/java/konkuk/thip/book/application/mapper/BookQueryMapper.java @@ -22,9 +22,9 @@ public interface BookQueryMapper { target = "deadlineEndDate", expression = "java(DateUtil.formatAfterTime(dto.endDate()))" ) - BookRecruitingRoomsResponse.RecruitingRoomDto toRecruitingRoomDto(RoomQueryDto dto); + BookRecruitingRoomsResponse.BookRecruitingRoomDto toRecruitingRoomDto(RoomQueryDto dto); - List toRecruitingRoomDtoList(List roomDtos); + List toRecruitingRoomDtoList(List roomDtos); @Mapping(target = "bookId", source = "book.id") @Mapping(target = "bookTitle", source = "book.title") diff --git a/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowAllResponse.java b/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowAllResponse.java index bab0086f2..5b8eb9dbb 100644 --- a/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowAllResponse.java +++ b/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowAllResponse.java @@ -3,11 +3,11 @@ import java.util.List; public record FeedShowAllResponse( - List feedList, + List feedList, String nextCursor, boolean isLast ) { - public record FeedDto( + public record FeedShowAllDto( Long feedId, Long creatorId, String creatorNickname, diff --git a/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowByUserResponse.java b/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowByUserResponse.java index 40595295e..5fccf2202 100644 --- a/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowByUserResponse.java +++ b/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowByUserResponse.java @@ -7,7 +7,7 @@ @Schema(description = "특정 유저의 피드 목록 조회 응답 DTO") public record FeedShowByUserResponse( @Schema(description = "조회된 피드 목록") - List feedList, + List feedList, @Schema(description = "다음 페이지를 요청할 때 사용할 커서") String nextCursor, @@ -16,7 +16,7 @@ public record FeedShowByUserResponse( boolean isLast ) { @Schema(description = "피드 단일 항목 정보") - public record FeedDto( + public record FeedShowByUserDto( Long feedId, String postDate, String isbn, diff --git a/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowMineResponse.java b/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowMineResponse.java index 86c15b310..02bdfab73 100644 --- a/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowMineResponse.java +++ b/src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowMineResponse.java @@ -3,11 +3,11 @@ import java.util.List; public record FeedShowMineResponse( - List feedList, + List feedList, String nextCursor, boolean isLast ) { - public record FeedDto( + public record FeedShowMineDto( Long feedId, String postDate, String isbn, diff --git a/src/main/java/konkuk/thip/feed/application/mapper/FeedQueryMapper.java b/src/main/java/konkuk/thip/feed/application/mapper/FeedQueryMapper.java index d7a6cfea4..f65b1bdfe 100644 --- a/src/main/java/konkuk/thip/feed/application/mapper/FeedQueryMapper.java +++ b/src/main/java/konkuk/thip/feed/application/mapper/FeedQueryMapper.java @@ -32,7 +32,7 @@ public interface FeedQueryMapper { expression = "java(DateUtil.formatBeforeTime(dto.createdAt()))" ) @Mapping(target = "isWriter", source = "dto.creatorId", qualifiedByName = "isWriter") - FeedShowAllResponse.FeedDto toFeedShowAllResponse( + FeedShowAllResponse.FeedShowAllDto toFeedShowAllResponse( FeedQueryDto dto, Set savedFeedIds, Set likedFeedIds, @@ -41,9 +41,9 @@ FeedShowAllResponse.FeedDto toFeedShowAllResponse( @Mapping(target = "postDate", expression = "java(DateUtil.formatBeforeTime(dto.createdAt()))") @Mapping(target = "isWriter", source = "dto.creatorId", qualifiedByName = "isWriter") - FeedShowMineResponse.FeedDto toFeedShowMineDto(FeedQueryDto dto, @Context Long userId); + FeedShowMineResponse.FeedShowMineDto toFeedShowMineDto(FeedQueryDto dto, @Context Long userId); - List toFeedShowMineResponse(List dtos, @Context Long userId); + List toFeedShowMineResponse(List dtos, @Context Long userId); @Mapping(target = "isSaved", expression = "java(savedFeedIds.contains(dto.feedId()))") @Mapping(target = "isLiked", expression = "java(likedFeedIds.contains(dto.feedId()))") @@ -52,7 +52,7 @@ FeedShowAllResponse.FeedDto toFeedShowAllResponse( expression = "java(DateUtil.formatBeforeTime(dto.createdAt()))" ) @Mapping(target = "isWriter", source = "dto.creatorId", qualifiedByName = "isWriter") - FeedShowByUserResponse.FeedDto toFeedShowByUserResponse( + FeedShowByUserResponse.FeedShowByUserDto toFeedShowByUserResponse( FeedQueryDto dto, Set savedFeedIds, Set likedFeedIds, diff --git a/src/main/java/konkuk/thip/feed/application/service/BasicFeedShowAllService.java b/src/main/java/konkuk/thip/feed/application/service/BasicFeedShowAllService.java index cac21a159..94dbf4b14 100644 --- a/src/main/java/konkuk/thip/feed/application/service/BasicFeedShowAllService.java +++ b/src/main/java/konkuk/thip/feed/application/service/BasicFeedShowAllService.java @@ -52,7 +52,7 @@ public FeedShowAllResponse showAllFeeds(Long userId, String cursor) { Set likedFeedIdsByUser = postLikeQueryPort.findPostIdsLikedByUser(feedIds, userId); // 4. response 로의 매핑 - List feedList = result.contents().stream() + List feedList = result.contents().stream() .map(dto -> feedQueryMapper.toFeedShowAllResponse(dto, savedFeedIdsByUser, likedFeedIdsByUser, userId)) .toList(); diff --git a/src/main/java/konkuk/thip/feed/application/service/FeedShowAllOfUserService.java b/src/main/java/konkuk/thip/feed/application/service/FeedShowAllOfUserService.java index d1d8d4c6a..5bcf62023 100644 --- a/src/main/java/konkuk/thip/feed/application/service/FeedShowAllOfUserService.java +++ b/src/main/java/konkuk/thip/feed/application/service/FeedShowAllOfUserService.java @@ -59,7 +59,7 @@ public FeedShowByUserResponse showPublicFeedsOfFeedOwner(Long userId, Long feedO Set likedFeedIdsByUser = postLikeQueryPort.findPostIdsLikedByUser(feedIds, userId); // 4. response 로의 매핑 - List feedList = result.contents().stream() + List feedList = result.contents().stream() .map(dto -> feedQueryMapper.toFeedShowByUserResponse(dto, savedFeedIdsByUser, likedFeedIdsByUser, userId)) .toList(); diff --git a/src/main/java/konkuk/thip/feed/application/service/FollowingPriorityFeedShowAllService.java b/src/main/java/konkuk/thip/feed/application/service/FollowingPriorityFeedShowAllService.java index e29923644..897759b70 100644 --- a/src/main/java/konkuk/thip/feed/application/service/FollowingPriorityFeedShowAllService.java +++ b/src/main/java/konkuk/thip/feed/application/service/FollowingPriorityFeedShowAllService.java @@ -51,7 +51,7 @@ public FeedShowAllResponse showAllFeeds(Long userId, String cursor) { Set likedFeedIdsByUser = postLikeQueryPort.findPostIdsLikedByUser(feedIds, userId); // 4. response 로의 매핑 - List feedList = result.contents().stream() + List feedList = result.contents().stream() .map(dto -> feedQueryMapper.toFeedShowAllResponse(dto, savedFeedIdsByUser, likedFeedIdsByUser, userId)) .toList(); diff --git a/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetDeadlinePopularResponse.java b/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetDeadlinePopularResponse.java index 57f547b4e..21d75bd2d 100644 --- a/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetDeadlinePopularResponse.java +++ b/src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetDeadlinePopularResponse.java @@ -3,10 +3,10 @@ import java.util.List; public record RoomGetDeadlinePopularResponse( - List deadlineRoomList, - List popularRoomList + List deadlineRoomList, + List popularRoomList ) { - public record RoomDto( + public record RoomGetDeadlinePopularDto( Long roomId, String bookImageUrl, String roomName, @@ -16,7 +16,7 @@ public record RoomDto( ) { } - public static RoomGetDeadlinePopularResponse of(List deadlineRoomList, List popularRoomList) { + public static RoomGetDeadlinePopularResponse of(List deadlineRoomList, List popularRoomList) { return new RoomGetDeadlinePopularResponse(deadlineRoomList, popularRoomList); } } diff --git a/src/main/java/konkuk/thip/room/application/mapper/RoomQueryMapper.java b/src/main/java/konkuk/thip/room/application/mapper/RoomQueryMapper.java index de967a6b8..d85c3a0a6 100644 --- a/src/main/java/konkuk/thip/room/application/mapper/RoomQueryMapper.java +++ b/src/main/java/konkuk/thip/room/application/mapper/RoomQueryMapper.java @@ -28,9 +28,9 @@ public interface RoomQueryMapper { target = "deadlineDate", expression = "java(DateUtil.formatAfterTime(dto.endDate()))" ) - RoomGetDeadlinePopularResponse.RoomDto toDeadlinePopularRoomDto(RoomQueryDto dto); + RoomGetDeadlinePopularResponse.RoomGetDeadlinePopularDto toDeadlinePopularRoomDto(RoomQueryDto dto); - List toDeadlinePopularRoomDtoList(List roomQueryDtos); + List toDeadlinePopularRoomDtoList(List roomQueryDtos); diff --git a/src/main/java/konkuk/thip/roompost/adapter/in/web/response/RoomPostSearchResponse.java b/src/main/java/konkuk/thip/roompost/adapter/in/web/response/RoomPostSearchResponse.java index e73915d3c..89add3a2f 100644 --- a/src/main/java/konkuk/thip/roompost/adapter/in/web/response/RoomPostSearchResponse.java +++ b/src/main/java/konkuk/thip/roompost/adapter/in/web/response/RoomPostSearchResponse.java @@ -6,7 +6,7 @@ @Builder public record RoomPostSearchResponse( - List postList, + List postList, Long roomId, String isbn, boolean isOverviewEnabled, @@ -14,7 +14,7 @@ public record RoomPostSearchResponse( Boolean isLast ){ @Builder - public record RoomPostDto( + public record RoomPostSearchDto( Long postId, String postDate, String postType, diff --git a/src/main/java/konkuk/thip/roompost/application/mapper/RoomPostQueryMapper.java b/src/main/java/konkuk/thip/roompost/application/mapper/RoomPostQueryMapper.java index 045da8b0f..8283f3371 100644 --- a/src/main/java/konkuk/thip/roompost/application/mapper/RoomPostQueryMapper.java +++ b/src/main/java/konkuk/thip/roompost/application/mapper/RoomPostQueryMapper.java @@ -27,12 +27,12 @@ public interface RoomPostQueryMapper { @Mapping(target = "isWriter", source = "isWriter") @Mapping(target = "isLocked", source = "isLocked") @Mapping(target = "voteItems", source = "voteItems") - RoomPostSearchResponse.RoomPostDto toPostDto( + RoomPostSearchResponse.RoomPostSearchDto toPostDto( RoomPostQueryDto dto, String content, boolean isLiked, boolean isWriter, boolean isLocked, - List voteItems + List voteItems ); } \ No newline at end of file diff --git a/src/main/java/konkuk/thip/roompost/application/service/RoomPostSearchService.java b/src/main/java/konkuk/thip/roompost/application/service/RoomPostSearchService.java index 3c9960d12..8ff8e82af 100644 --- a/src/main/java/konkuk/thip/roompost/application/service/RoomPostSearchService.java +++ b/src/main/java/konkuk/thip/roompost/application/service/RoomPostSearchService.java @@ -105,7 +105,7 @@ public RoomPostSearchResponse search(RoomPostSearchQuery roomPostSearchQuery) { boolean isLiked = likedPostIds.contains(dto.postId()); String content = isLocked ? roomPostAccessValidator.createBlurredString(dto.content()) : dto.content(); - List voteItems = + List voteItems = getVoteItemDtosIfApplicable(dto, voteItemQueryMap, isLocked); return roomPostQueryMapper.toPostDto(dto, content, isLiked, isWriter, isLocked, voteItems); @@ -133,7 +133,7 @@ private CursorBasedList getGroupRecordBySortParams(String sort } // 투표 게시물인 경우 VoteItem DTO 목록을 생성하는 메서드 - private List getVoteItemDtosIfApplicable(RoomPostQueryDto dto, Map> voteItemMap, boolean isLocked) { + private List getVoteItemDtosIfApplicable(RoomPostQueryDto dto, Map> voteItemMap, boolean isLocked) { if (RECORD.getType().equals(dto.postType())) { return List.of(); } @@ -143,7 +143,7 @@ private List getVoteItemDtosIfAp } // VoteItemQueryDto 목록을 RecordSearchResponse.PostDto.VoteItemDto 목록으로 변환하는 메서드 - private List mapToVoteItemDtos(List items, boolean isLocked) { + private List mapToVoteItemDtos(List items, boolean isLocked) { // voteCount를 모아 리스트로 변환 List counts = items.stream() .map(VoteItemQueryDto::voteCount) @@ -154,7 +154,7 @@ private List mapToVoteItemDtos(L // 계산 결과를 이용해 DTO 조립 return IntStream.range(0, items.size()) - .mapToObj(i -> RoomPostSearchResponse.RoomPostDto.VoteItemDto.of( + .mapToObj(i -> RoomPostSearchResponse.RoomPostSearchDto.VoteItemDto.of( items.get(i).voteItemId(), isLocked ? roomPostAccessValidator.createBlurredString(items.get(i).itemName()) : items.get(i).itemName(), percentages.get(i), diff --git a/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSearchResponse.java b/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSearchResponse.java index f43958bf5..6caa7621f 100644 --- a/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSearchResponse.java +++ b/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSearchResponse.java @@ -3,9 +3,9 @@ import java.util.List; public record UserSearchResponse( - List userList + List userList ) { - public record UserDto( + public record UserSearchDto( Long userId, String nickname, String profileImageUrl, @@ -15,7 +15,7 @@ public record UserDto( ) { } - public static UserSearchResponse of(List userList) { + public static UserSearchResponse of(List userList) { return new UserSearchResponse(userList); } } diff --git a/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSignupResponse.java b/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSignupResponse.java index d56e4f13e..b39f7570c 100644 --- a/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSignupResponse.java +++ b/src/main/java/konkuk/thip/user/adapter/in/web/response/UserSignupResponse.java @@ -5,7 +5,7 @@ public record UserSignupResponse( Long userId, String accessToken - ) { +) { public static UserSignupResponse of(UserSignupResult userSignupResult) { return new UserSignupResponse(userSignupResult.userId(), userSignupResult.accessToken()); } diff --git a/src/main/java/konkuk/thip/user/application/mapper/UserQueryMapper.java b/src/main/java/konkuk/thip/user/application/mapper/UserQueryMapper.java index 8bc7a0d10..33883a280 100644 --- a/src/main/java/konkuk/thip/user/application/mapper/UserQueryMapper.java +++ b/src/main/java/konkuk/thip/user/application/mapper/UserQueryMapper.java @@ -11,7 +11,7 @@ public interface UserQueryMapper { // List -> List - List toUserDtoList(List userQueryDtos); + List toUserDtoList(List userQueryDtos); // 단건 매핑: UserQueryDto -> RecentWriter UserFollowingRecentWritersResponse.RecentWriter toRecentWriter(UserQueryDto dto);