Merge pull request #148 from prgrms-web-devcourse-final-project/feature/EA3-112-calender

[EA3-112] fix: 날짜별 조회 날짜 계산 로직 수정 및 일정 등록 시 Id 값 반환

Author: pia01190

src/main/java/grep/neogul_coder/domain/calender/controller/PersonalCalendarController.java

@@ -20,11 +20,11 @@ public class PersonalCalendarController implements PersonalCalendarSpecification
 
     // 사용자 개인 일정 등록 API
     @PostMapping
-    public ApiResponse<Void> create(
+    public ApiResponse<Long> create(
         @PathVariable("userId") Long userId,
         @Valid @RequestBody PersonalCalendarRequest request) {
-        personalCalendarService.create(userId, request);
-        return ApiResponse.noContent();
+        Long calendarId = personalCalendarService.create(userId, request);
+        return ApiResponse.success(calendarId);  // 생성된 일정 ID 반환
     }
 
     // 사용자 개인 일정 전체 조회 API

src/main/java/grep/neogul_coder/domain/calender/controller/PersonalCalendarSpecification.java

@@ -20,7 +20,7 @@ public interface PersonalCalendarSpecification {
         summary = "개인 일정 생성",
         description = "사용자의 개인 일정을 생성합니다.\n\n예: `/api/users/{userId}/calendar`"
     )
-    ApiResponse<Void> create(
+    ApiResponse<Long> create(
         @Parameter(name = "userId", description = "사용자 ID", required = true, in = ParameterIn.PATH)
         @PathVariable("userId") Long userId,
         @RequestBody PersonalCalendarRequest request

src/main/java/grep/neogul_coder/domain/calender/controller/TeamCalendarController.java

@@ -23,13 +23,13 @@ public class TeamCalendarController implements TeamCalendarSpecification {
 
     // 팀 일정 생성
     @PostMapping
-    public ApiResponse<Void> create(
+    public ApiResponse<Long> create(
         @AuthenticationPrincipal(expression = "userId") Long userId,              // 인증된 사용자의 ID를 자동 주입받음
         @PathVariable("studyId") Long studyId,
         @Valid @RequestBody TeamCalendarRequest request
     ) {
-        teamCalendarService.create(studyId, userId, request);
-        return ApiResponse.noContent();
+        Long calendarId = teamCalendarService.create(studyId, userId, request);
+        return ApiResponse.success(calendarId);  // 생성된 일정 ID 반환
     }
 
     // 전체 일정 조회 API

src/main/java/grep/neogul_coder/domain/calender/controller/TeamCalendarSpecification.java

@@ -48,7 +48,7 @@ ApiResponse<List<TeamCalendarResponse>> findByDate(
         description = "특정 팀 ID에 새로운 일정을 생성합니다.\n\n" +
             "예: `/api/teams/{studyId}/calendar`"
     )
-    ApiResponse<Void> create(
+    ApiResponse<Long> create(
         @Parameter(hidden = true) @AuthenticationPrincipal Long userId,
         @Parameter(name = "studyId", description = "일정을 생성할 팀 ID", required = true, in = ParameterIn.PATH)
         @PathVariable("studyId") Long studyId,

src/main/java/grep/neogul_coder/domain/calender/repository/PersonalCalendarQueryRepository.java

@@ -20,14 +20,10 @@ public class PersonalCalendarQueryRepository {
 
     private final JPAQueryFactory queryFactory;
 
-    public List<PersonalCalendar> findByUserIdAndDate(Long userId, LocalDate date) {
+    public List<PersonalCalendar> findByUserIdAndDate(Long userId, LocalDateTime start, LocalDateTime end) {
         // Q타입 : 쿼리DSL 에서 사용하는 엔티티 기반 쿼리 클래스
         QPersonalCalendar pc = QPersonalCalendar.personalCalendar;
 
-        // 조회 기준 : 하루의 시작과 끝 시간
-        LocalDateTime start = date.atStartOfDay();          // 00:00:00
-        LocalDateTime end = date.atTime(LocalTime.MAX);     // 23:59:59.999
-
         // 쿼리 실행:
         // 해당 유저의 일정 중
         // 시작 시간 <= 당일 끝시간 이고
@@ -38,7 +34,7 @@ public List<PersonalCalendar> findByUserIdAndDate(Long userId, LocalDate date) {
             .where(
                 pc.userId.eq(userId),
                 pc.activated.eq(true),
-                calendar.scheduledStart.loe(end),
+                calendar.scheduledStart.lt(end),
                 calendar.scheduledEnd.goe(start)
             )
             .fetch();

src/main/java/grep/neogul_coder/domain/calender/repository/TeamCalendarQueryRepository.java

@@ -20,13 +20,10 @@ public class TeamCalendarQueryRepository {
 
     private final JPAQueryFactory queryFactory;
 
-    public List<TeamCalendar> findByStudyIdAndDate(Long studyId, LocalDate date) {
+    public List<TeamCalendar> findByStudyIdAndDate(Long studyId, LocalDateTime start, LocalDateTime end) {
         // 쿼리DSL용 Q타입: 팀 캘린더
         QTeamCalendar tc = QTeamCalendar.teamCalendar;
 
-        LocalDateTime start = date.atStartOfDay();          // 00:00:00
-        LocalDateTime end = date.atTime(LocalTime.MAX);     // 23:59:59.999...
-
         // 쿼리:
         // - 해당 studyId인 팀 일정 중
         // - 일정 시작이 하루 끝 이전
@@ -37,7 +34,7 @@ public List<TeamCalendar> findByStudyIdAndDate(Long studyId, LocalDate date) {
             .where(
                 tc.studyId.eq(studyId),
                 tc.activated.eq(true),
-                calendar.scheduledStart.loe(end),
+                calendar.scheduledStart.lt(end),
                 calendar.scheduledEnd.goe(start)
             )
             .fetch();

src/main/java/grep/neogul_coder/domain/calender/service/PersonalCalendarService.java

@@ -45,25 +45,25 @@ public List<PersonalCalendarResponse> findAll(Long userId) {
     // 특정 날짜의 일정 필터링해서 조회
     public List<PersonalCalendarResponse> findByDate(Long userId, LocalDate date) {
         User user = userService.get(userId);
-
-        LocalDateTime startOfDay = date.atStartOfDay();                 // 00:00:00
-        LocalDateTime endOfDay = date.atTime(LocalTime.MAX);            // 23:59:59.999999999
+        LocalDateTime start = date.atStartOfDay();                      // 2025-07-23 00:00
+        LocalDateTime end = date.plusDays(1).atStartOfDay();   // 2025-07-24 00:00
 
         return personalCalendarQueryRepository
-            .findByUserIdAndDate(userId, date).stream()
+            .findByUserIdAndDate(userId, start, end).stream()
             .map(pc -> PersonalCalendarResponse.from(pc, user))
             .toList();
     }
 
     // 개인 일정 생성
     @Transactional
-    public void create(Long userId, PersonalCalendarRequest request) {
+    public Long create(Long userId, PersonalCalendarRequest request) {
         // 필수 필드  입력 안할 시 유효성 예외 발생
         validateRequiredFields(request); // 메서드로 분리
 
         Calendar calendar = request.toCalendar();
         PersonalCalendar personalCalendar = new PersonalCalendar(userId, calendar);
         personalCalendarRepository.save(personalCalendar);
+        return calendar.getId();
     }
 
     // 개인 일정 수정

src/main/java/grep/neogul_coder/domain/calender/service/TeamCalendarService.java

@@ -45,11 +45,12 @@ public List<TeamCalendarResponse> findAll(Long studyId) {
     }
 
     public List<TeamCalendarResponse> findByDate(Long studyId, LocalDate date) {
-        LocalDateTime startOfDay = date.atStartOfDay();
-        LocalDateTime endOfDay = date.atTime(LocalTime.MAX); // 23:59:59.999..
+
+        LocalDateTime start = date.atStartOfDay();
+        LocalDateTime end = date.plusDays(1).atStartOfDay();
 
         return teamCalendarQueryRepository
-            .findByStudyIdAndDate(studyId, date).stream()
+            .findByStudyIdAndDate(studyId, start, end).stream()
             .map(tc -> {
                 User user = userService.get(tc.getUserId());
                 return TeamCalendarResponse.from(tc, user);
@@ -58,12 +59,14 @@ public List<TeamCalendarResponse> findByDate(Long studyId, LocalDate date) {
     }
 
     @Transactional
-    public void create(Long studyId, Long userId, TeamCalendarRequest request) {
+    public Long create(Long studyId, Long userId, TeamCalendarRequest request) {
         validateRequest(request);
 
         Calendar calendar = request.toCalendar();
         TeamCalendar teamCalendar = new TeamCalendar(studyId, userId, calendar);
         teamCalendarRepository.save(teamCalendar);
+
+        return calendar.getId();
     }
 
     @Transactional