Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
import java.util.List;

public record BookRecruitingRoomsResponse(
List<RecruitingRoomDto> recruitingRoomList,
List<BookRecruitingRoomDto> recruitingRoomList,
Integer totalRoomCount,
String nextCursor,
boolean isLast
) {
public static BookRecruitingRoomsResponse of(List<RecruitingRoomDto> recruitingRoomList, Integer totalRoomCount, String nextCursor, boolean isLast) {
public static BookRecruitingRoomsResponse of(List<BookRecruitingRoomDto> 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static konkuk.thip.book.adapter.out.api.naver.NaverApiUtil.PAGE_SIZE;

public record BookSearchListResponse(
List<BookDto> searchResult, // 책 목록
List<BookSearchDto> searchResult, // 책 목록
int page, // 현재 페이지 (1부터 시작)
int size, // 한 페이지에 포함되는 데이터 수 (페이지 크기)
long totalElements, // 전체 데이터 개수
Expand All @@ -21,12 +21,12 @@ public static BookSearchListResponse of(NaverBookParseResult result, int page) {
boolean last = (page >= totalPages);
boolean first = (page == 1);

List<BookDto> bookDtos = result.naverBooks().stream()
.map(BookDto::of)
List<BookSearchDto> bookSearchDtos = result.naverBooks().stream()
.map(BookSearchDto::of)
.toList();

return new BookSearchListResponse(
bookDtos,
bookSearchDtos,
page,
PAGE_SIZE,
totalElements,
Expand All @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<BookRecruitingRoomsResponse.RecruitingRoomDto> toRecruitingRoomDtoList(List<RoomQueryDto> roomDtos);
List<BookRecruitingRoomsResponse.BookRecruitingRoomDto> toRecruitingRoomDtoList(List<RoomQueryDto> roomDtos);

@Mapping(target = "bookId", source = "book.id")
@Mapping(target = "bookTitle", source = "book.title")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import java.util.List;

public record FeedShowAllResponse(
List<FeedDto> feedList,
List<FeedShowAllDto> feedList,
String nextCursor,
boolean isLast
) {
public record FeedDto(
public record FeedShowAllDto(
Long feedId,
Long creatorId,
String creatorNickname,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@Schema(description = "특정 유저의 피드 목록 조회 응답 DTO")
public record FeedShowByUserResponse(
@Schema(description = "조회된 피드 목록")
List<FeedShowByUserResponse.FeedDto> feedList,
List<FeedShowByUserDto> feedList,

@Schema(description = "다음 페이지를 요청할 때 사용할 커서")
String nextCursor,
Expand All @@ -16,7 +16,7 @@ public record FeedShowByUserResponse(
boolean isLast
) {
@Schema(description = "피드 단일 항목 정보")
public record FeedDto(
public record FeedShowByUserDto(
Long feedId,
String postDate,
String isbn,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import java.util.List;

public record FeedShowMineResponse(
List<FeedDto> feedList,
List<FeedShowMineDto> feedList,
String nextCursor,
boolean isLast
) {
public record FeedDto(
public record FeedShowMineDto(
Long feedId,
String postDate,
String isbn,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Long> savedFeedIds,
Set<Long> likedFeedIds,
Expand All @@ -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<FeedShowMineResponse.FeedDto> toFeedShowMineResponse(List<FeedQueryDto> dtos, @Context Long userId);
List<FeedShowMineResponse.FeedShowMineDto> toFeedShowMineResponse(List<FeedQueryDto> dtos, @Context Long userId);

@Mapping(target = "isSaved", expression = "java(savedFeedIds.contains(dto.feedId()))")
@Mapping(target = "isLiked", expression = "java(likedFeedIds.contains(dto.feedId()))")
Expand All @@ -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<Long> savedFeedIds,
Set<Long> likedFeedIds,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public FeedShowAllResponse showAllFeeds(Long userId, String cursor) {
Set<Long> likedFeedIdsByUser = postLikeQueryPort.findPostIdsLikedByUser(feedIds, userId);

// 4. response 로의 매핑
List<FeedShowAllResponse.FeedDto> feedList = result.contents().stream()
List<FeedShowAllResponse.FeedShowAllDto> feedList = result.contents().stream()
.map(dto -> feedQueryMapper.toFeedShowAllResponse(dto, savedFeedIdsByUser, likedFeedIdsByUser, userId))
.toList();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public FeedShowByUserResponse showPublicFeedsOfFeedOwner(Long userId, Long feedO
Set<Long> likedFeedIdsByUser = postLikeQueryPort.findPostIdsLikedByUser(feedIds, userId);

// 4. response 로의 매핑
List<FeedShowByUserResponse.FeedDto> feedList = result.contents().stream()
List<FeedShowByUserResponse.FeedShowByUserDto> feedList = result.contents().stream()
.map(dto -> feedQueryMapper.toFeedShowByUserResponse(dto, savedFeedIdsByUser, likedFeedIdsByUser, userId))
.toList();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public FeedShowAllResponse showAllFeeds(Long userId, String cursor) {
Set<Long> likedFeedIdsByUser = postLikeQueryPort.findPostIdsLikedByUser(feedIds, userId);

// 4. response 로의 매핑
List<FeedShowAllResponse.FeedDto> feedList = result.contents().stream()
List<FeedShowAllResponse.FeedShowAllDto> feedList = result.contents().stream()
.map(dto -> feedQueryMapper.toFeedShowAllResponse(dto, savedFeedIdsByUser, likedFeedIdsByUser, userId))
.toList();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import java.util.List;

public record RoomGetDeadlinePopularResponse(
List<RoomDto> deadlineRoomList,
List<RoomDto> popularRoomList
List<RoomGetDeadlinePopularDto> deadlineRoomList,
List<RoomGetDeadlinePopularDto> popularRoomList
) {
public record RoomDto(
public record RoomGetDeadlinePopularDto(
Long roomId,
String bookImageUrl,
String roomName,
Expand All @@ -16,7 +16,7 @@ public record RoomDto(
) {
}

public static RoomGetDeadlinePopularResponse of(List<RoomDto> deadlineRoomList, List<RoomDto> popularRoomList) {
public static RoomGetDeadlinePopularResponse of(List<RoomGetDeadlinePopularDto> deadlineRoomList, List<RoomGetDeadlinePopularDto> popularRoomList) {
return new RoomGetDeadlinePopularResponse(deadlineRoomList, popularRoomList);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<RoomGetDeadlinePopularResponse.RoomDto> toDeadlinePopularRoomDtoList(List<RoomQueryDto> roomQueryDtos);
List<RoomGetDeadlinePopularResponse.RoomGetDeadlinePopularDto> toDeadlinePopularRoomDtoList(List<RoomQueryDto> roomQueryDtos);



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

@Builder
public record RoomPostSearchResponse(
List<RoomPostDto> postList,
List<RoomPostSearchDto> postList,
Long roomId,
String isbn,
boolean isOverviewEnabled,
String nextCursor,
Boolean isLast
){
@Builder
public record RoomPostDto(
public record RoomPostSearchDto(
Long postId,
String postDate,
String postType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<RoomPostSearchResponse.RoomPostDto.VoteItemDto> voteItems
List<RoomPostSearchResponse.RoomPostSearchDto.VoteItemDto> voteItems
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<RoomPostSearchResponse.RoomPostDto.VoteItemDto> voteItems =
List<RoomPostSearchResponse.RoomPostSearchDto.VoteItemDto> voteItems =
getVoteItemDtosIfApplicable(dto, voteItemQueryMap, isLocked);

return roomPostQueryMapper.toPostDto(dto, content, isLiked, isWriter, isLocked, voteItems);
Expand Down Expand Up @@ -133,7 +133,7 @@ private CursorBasedList<RoomPostQueryDto> getGroupRecordBySortParams(String sort
}

// 투표 게시물인 경우 VoteItem DTO 목록을 생성하는 메서드
private List<RoomPostSearchResponse.RoomPostDto.VoteItemDto> getVoteItemDtosIfApplicable(RoomPostQueryDto dto, Map<Long, List<VoteItemQueryDto>> voteItemMap, boolean isLocked) {
private List<RoomPostSearchResponse.RoomPostSearchDto.VoteItemDto> getVoteItemDtosIfApplicable(RoomPostQueryDto dto, Map<Long, List<VoteItemQueryDto>> voteItemMap, boolean isLocked) {
if (RECORD.getType().equals(dto.postType())) {
return List.of();
}
Expand All @@ -143,7 +143,7 @@ private List<RoomPostSearchResponse.RoomPostDto.VoteItemDto> getVoteItemDtosIfAp
}

// VoteItemQueryDto 목록을 RecordSearchResponse.PostDto.VoteItemDto 목록으로 변환하는 메서드
private List<RoomPostSearchResponse.RoomPostDto.VoteItemDto> mapToVoteItemDtos(List<VoteItemQueryDto> items, boolean isLocked) {
private List<RoomPostSearchResponse.RoomPostSearchDto.VoteItemDto> mapToVoteItemDtos(List<VoteItemQueryDto> items, boolean isLocked) {
// voteCount를 모아 리스트로 변환
List<Integer> counts = items.stream()
.map(VoteItemQueryDto::voteCount)
Expand All @@ -154,7 +154,7 @@ private List<RoomPostSearchResponse.RoomPostDto.VoteItemDto> 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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import java.util.List;

public record UserSearchResponse(
List<UserDto> userList
List<UserSearchDto> userList
) {
public record UserDto(
public record UserSearchDto(
Long userId,
String nickname,
String profileImageUrl,
Expand All @@ -15,7 +15,7 @@ public record UserDto(
) {
}

public static UserSearchResponse of(List<UserDto> userList) {
public static UserSearchResponse of(List<UserSearchDto> userList) {
return new UserSearchResponse(userList);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
public record UserSignupResponse(
Long userId,
String accessToken
) {
) {
public static UserSignupResponse of(UserSignupResult userSignupResult) {
return new UserSignupResponse(userSignupResult.userId(), userSignupResult.accessToken());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public interface UserQueryMapper {

// List<QueryDto> -> List<DTO>
List<UserSearchResponse.UserDto> toUserDtoList(List<UserQueryDto> userQueryDtos);
List<UserSearchResponse.UserSearchDto> toUserDtoList(List<UserQueryDto> userQueryDtos);

// 단건 매핑: UserQueryDto -> RecentWriter
UserFollowingRecentWritersResponse.RecentWriter toRecentWriter(UserQueryDto dto);
Expand Down