Merge pull request #215 from DevKor-github/main

[Merge] main to deploy

Author: JunbeomKoreaUniv

.idea/dataSources.xml

@@ -0,0 +1,19 @@
+package devkor.ontime_back.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration
+public class SchedulerConfig {
+
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(20); // 필요시 더 늘릴 수 있음
+        scheduler.setThreadNamePrefix("scheduler-");
+        scheduler.initialize();
+        return scheduler;
+    }
+}

.idea/modules/devkor.ontime-back.main.iml

@@ -15,7 +15,8 @@
 @Configuration
 @OpenAPIDefinition(
         servers = {
-                @Server(url = "https://ontime.devkor.club", description = "Production Server")
+                @Server(url = "https://ontime.devkor.club", description = "Production Server"),
+                @Server(url = "http://localhost:8080", description = "Local Serever")
         }
 )
 public class SwaggerConfig {

.idea/modules/ontime-back.main.iml

@@ -0,0 +1,52 @@
+package devkor.ontime_back.entity;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class NotificationSchedule {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private LocalDateTime notificationTime;
+
+    private Boolean isSent;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "schedule_id")
+    private Schedule schedule;
+
+    @Builder
+    public NotificationSchedule(LocalDateTime notificationTime, Boolean isSent, Schedule schedule) {
+        this.notificationTime = notificationTime;
+        this.isSent = isSent;
+        this.schedule = schedule;
+    }
+
+    public void changeStatusToSent() {
+        if(Boolean.FALSE.equals(this.isSent)) {
+            this.isSent = true;
+        }
+    }
+
+    public void updateNotificationTime(LocalDateTime localDateTime) {
+        this.notificationTime = localDateTime;
+    }
+
+    public void markAsUnsent() {
+        this.isSent = false;
+    }
+
+    public void disconnectSchedule() {
+        this.schedule = null;
+    }
+}

.idea/sqlDataSources.xml

@@ -0,0 +1,22 @@
+package devkor.ontime_back.repository;
+
+import devkor.ontime_back.entity.NotificationSchedule;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Repository
+public interface NotificationScheduleRepository extends JpaRepository<NotificationSchedule, Long> {
+    @Query("SELECT n FROM NotificationSchedule n " +
+            "JOIN FETCH n.schedule s " +
+            "JOIN FETCH s.user " +
+            "WHERE n.notificationTime > :now AND n.isSent = false")
+    List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);
+
+    Optional<NotificationSchedule> findByScheduleScheduleId(UUID scheduleId);
+}

ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

@@ -28,10 +28,10 @@ public enum ErrorCode {
     SCHEDULE_NOT_FOUND("1010", "해당 약속이 존재하지 않습니다.", HttpStatus.BAD_REQUEST),
     FIREBASE("1011", "FIREBASE로 메세지를 발송하였으나 오류가 발생했습니다.(유효하지 않은 토큰 등)", HttpStatus.BAD_REQUEST),
     FIRST_PREPARATION_NOT_FOUND("1012", "해당 ID의 사용자의 준비과정을 찾을 수 없습니다.", HttpStatus.BAD_REQUEST),
-
+    NOTIFICATION_NOT_FOUND("1013", "알림을 찾을 수 없습니다.", HttpStatus.BAD_REQUEST ),
 
     // 공통 오류 메시지
-    UNEXPECTED_ERROR("1000", "Unexpected Error: An unexpected error occurred.", HttpStatus.INTERNAL_SERVER_ERROR);
+    UNEXPECTED_ERROR("1000", "Unexpected Error: An unexpected error occurred.", HttpStatus.INTERNAL_SERVER_ERROR),;
 
     private final String code;
     private final String message;

ontime-back/src/main/java/devkor/ontime_back/config/SwaggerConfig.java

@@ -48,24 +48,5 @@ public void sendMorningReminder() {
         List<Schedule> schedulesForToday = scheduleRepository.findSchedulesBetween(startOfToday, endOfToday);
         notificationService.sendReminder(schedulesForToday, "오늘 예정된 약속이 있습니다.");
     }
-
-    @Scheduled(cron = "0 * * * * *")  // 매 분의 0초에 실행
-    public void sendFiveMinutesBeforeReminder() {
-        LocalDateTime baseTime = LocalDateTime.now().plusMinutes(5); // 현재 시간
-        LocalDateTime startTime = baseTime.withSecond(0).withNano(0); // 초와 나노초 제거 (분 단위로 설정)
-        LocalDateTime endTime = startTime.plusMinutes(1).minusNanos(1); // 다음 분의 직전까지
-
-        System.out.println("5분 후 시간: " + baseTime);
-
-        // 5분 후의 scheduleTime과 일치하는 약속 조회
-        List<Schedule> schedulesStartingSoon = scheduleRepository.findSchedulesBetween(startTime, endTime);
-
-        for(Schedule schedule : schedulesStartingSoon) {
-            System.out.println("5분 뒤의 약속: " + schedule.getScheduleName());
-        }
-
-        // 알림 전송
-        notificationService.sendReminder(schedulesStartingSoon, "약속 5분 전입니다. 준비하세요.");
-    }
 }