Merge pull request #121 from Happy-HOBAK/fix/#120

[#120] 행복 트렌드의 행복 장소 BEST 3를 오늘 기준 데이터만 보여주도록 수정

src/main/java/com/hobak/happinessql/domain/record/repository/RecordRepository.java

@@ -14,11 +14,19 @@
 
 public interface RecordRepository extends JpaRepository<Record, Long> {
     Page<Record> findByUserOrderByRecordIdDesc(User user, Pageable pageRequest);
+
     Page<Record> findByRecordIdLessThanAndUserOrderByRecordIdDesc(Long recordId, User user, Pageable pageRequest);
+
     List<Record> findAllByCreatedAtBetweenAndUser(LocalDateTime startOfMonth, LocalDateTime endOfMonth, User user);
+
+    List<Record> findAllByCreatedAtBetween(LocalDateTime startOfMonth, LocalDateTime endOfMonth);
+
     List<Record> findAllByUser(User user);
+
     Long countAllByUser(User user);
+
     Long countAllByCreatedAtBetweenAndUser(LocalDateTime startDate, LocalDateTime endDate, User user);
+
     @Query("SELECT r.activity, COUNT(r) as count FROM Record r WHERE r.createdAt >= :time GROUP BY r.activity ORDER BY count DESC limit 3")
     List<Object[]> findPopularActivities(@Param("time")LocalDateTime time);
 

src/main/java/com/hobak/happinessql/domain/report/api/TrendController.java

@@ -66,9 +66,8 @@ public DataResponseDto<Object> getSummary(@RequestParam(required = false) AgeGro
 
     @Operation(summary = "행복도가 높은 장소와 활동 Top3", description = "전체 유저가 행복했던 장소 Top 3의 이름, 위치, 그 장소에서 가장 행복도가 높았던 활동을 조회합니다.")
     @GetMapping("/top-locations")
-    public DataResponseDto<List<LocationActivityRankingResponseDto>> getTop3HappiestLocations(@AuthenticationPrincipal UserDetails userDetails) {
-        User user = userFindService.findByUserDetails(userDetails);
-        List<LocationActivityRankingResponseDto> responseDto = trendLocationRankingService.getTop3HappyLocationsWithActivities(user);
+    public DataResponseDto<List<LocationActivityRankingResponseDto>> getTop3HappiestLocations() {
+        List<LocationActivityRankingResponseDto> responseDto = trendLocationRankingService.getTop3HappyLocationsWithActivities();
         return DataResponseDto.of(responseDto, "행복도가 높은 장소와 활동 Top3를 성공적으로 조회했습니다.");
     }
 }

src/main/java/com/hobak/happinessql/domain/report/application/TrendLocationRankingService.java

@@ -3,10 +3,11 @@
 import com.hobak.happinessql.domain.record.domain.Record;
 import com.hobak.happinessql.domain.record.repository.RecordRepository;
 import com.hobak.happinessql.domain.report.dto.LocationActivityRankingResponseDto;
-import com.hobak.happinessql.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
@@ -15,9 +16,10 @@ public class TrendLocationRankingService {
 
     private final RecordRepository recordRepository;
 
-    public List<LocationActivityRankingResponseDto> getTop3HappyLocationsWithActivities(User user) {
-        List<Record> records = recordRepository.findAllByUser(user);
+    public List<LocationActivityRankingResponseDto> getTop3HappyLocationsWithActivities() {
+        LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
+        LocalDateTime endOfDay = LocalDate.now().atTime(23, 59, 59);
+        List<Record> records = recordRepository.findAllByCreatedAtBetween(startOfDay, endOfDay);
         return LocationHappinessAnalyzer.getLocationActivityRankings(records, 3);
-
     }
 }