[refector] 리뷰 반영 수정

Author: soheeGit

src/main/java/store/lastdance/controller/calendar/CalendarV2Controller.java

@@ -65,7 +65,9 @@ public ResponseEntity<ApiResponse<CalendarResponseDTO>> createCalendar(
     @GetMapping("/me")
     public ResponseEntity<ApiResponse<List<CalendarResponseDTO>>> getMyCalendars(
             @RequestParam(required = false, defaultValue = "MONTHLY") String viewType,
-            @RequestParam(required = false) LocalDateTime dateTime,
+            @RequestParam(required = false)
+            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+            LocalDateTime dateTime,
             @RequestParam(required = false) String type,
             @RequestParam(required = false) String category,
             @RequestParam(required = false) UUID groupId,
@@ -141,13 +143,10 @@ public ResponseEntity<ApiResponse<CalendarResponseDTO>> updateCalendar(
     @DeleteMapping("/{calendarId}")
     public ResponseEntity<ApiResponse<Void>> deleteCalendar(
             @PathVariable Long calendarId,
-            @RequestParam(required = false)
-            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-            LocalDateTime instanceDate,
             @AuthenticationPrincipal CustomOAuth2User user) {
 
         try {
-            calendarService.deleteCalendar(calendarId, instanceDate, user.getUserId());
+            calendarService.deleteCalendar(calendarId, user.getUserId());
 
             return ResponseEntity.ok(ApiResponse.success());
 
@@ -171,7 +170,9 @@ public ResponseEntity<ApiResponse<Void>> deleteCalendar(
     public ResponseEntity<ApiResponse<List<CalendarResponseDTO>>> getGroupCalendars(
             @PathVariable UUID groupId,
             @RequestParam(required = false, defaultValue = "MONTHLY") String viewType,
-            @RequestParam(required = false) LocalDateTime dateTime,
+            @RequestParam(required = false)
+            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+            LocalDateTime dateTime,
             @RequestParam(required = false) String type,
             @RequestParam(required = false) String category,
             @AuthenticationPrincipal CustomOAuth2User user,

src/main/java/store/lastdance/converter/calendar/CalendarConverter.java

@@ -55,9 +55,9 @@ public CalendarResponseDTO toDto(Calendar calendar, User user, Group group, Stri
                 .isAllDay(calendar.getIsAllDay())
                 .type(calendar.getType())
                 .category(calendar.getCategory())
-                .groupId(group != null ? group.getGroupId() : null)
+                .groupId(calendar.getGroup() != null ? calendar.getGroup().getGroupId() : null)
                 .groupName(groupName)
-                .userId(user.getUserId())
+                .userId(calendar.getUser() != null ? calendar.getUser().getUserId() : null)
                 .repeatType(calendar.getRepeatType())
                 .repeatEndDate(calendar.getRepeatEndDate())
                 .createdAt(calendar.getCreatedAt())

src/main/java/store/lastdance/service/calendar/CalendarV2Service.java

@@ -19,7 +19,7 @@ public interface CalendarV2Service {
 
     CalendarResponseDTO updateCalendar(Long calendarId, UpdateCalendarRequestDTO request, UUID userId);
 
-    void deleteCalendar(Long calendarId, LocalDateTime instanceDate, UUID userId);
+    void deleteCalendar(Long calendarId, UUID userId);
 
     boolean isGroupMember(UUID groupId, UUID userId);
 }

src/main/java/store/lastdance/service/calendar/CalendarV2ServiceImpl.java

@@ -81,15 +81,13 @@ public List<CalendarResponseDTO> getCalendarsByUser(UUID userId,
             User user = userRepository.findByUserId(userId)
                     .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 
-            Group group;
+            Group group = null;
             if (groupId != null){
                 boolean isMember = isGroupMember(groupId, userId);
                 CalendarValidator.validateGroupMembership(groupId, isMember);
 
                 group = groupRepository.findById(groupId)
                         .orElseThrow(() -> new CustomException(ErrorCode.GROUP_NOT_FOUND));
-            } else {
-                throw new CustomException(ErrorCode.GROUP_NOT_FOUND);
             }
 
             if (dateTime == null) {
@@ -142,7 +140,7 @@ public List<CalendarResponseDTO> getCalendarsByUser(UUID userId,
                     UUID groupID = calendar.getGroup() != null ? calendar.getGroup().getGroupId() : null;
                     String groupName = finalGroupNameMap.get(groupID);
 
-                    return calendarConverter.toDto(calendar, user, group, groupName);
+                    return calendarConverter.toDto(calendar, calendar.getUser(), calendar.getGroup(), groupName);
                 }).toList();
 
         } catch (Exception e) {
@@ -165,7 +163,7 @@ public CalendarResponseDTO getCalendarById(Long calendarId, UUID userId) {
         Group calendarGroup = calendar.getGroup();
         String groupName = (calendarGroup != null) ? calendarGroup.getGroupName() : null;
 
-        return calendarConverter.toDto(calendar, user, calendarGroup, groupName);
+        return calendarConverter.toDto(calendar, calendar.getUser(), calendarGroup, groupName);
     }
 
     @Override
@@ -232,7 +230,7 @@ public CalendarResponseDTO updateCalendar(Long calendarId, UpdateCalendarRequest
             Group updatedGroup = updatedCalendar.getGroup();
             String groupName = (updatedGroup != null) ? updatedGroup.getGroupName() : null;
 
-            return calendarConverter.toDto(calendar, user, updatedGroup, groupName);
+            return calendarConverter.toDto(updatedCalendar, updatedCalendar.getUser(), updatedGroup, groupName);
 
         } catch (Exception e) {
             log.warn("그룹 일정 수정 중 오류 발생: {}", e.getMessage());
@@ -242,7 +240,7 @@ public CalendarResponseDTO updateCalendar(Long calendarId, UpdateCalendarRequest
 
     @Override
     @Transactional
-    public void deleteCalendar(Long calendarId, LocalDateTime instanceDate, UUID userId) {
+    public void deleteCalendar(Long calendarId, UUID userId) {
         try {
             Calendar calendar = calendarRepository.findById(calendarId)
                     .orElseThrow(() -> new CustomException(ErrorCode.CALENDAR_NOT_FOUND));
@@ -415,10 +413,10 @@ private DateRangeDTO calculateDateRange(String viewType, LocalDateTime baseDate)
 
             case "WEEKLY" -> {
                 LocalDateTime startOfWeek = baseDate.toLocalDate()
-                        .with(DayOfWeek.MONDAY)
+                        .with(java.time.temporal.TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
                         .atStartOfDay();
                 LocalDateTime endOfWeek = baseDate.toLocalDate()
-                        .with(DayOfWeek.SUNDAY)
+                        .with(java.time.temporal.TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY))
                         .atTime(23, 59, 59);
                 yield new DateRangeDTO(startOfWeek, endOfWeek);
             }
@@ -427,15 +425,8 @@ private DateRangeDTO calculateDateRange(String viewType, LocalDateTime baseDate)
                 LocalDate monthStart = baseDate.toLocalDate().withDayOfMonth(1);
                 LocalDate monthEnd = baseDate.toLocalDate().withDayOfMonth(baseDate.toLocalDate().lengthOfMonth());
 
-                LocalDate calendarStart = monthStart.with(DayOfWeek.SUNDAY);
-                if (calendarStart.isAfter(monthStart)) {
-                    calendarStart = calendarStart.minusWeeks(1);
-                }
-
-                LocalDate calendarEnd = monthEnd.with(DayOfWeek.SATURDAY);
-                if (calendarEnd.isBefore(monthEnd)) {
-                    calendarEnd = calendarEnd.plusWeeks(1);
-                }
+                LocalDate calendarStart = monthStart.with(java.time.temporal.TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY));
+                LocalDate calendarEnd = monthEnd.with(java.time.temporal.TemporalAdjusters.nextOrSame(DayOfWeek.SATURDAY));
 
                 yield new DateRangeDTO(
                         calendarStart.atStartOfDay(),