Merge pull request #221 from DevKor-github/main

[Release] main to deploy

Author: JunbeomKoreaUniv

ontime-back/src/main/java/devkor/ontime_back/entity/NotificationSchedule.java

@@ -5,6 +5,8 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 
 import java.time.LocalDateTime;
 
@@ -23,6 +25,7 @@ public class NotificationSchedule {
 
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "schedule_id")
+    @OnDelete(action = OnDeleteAction.CASCADE)
     private Schedule schedule;
 
     @Builder

ontime-back/src/main/java/devkor/ontime_back/service/ScheduleService.java

@@ -6,6 +6,7 @@
 import devkor.ontime_back.response.GeneralException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -81,26 +82,16 @@ public ScheduleDto showScheduleByScheduleId(Long userId, UUID scheduleId) {
     // schedule 삭제
     @Transactional
     public void deleteSchedule(UUID scheduleId, Long userId) {
-        Schedule schedule = getScheduleWithAuthorization(scheduleId, userId);
+        getScheduleWithAuthorization(scheduleId, userId);
         NotificationSchedule notification = notificationScheduleRepository.findByScheduleScheduleId(scheduleId)
                 .orElseThrow(() -> new GeneralException(NOTIFICATION_NOT_FOUND));
-
-        cancelAndDeleteNotification(notification);
-        notificationScheduleRepository.flush();
         scheduleRepository.deleteByScheduleId(scheduleId);
     }
 
-    private void cancelAndDeleteNotification(NotificationSchedule notification) {
-        log.info("{}에 대한 알림 취소 및 삭제 됨", notification.getSchedule().getScheduleName());
-        notification.disconnectSchedule();
-        notificationService.cancelScheduledNotification(notification.getId());
-        notificationScheduleRepository.delete(notification);
-        log.info("알림 삭제 완료");
-    }
-
     // schedule 수정
     @Transactional
     public void modifySchedule(Long userId, UUID scheduleId, ScheduleModDto scheduleModDto) {
+        User user = userRepository.findById(userId).orElseThrow(() -> new GeneralException(USER_NOT_FOUND));
         Schedule schedule = getScheduleWithAuthorization(scheduleId, userId);
 
         Place place = placeRepository.findByPlaceName(scheduleModDto.getPlaceName())
@@ -110,10 +101,9 @@ public void modifySchedule(Long userId, UUID scheduleId, ScheduleModDto schedule
 
         scheduleRepository.save(schedule);
 
-
         NotificationSchedule notification = notificationScheduleRepository.findByScheduleScheduleId(scheduleId)
                 .orElseThrow(() -> new GeneralException(NOTIFICATION_NOT_FOUND));
-        LocalDateTime newNotificationTime = scheduleModDto.getScheduleTime().minusMinutes(5);
+        LocalDateTime newNotificationTime = getNotificationTime(schedule, user);
         updateAndRescheduleNotification(newNotificationTime, notification);
     }
 
@@ -139,8 +129,10 @@ public void addSchedule(ScheduleAddDto scheduleAddDto, Long userId) {
         Schedule schedule = scheduleAddDto.toEntity(user, place);
         scheduleRepository.save(schedule);
 
+        LocalDateTime notificationTime = getNotificationTime(schedule, user);
+
         NotificationSchedule notification = NotificationSchedule.builder()
-                .notificationTime(schedule.getScheduleTime().minusMinutes(5)) // 차후 알림보내야하는 시각으로 수정 필요
+                .notificationTime(notificationTime)
                 .isSent(false)
                 .schedule(schedule)
                 .build();
@@ -149,6 +141,18 @@ public void addSchedule(ScheduleAddDto scheduleAddDto, Long userId) {
         notificationService.scheduleReminder(notification);
     }
 
+    private LocalDateTime getNotificationTime(Schedule schedule, User user) {
+        Integer preparationTime = calculatePreparationTime(schedule, user);
+        Integer moveTime = schedule.getMoveTime();
+        Integer spareTime = schedule.getScheduleSpareTime() == null ? user.getSpareTime() : schedule.getScheduleSpareTime();
+        return schedule.getScheduleTime().minusMinutes(preparationTime + moveTime + spareTime);
+    }
+
+    private Integer calculatePreparationTime(Schedule schedule, User user) {
+        List<PreparationDto> preparationDtos = getPreparations(user.getId(), schedule.getScheduleId());
+        return preparationDtos.stream().map(PreparationDto::getPreparationTime).reduce(0, Integer::sum);
+    }
+
     // 지각 히스토리 반환
     public List<LatenessHistoryResponse> getLatenessHistory(Long userId) {
         return scheduleRepository.findLatenessHistoryByUserId(userId).stream()