refactor: 코드 리뷰 반영(QueryDSL 적용 전)

TTaiJin · TTaiJin · commit b559217a6354 · 2025-03-29T23:41:49.000+09:00
diff --git a/src/main/java/com/example/log4u/common/dto/PageResponse.java b/src/main/java/com/example/log4u/common/dto/PageResponse.java
@@ -0,0 +1,60 @@
+package com.example.log4u.common.dto;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Slice;
+
+public record PageResponse<T>(
+	List<T> content,
+	PageInfo pageInfo
+) {
+	// 오프셋 기반 (검색용)
+	public static <T> PageResponse<T> of(Page<T> page) {
+		return new PageResponse<>(
+			page.getContent(),
+			PageInfo.of(page)
+		);
+	}
+
+	// 커서 기반 (무한 스크롤용)
+	public static <T> PageResponse<T> of(Slice<T> slice, Long nextCursor) {
+		return new PageResponse<>(
+			slice.getContent(),
+			PageInfo.of(slice, nextCursor)
+		);
+	}
+
+	public record PageInfo(
+		Integer page,
+		int size,
+		Long totalElements,
+		Integer totalPages,
+		boolean hasNext,
+		Long nextCursor
+	) {
+		// Page용 팩토리 메서드
+		public static PageInfo of(Page<?> page) {
+			return new PageInfo(
+				page.getNumber(),
+				page.getSize(),
+				page.getTotalElements(),
+				page.getTotalPages(),
+				page.hasNext(),
+				null
+			);
+		}
+
+		// Slice용 팩토리 메서드
+		public static PageInfo of(Slice<?> slice, Long nextCursor) {
+			return new PageInfo(
+				null,
+				slice.getSize(),
+				null,
+				null,
+				slice.hasNext(),
+				nextCursor
+			);
+		}
+	}
+}
diff --git a/src/main/java/com/example/log4u/domain/diary/controller/DiaryController.java b/src/main/java/com/example/log4u/domain/diary/controller/DiaryController.java
@@ -1,7 +1,5 @@
 package com.example.log4u.domain.diary.controller;
 
-import java.util.List;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -14,6 +12,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.example.log4u.common.dto.PageResponse;
 import com.example.log4u.domain.diary.dto.DiaryRequestDto;
 import com.example.log4u.domain.diary.dto.DiaryResponseDto;
 import com.example.log4u.domain.diary.service.DiaryService;
@@ -41,17 +40,14 @@ public ResponseEntity<Void> createDiary(
 	}
 
 	@GetMapping
-	public ResponseEntity<List<DiaryResponseDto>> searchDiaries(
+	public ResponseEntity<PageResponse<DiaryResponseDto>> searchDiaries(
 		@RequestParam(required = false) String keyword,
 		@RequestParam(defaultValue = "LATEST") String sort,
 		@RequestParam(defaultValue = "0") int page
 	) {
-		List<DiaryResponseDto> diaries = diaryService.searchDiaries(
-			keyword,
-			sort,
-			page
+		return ResponseEntity.ok(
+			diaryService.searchDiaries(keyword, sort, page)
 		);
-		return ResponseEntity.ok(diaries);
 	}
 
 	@GetMapping("/{diaryId}")
diff --git a/src/main/java/com/example/log4u/domain/diary/dto/DiaryRequestDto.java b/src/main/java/com/example/log4u/domain/diary/dto/DiaryRequestDto.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import com.example.log4u.domain.diary.VisibilityType;
+import com.example.log4u.domain.diary.entity.Diary;
 import com.example.log4u.domain.media.dto.MediaRequestDto;
 
 import jakarta.validation.constraints.NotBlank;
@@ -18,4 +20,16 @@ public record DiaryRequestDto(
 	String visibility,
 	List<MediaRequestDto> mediaList
 ) {
+	public static Diary toEntity(Long userId, DiaryRequestDto diaryRequestDto, String thumbnailUrl) {
+		return Diary.builder()
+			.userId(userId)
+			.title(diaryRequestDto.title)
+			.content(diaryRequestDto.content)
+			.latitude(diaryRequestDto.latitude)
+			.longitude(diaryRequestDto.longitude)
+			.weatherInfo(diaryRequestDto.weatherInfo)
+			.visibility(VisibilityType.valueOf(diaryRequestDto.visibility))
+			.thumbnailUrl(thumbnailUrl)
+			.build();
+	}
 }
diff --git a/src/main/java/com/example/log4u/domain/diary/entity/Diary.java b/src/main/java/com/example/log4u/domain/diary/entity/Diary.java
@@ -53,19 +53,6 @@ public class Diary extends BaseEntity {
 	@Builder.Default
 	private Long likeCount = 0L;
 
-	public static Diary toEntity(Long userId, DiaryRequestDto request, String thumbnailUrl) {
-		return Diary.builder()
-			.userId(userId)
-			.title(request.title())
-			.content(request.content())
-			.latitude(request.latitude())
-			.longitude(request.longitude())
-			.weatherInfo(request.weatherInfo())
-			.visibility(VisibilityType.valueOf(request.visibility()))
-			.thumbnailUrl(thumbnailUrl)
-			.build();
-	}
-
 	public void update(DiaryRequestDto request, String newThumbnailUrl) {
 		this.title = request.title();
 		this.content = request.content();
diff --git a/src/main/java/com/example/log4u/domain/diary/repository/DiaryRepository.java b/src/main/java/com/example/log4u/domain/diary/repository/DiaryRepository.java
@@ -2,7 +2,9 @@
 
 import java.util.List;
 
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -23,7 +25,7 @@ public interface DiaryRepository extends JpaRepository<Diary, Long> {
 		    CASE WHEN :sort = 'POPULAR' THEN d.likeCount 
 		    ELSE d.createdAt END DESC
 		""")
-	List<Diary> searchDiaries(
+	Page<Diary> searchDiaries(
 		@Param("keyword") String keyword,
 		@Param("visibilities") List<VisibilityType> visibilities,
 		@Param("sort") String sort,
@@ -34,10 +36,10 @@ List<Diary> searchDiaries(
 		SELECT d FROM Diary d 
 		WHERE d.userId = :userId 
 		AND d.visibility IN :visibilities 
-		AND (:cursorId IS NULL OR d.id < :cursorId) 
-		ORDER BY d.id DESC
+		AND (:cursorId IS NULL OR d.diaryId < :cursorId) 
+		ORDER BY d.diaryId DESC
 		""")
-	List<Diary> findByUserIdAndVisibilityInAndCursorId(
+	Slice<Diary> findByUserIdAndVisibilityInAndCursorId(
 		@Param("userId") Long userId,
 		@Param("visibilities") List<VisibilityType> visibilities,
 		@Param("cursorId") Long cursorId,
diff --git a/src/main/java/com/example/log4u/domain/diary/service/DiaryService.java b/src/main/java/com/example/log4u/domain/diary/service/DiaryService.java
@@ -3,10 +3,15 @@
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.example.log4u.common.dto.PageResponse;
 import com.example.log4u.domain.diary.VisibilityType;
 import com.example.log4u.domain.diary.dto.DiaryRequestDto;
 import com.example.log4u.domain.diary.dto.DiaryResponseDto;
@@ -40,33 +45,32 @@ public class DiaryService {
 	public void saveDiary(Long userId, DiaryRequestDto request) {
 		String thumbnailUrl = mediaService.extractThumbnailUrl(request.mediaList());
 		Diary diary = diaryRepository.save(
-			Diary.toEntity(userId, request, thumbnailUrl)
+			DiaryRequestDto.toEntity(userId, request, thumbnailUrl)
 		);
 		mediaService.saveMedia(diary.getDiaryId(), request.mediaList());
 	}
 
 	// 다이어리 검색
 	@Transactional(readOnly = true)
-	public List<DiaryResponseDto> searchDiaries(
+	public PageResponse<DiaryResponseDto> searchDiaries(
 		String keyword,
 		String sort,
 		int page
 	) {
-		List<Diary> diaries = diaryRepository.searchDiaries(
+		Page<Diary> diaryPage = diaryRepository.searchDiaries(
 			keyword,
 			List.of(VisibilityType.PUBLIC),
 			sort,
 			PageRequest.of(page, SEARCH_PAGE_SIZE)
 		);
 
-		return getDiaryResponsesWithMedia(diaries);
+		return PageResponse.of(mapToDtoPage(diaryPage));
 	}
 
 	// 다이어리 상세 조회
 	@Transactional(readOnly = true)
 	public DiaryResponseDto getDiary(Long userId, Long diaryId) {
-		Diary diary = diaryRepository.findById(diaryId)
-			.orElseThrow(NotFoundDiaryException::new);
+		Diary diary = findDiaryOrThrow(diaryId);
 
 		validateDiaryAccess(diary, userId);
 
@@ -76,24 +80,27 @@ public DiaryResponseDto getDiary(Long userId, Long diaryId) {
 
 	// 다이어리 목록 (프로필 페이지)
 	@Transactional(readOnly = true)
-	public List<DiaryResponseDto> getDiariesByCursor(Long userId, Long targetUserId, Long cursorId) {
+	public PageResponse<DiaryResponseDto> getDiariesByCursor(Long userId, Long targetUserId, Long cursorId) {
 		List<VisibilityType> visibilities = determineAccessibleVisibilities(userId, targetUserId);
 
-		List<Diary> diaries = diaryRepository.findByUserIdAndVisibilityInAndCursorId(
+		Slice<Diary> diaries = diaryRepository.findByUserIdAndVisibilityInAndCursorId(
 			targetUserId,
 			visibilities,
 			cursorId != null ? cursorId : Long.MAX_VALUE,
 			PageRequest.of(0, CURSOR_PAGE_SIZE)
 		);
 
-		return getDiaryResponsesWithMedia(diaries);
+		Slice<DiaryResponseDto> dtoSlice = mapToDtoSlice(diaries);
+
+		Long nextCursor = !dtoSlice.isEmpty() ? dtoSlice.getContent().getLast().diaryId() : null;
+
+		return PageResponse.of(dtoSlice, nextCursor);
 	}
 
 	// 다이어리 수정
 	@Transactional
 	public void updateDiary(Long userId, Long diaryId, DiaryRequestDto request) {
-		Diary diary = diaryRepository.findById(diaryId)
-			.orElseThrow(NotFoundDiaryException::new);
+		Diary diary = findDiaryOrThrow(diaryId);
 
 		validateDiaryOwner(diary, userId);
 
@@ -108,15 +115,31 @@ public void updateDiary(Long userId, Long diaryId, DiaryRequestDto request) {
 	// 다이어리 삭제
 	@Transactional
 	public void deleteDiary(Long userId, Long diaryId) {
-		Diary diary = diaryRepository.findById(diaryId)
-			.orElseThrow(NotFoundDiaryException::new);
+		Diary diary = findDiaryOrThrow(diaryId);
 
 		validateDiaryOwner(diary, userId);
 
 		mediaService.deleteMedia(diaryId);
 		diaryRepository.delete(diary);
 	}
 
+	private Diary findDiaryOrThrow(Long diaryId) {
+		return diaryRepository.findById(diaryId)
+			.orElseThrow(NotFoundDiaryException::new);
+	}
+
+	// Page용 매핑 메서드
+	private Page<DiaryResponseDto> mapToDtoPage(Page<Diary> page) {
+		List<DiaryResponseDto> content = getDiaryResponsesWithMedia(page.getContent());
+		return new PageImpl<>(content, page.getPageable(), page.getTotalElements());
+	}
+
+	// Slice용 매핑 메서드
+	private Slice<DiaryResponseDto> mapToDtoSlice(Slice<Diary> slice) {
+		List<DiaryResponseDto> content = getDiaryResponsesWithMedia(slice.getContent());
+		return new SliceImpl<>(content, slice.getPageable(), slice.hasNext());
+	}
+
 	// 다이어리 + 미디어 같이 반환
 	private List<DiaryResponseDto> getDiaryResponsesWithMedia(List<Diary> diaries) {
 		if (diaries.isEmpty()) {
