Merge pull request #66 from Move-Log/develop

Merge develop to main

Author: EunbeenDev

src/main/java/com/movelog/domain/record/dto/response/RecordCalendarRes.java

@@ -0,0 +1,32 @@
+package com.movelog.domain.record.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class RecordCalendarRes {
+
+    @Schema( type = "int", example ="1", description="기록 ID")
+    private Long recordId;
+
+    @Schema( type = "String", example ="https://movelog.s3.ap-northeast-2.amazonaws.com/record/2021-08-01/1.jpg", description="기록 이미지 URL")
+    private String recordImageUrl;
+
+    @Schema( type = "String", example ="헬스", description="명사")
+    private String noun;
+
+    @Schema( type = "String", example ="했어요", description="동사")
+    private String verb;
+
+    @Schema( type = "LocalDateTime", example ="2025-08-01T00:00:00", description="기록 생성 시간")
+    private LocalDateTime createdAt;
+
+}

src/main/java/com/movelog/domain/record/presentation/RecordController.java

@@ -1,8 +1,10 @@
 package com.movelog.domain.record.presentation;
 
+import com.movelog.domain.news.dto.response.NewsCalendarRes;
 import com.movelog.domain.record.dto.request.CreateRecordReq;
 import com.movelog.domain.record.dto.request.SearchKeywordReq;
 import com.movelog.domain.record.dto.response.RecentRecordImagesRes;
+import com.movelog.domain.record.dto.response.RecordCalendarRes;
 import com.movelog.domain.record.dto.response.SearchKeywordRes;
 import com.movelog.domain.record.dto.response.TodayRecordStatus;
 import com.movelog.domain.record.service.RecordService;
@@ -16,6 +18,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.ErrorResponse;
@@ -45,7 +48,7 @@ public ResponseEntity<?> createRecord(
             @Parameter(description = "Schemas의 CreateRecordReq를 참고해주세요.", required = true) @RequestPart CreateRecordReq createRecordReq,
             @RequestPart(value = "img", required = false) MultipartFile img
     ) {
-        recordService.createRecord(userPrincipal.getId(), createRecordReq, img);
+        recordService.createRecord(userPrincipal, createRecordReq, img);
         return ResponseEntity.ok(ApiResponseUtil.success(Message.builder().message("기록이 생성되었습니다.").build()));
     }
 
@@ -61,7 +64,7 @@ public ResponseEntity<?> createRecord(
     public ResponseEntity<?> retrieveTodayRecord(
             @Parameter(description = "User의 토큰을 입력해주세요.", required = false) @AuthenticationPrincipal UserPrincipal userPrincipal
             ) {;
-        TodayRecordStatus result = recordService.retrieveTodayRecord(5L);
+        TodayRecordStatus result = recordService.retrieveTodayRecord(userPrincipal);
         return ResponseEntity.ok(ApiResponseUtil.success(result));
     }
 
@@ -101,5 +104,25 @@ public ResponseEntity<?> searchKeyword(
     }
 
 
+    @Operation(summary = "날짜별 기록 목록 조회 API", description = "특정 날짜에 생성된 기록 목록을 조회하는 API입니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "날짜별 기록 목록 조회 성공",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(type = "array", implementation = RecordCalendarRes.class))),
+            @ApiResponse(responseCode = "400", description = "날짜별 기록 목록 조회 실패",
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
+
+    })
+    @GetMapping("/calendar/{date}")
+    public ResponseEntity<?> getRecordByDate(
+            @Parameter(description = "Access Token을 입력해주세요.", required = true) @AuthenticationPrincipal UserPrincipal userPrincipal,
+            @Parameter(description = "조회할 날짜를 입력해주세요. (yyyy-MM-dd 형식)", required = true) @PathVariable String date,
+            @Parameter(description = "기록 목록의 페이지 번호를 입력해주세요. **Page는 0부터 시작됩니다!**", required = true)
+            @RequestParam(value = "page", required = false, defaultValue = "0") Integer page
+    ) {
+        Page<RecordCalendarRes> response = recordService.getRecordByDate(userPrincipal, date, page);
+        return ResponseEntity.ok(ApiResponseUtil.success(response));
+    }
+
 
 }

src/main/java/com/movelog/domain/record/repository/RecordRepository.java

@@ -3,7 +3,10 @@
 import com.movelog.domain.record.domain.Keyword;
 import com.movelog.domain.record.domain.Record;
 import com.movelog.domain.user.domain.User;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
@@ -15,4 +18,11 @@ public interface RecordRepository extends JpaRepository<Record,Long> {
     List<Record> findByKeywordInAndActionTimeBetween(List<Keyword> keywords, LocalDateTime startTime, LocalDateTime endTime);
 
     List<Record> findTop5ByKeywordOrderByActionTimeDesc(Keyword keyword);
+
+    @Query("SELECT r FROM Record r " +
+            "JOIN r.keyword k " +
+            "WHERE k.user = :user " +
+            "AND r.actionTime BETWEEN :start AND :end " +
+            "ORDER BY r.actionTime ASC")
+    Page<Record> findRecordByUserAndCreatedAtBetween(User user, LocalDateTime start, LocalDateTime end, Pageable pageable);
 }

src/main/java/com/movelog/domain/record/service/RecordService.java

@@ -1,22 +1,30 @@
 package com.movelog.domain.record.service;
 
+import com.movelog.domain.news.domain.News;
+import com.movelog.domain.news.dto.response.NewsCalendarRes;
 import com.movelog.domain.record.domain.Keyword;
 import com.movelog.domain.record.domain.Record;
 import com.movelog.domain.record.domain.VerbType;
 import com.movelog.domain.record.dto.request.CreateRecordReq;
 import com.movelog.domain.record.dto.request.SearchKeywordReq;
 import com.movelog.domain.record.dto.response.RecentRecordImagesRes;
+import com.movelog.domain.record.dto.response.RecordCalendarRes;
 import com.movelog.domain.record.dto.response.SearchKeywordRes;
 import com.movelog.domain.record.dto.response.TodayRecordStatus;
 import com.movelog.domain.record.repository.KeywordRepository;
 import com.movelog.domain.record.repository.RecordRepository;
+import com.movelog.domain.user.application.UserService;
 import com.movelog.domain.user.domain.User;
 import com.movelog.domain.user.domain.repository.UserRepository;
+import com.movelog.domain.user.exception.UserNotFoundException;
 import com.movelog.global.config.security.token.UserPrincipal;
 import com.movelog.global.util.S3Util;
 import jakarta.validation.ConstraintViolation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,14 +42,16 @@
 @Slf4j
 public class RecordService {
     private final RecordRepository recordRepository;
-    private final UserRepository userRepository;
+    private final UserService userService;
+
     private final KeywordRepository keywordRepository;
     private final S3Util s3Util;
+    private final UserRepository userRepository;
 
     @Transactional
-    public void createRecord(Long userId, CreateRecordReq createRecordReq, MultipartFile img) {
-        User user = validUserById(userId);
-        // User user = validUserById(5L);
+    public void createRecord(UserPrincipal userPrincipal, CreateRecordReq createRecordReq, MultipartFile img) {
+        User user = validUserById(userPrincipal);
+        // User user = userRepository.findById(5L).orElseThrow(UserNotFoundException::new);
         validateCreateRecordReq(createRecordReq);
 
         String recordImgUrl = s3Util.uploadToRecordFolder(img);
@@ -83,9 +93,9 @@ public void createRecord(Long userId, CreateRecordReq createRecordReq, Multipart
     }
 
 
-    public TodayRecordStatus retrieveTodayRecord(Long userId) {
+    public TodayRecordStatus retrieveTodayRecord(UserPrincipal userPrincipal) {
         // 유저 유효성 검사 및 조회
-        User user = validUserById(userId);
+        User user = validUserById(userPrincipal);
 
         // 오늘의 시작 시간과 끝 시간 계산
         LocalDate today = LocalDate.now();
@@ -120,7 +130,7 @@ public TodayRecordStatus retrieveTodayRecord(Long userId) {
     }
 
     public List<RecentRecordImagesRes> retrieveRecentRecordImages(UserPrincipal userPrincipal, Long keywordId) {
-        User user = validUserById(userPrincipal.getId());
+        User user = validUserById(userPrincipal);
         // User user = validUserById(5L);
         Keyword keyword = validKeywordById(keywordId);
         List<Record> records = recordRepository.findTop5ByKeywordOrderByActionTimeDesc(keyword);
@@ -136,7 +146,7 @@ public List<RecentRecordImagesRes> retrieveRecentRecordImages(UserPrincipal user
 
 
     public List<SearchKeywordRes> searchKeyword(UserPrincipal userPrincipal, SearchKeywordReq searchKeywordReq) {
-        User user = validUserById(userPrincipal.getId());
+        User user = validUserById(userPrincipal);
         // User user = validUserById(5L);
         String keyword = searchKeywordReq.getSearchKeyword();
         List<Keyword> keywords = keywordRepository.findAllByUserAndKeywordContaining(user, keyword);
@@ -161,8 +171,29 @@ public List<SearchKeywordRes> searchKeyword(UserPrincipal userPrincipal, SearchK
         return sortedResults;
     }
 
-    private User validUserById(Long userId) {
-        Optional<User> userOptional = userRepository.findById(userId);
+    public Page<RecordCalendarRes> getRecordByDate(UserPrincipal userPrincipal, String date, Integer page) {
+        User user = validUserById(userPrincipal);
+        // User user = userRepository.findById(5L).orElseThrow(UserNotFoundException::new);
+        LocalDateTime start = LocalDateTime.parse(date + "T00:00:00");
+        LocalDateTime end = LocalDateTime.parse(date + "T23:59:59");
+
+        Pageable pageable = PageRequest.of(0, 15); // 원하는 페이지와 크기를 지정
+        Page<Record> recordList = recordRepository.findRecordByUserAndCreatedAtBetween(user, start, end, pageable);
+
+        return recordList.map(record -> RecordCalendarRes.builder()
+                .recordId(record.getRecordId())
+                .recordImageUrl(record.getRecordImage())
+                .noun(record.getKeyword().getKeyword())
+                .verb(VerbType.getStringVerbType(record.getKeyword().getVerbType()))
+                .createdAt(record.getCreatedAt())
+                .build());
+
+    }
+
+
+    private User validUserById(UserPrincipal userPrincipal) {
+        Optional<User> userOptional = userService.findById(userPrincipal.getId());
+        if (userOptional.isEmpty()) { throw new UserNotFoundException(); }
         return userOptional.get();
     }
 
@@ -183,4 +214,6 @@ private void validateCreateRecordReq(CreateRecordReq createRecordReq) {
             throw new IllegalArgumentException("noun is required.");
         }
     }
+
+
 }