Merge pull request #43 from CSID-DGU/develop

✏️ [Fix]: 피드 반환값 수정
CSID-DGU · Dec 3, 2024 · 8959d1b · 8959d1b
2 parents 1bd9fc2 + a35b704
commit 8959d1b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/main/java/dongguk/osori/domain/goal/controller/FeedController.java b/src/main/java/dongguk/osori/domain/goal/controller/FeedController.java
@@ -27,15 +27,16 @@ public class FeedController {
             @ApiResponse(responseCode = "401", description = "인증되지 않은 사용자")
     })
     @GetMapping
-    public ResponseEntity<List<FeedGoalDto>> getTodayFeedGoals(HttpSession session) {
+    public ResponseEntity<List<GoalDetailResponseDto>> getTodayFeedGoals(HttpSession session) {
         Long userId = (Long) session.getAttribute("userId");
         if (userId == null) {
             return ResponseEntity.status(401).build();
         }
-        List<FeedGoalDto> feedGoals = goalService.getTodayFeedGoals(userId);
+        List<GoalDetailResponseDto> feedGoals = goalService.getTodayFeedGoalsAsDetails(userId);
         return ResponseEntity.ok(feedGoals);
     }
 
+
     @Operation(summary = "단일 목표 상세 조회", description = "단일 목표와 그에 달린 모든 댓글을 조회합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "목표 상세 조회 성공"),

diff --git a/src/main/java/dongguk/osori/domain/goal/service/GoalService.java b/src/main/java/dongguk/osori/domain/goal/service/GoalService.java
@@ -132,6 +132,38 @@ public List<FeedGoalDto> getTodayFeedGoals(Long userId) {
                 .collect(Collectors.toList());
     }
 
+
+    @Transactional
+    public List<GoalDetailResponseDto> getTodayFeedGoalsAsDetails(Long userId) {
+        User loggedInUser = getLoggedInUser(userId); // 로그인된 사용자 가져오기
+        LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
+        LocalDateTime endOfDay = startOfDay.plusDays(1);
+
+        List<User> followingUsers = loggedInUser.getFollowingUsers(); // 팔로우한 사용자 목록 가져오기
+
+        // 오늘 날짜에 생성된 팔로우한 사용자의 목표 조회
+        return goalRepository.findByUserInAndCreatedAtBetween(followingUsers, startOfDay, endOfDay)
+                .stream()
+                .map(goal -> new GoalDetailResponseDto(
+                        goal.getGoalId(),
+                        goal.getContent(),
+                        goal.getUser().getNickname(),
+                        goal.getCreatedAt(),
+                        goal.isCompleted(),
+                        goal.getComments().stream()
+                                .map(comment -> new GoalCommentResponseDto(
+                                        comment.getCommentId(),
+                                        comment.getUser().getNickname(),
+                                        comment.getContent(),
+                                        comment.getCreatedAt(),
+                                        comment.getEmoji()
+                                ))
+                                .collect(Collectors.toList())
+                ))
+                .collect(Collectors.toList());
+    }
+
+
     // Goal ID를 기준으로 목표 상세 조회 (댓글 포함)
     @Transactional
     public Optional<GoalDetailResponseDto> getGoalDetailsWithComments(Long goalId) {