fix: 페이지 값, 응답 내 currentPage 1로 시작하도록 수정 및 중복 코드 제거 #32

Author: zizi0308

src/main/java/org/dfbf/soundlink/domain/emotionRecord/controller/EmotionRecordController.java

@@ -45,7 +45,7 @@ public ResponseResult getEmotionRecordsWithoutMine(
             @RequestParam(required = false) String spotifyId,
             @Parameter(description = "감정 필터(추가 가능)")
             @RequestParam(required = false) List<String> emotions,
-            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "10") int size) {
         return emotionRecordService.getEmotionRecordsExcludingUserIdByFilters(userId, emotions, spotifyId, page, size);
     }
@@ -57,7 +57,7 @@ public ResponseResult getEmotionRecordsWithoutMine(
     )
     public ResponseResult getAllEmotionRecords(
             @RequestParam("tag") String loginId,
-            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "10") int size) {
         return emotionRecordService.getEmotionRecordsByLoginId(loginId, page, size);
     }

src/main/java/org/dfbf/soundlink/domain/emotionRecord/dto/response/EmotionRecordPageResponseDTO.java

@@ -13,7 +13,7 @@ public record EmotionRecordPageResponseDTO<T>(
     public static <T> EmotionRecordPageResponseDTO<T> fromPage(Page<?> recordsPage, List<T> dtoList) {
         return new EmotionRecordPageResponseDTO<>(
                 dtoList,
-                recordsPage.getNumber(),
+                recordsPage.getNumber() + 1,  // 현재 페이지 번호를 1부터 시작하도록 변경
                 recordsPage.getTotalPages(),
                 recordsPage.getTotalElements()
         );

src/main/java/org/dfbf/soundlink/domain/emotionRecord/service/EmotionRecordService.java

@@ -73,13 +73,13 @@ public ResponseResult saveEmotionRecordWithMusic(Long userId, EmotionRecordReque
 
     @Transactional(readOnly = true)
     public ResponseResult getEmotionRecordsByLoginId(String userTag, int page, int size) {
-        Pageable pageable;
-
-        try {
-            pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(ErrorCode.INVALID_PAGE_REQUEST, "페이지 요청 값이 잘못되었습니다.");
+        ResponseResult pageValidationResult = validateAndCreatePageable(page, size);
+        if (pageValidationResult.getCode() != 200 /*SUCCESS*/) {
+            return pageValidationResult;
         }
+
+        Pageable pageable = (Pageable) pageValidationResult.getData();
+
         try {
             Page<EmotionRecord> recordsPage = emotionRecordRepository.findByLoginId(userTag, pageable);
 
@@ -97,15 +97,14 @@ public ResponseResult getEmotionRecordsByLoginId(String userTag, int page, int s
     }
 
     public ResponseResult getEmotionRecordsExcludingUserIdByFilters(Long userId, List<String> emotionList, String spotifyId, int page, int size) {
-        Pageable pageable;
         List<Emotions> emotionEnums = null;
-
-        try {
-            pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(ErrorCode.INVALID_PAGE_REQUEST, "페이지 요청 값이 잘못되었습니다.");
+        ResponseResult pageValidationResult = validateAndCreatePageable(page, size);
+        if (pageValidationResult.getCode() != 200 /*SUCCESS*/) {
+            return pageValidationResult;
         }
 
+        Pageable pageable = (Pageable) pageValidationResult.getData();
+
         if (emotionList != null && !emotionList.isEmpty()) {
             try {
                 emotionEnums = emotionList.stream()
@@ -202,4 +201,18 @@ public ResponseResult deleteEmotionRecord(Long recordId) {
             return new ResponseResult(ErrorCode.INTERNAL_SERVER_ERROR, e.getMessage());
         }
     }
+
+    // 페이지네이션 처리 및 관련 예외처리
+    private ResponseResult validateAndCreatePageable(int page, int size) {
+        if (page < 1) {
+            return new ResponseResult(ErrorCode.INVALID_PAGE_REQUEST, "페이지 번호는 1 이상이어야 합니다.");
+        }
+        try {
+            Pageable pageable = PageRequest.of(page - 1, size, Sort.by("createdAt").descending());
+            return new ResponseResult(ErrorCode.SUCCESS, pageable);
+        } catch (IllegalArgumentException e) {
+            return new ResponseResult(ErrorCode.INVALID_PAGE_REQUEST, "페이지 요청 값이 잘못되었습니다.");
+        }
+    }
+
 }