From 0462a87f6341f9ed1046812a501598127518b506 Mon Sep 17 00:00:00 2001 From: youth Date: Fri, 30 Aug 2024 18:20:49 +0900 Subject: [PATCH] =?UTF-8?q?Revert:=20"test:=20=EC=9E=84=EC=9D=98=EC=9D=98?= =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=93=B1=EB=A1=9D=20API"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 41939431180fc350e4e630d99cc49a4e5d59293c. --- .../api/event/controller/EventController.java | 10 ---------- .../api/event/controller/TestService.java | 17 ----------------- .../csquiz/api/event/dto/TimeRequest.java | 8 -------- .../common/schedule/SchedulerService.java | 6 +----- .../org/cotato/csquiz/common/sse/SseSender.java | 15 --------------- 5 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 src/main/java/org/cotato/csquiz/api/event/controller/TestService.java delete mode 100644 src/main/java/org/cotato/csquiz/api/event/dto/TimeRequest.java diff --git a/src/main/java/org/cotato/csquiz/api/event/controller/EventController.java b/src/main/java/org/cotato/csquiz/api/event/controller/EventController.java index 37966157..4a7db551 100644 --- a/src/main/java/org/cotato/csquiz/api/event/controller/EventController.java +++ b/src/main/java/org/cotato/csquiz/api/event/controller/EventController.java @@ -3,14 +3,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.cotato.csquiz.api.event.dto.TimeRequest; import org.cotato.csquiz.common.sse.SseService; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; @@ -22,17 +19,10 @@ public class EventController { private final SseService sseService; - private final TestService testService; @Operation(summary = "최초 로그인 시 출결 알림 구독 API") @GetMapping(value = "/attendances", produces = MediaType.TEXT_EVENT_STREAM_VALUE) public ResponseEntity subscribeAttendance(@AuthenticationPrincipal Long memberId) { return ResponseEntity.ok().body(sseService.subscribeAttendance(memberId)); } - - @PostMapping("/test") - public ResponseEntity enrollTime(@RequestBody TimeRequest request) { - testService.enrollTestSchedule(request.testTime()); - return ResponseEntity.ok().build(); - } } diff --git a/src/main/java/org/cotato/csquiz/api/event/controller/TestService.java b/src/main/java/org/cotato/csquiz/api/event/controller/TestService.java deleted file mode 100644 index 89cdbe25..00000000 --- a/src/main/java/org/cotato/csquiz/api/event/controller/TestService.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.cotato.csquiz.api.event.controller; - -import java.time.LocalDateTime; -import lombok.RequiredArgsConstructor; -import org.cotato.csquiz.common.schedule.SchedulerService; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class TestService { - - private final SchedulerService schedulerService; - - public void enrollTestSchedule(LocalDateTime testTime) { - schedulerService.scheduleNotification(testTime); - } -} diff --git a/src/main/java/org/cotato/csquiz/api/event/dto/TimeRequest.java b/src/main/java/org/cotato/csquiz/api/event/dto/TimeRequest.java deleted file mode 100644 index b544f009..00000000 --- a/src/main/java/org/cotato/csquiz/api/event/dto/TimeRequest.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.cotato.csquiz.api.event.dto; - -import java.time.LocalDateTime; - -public record TimeRequest( - LocalDateTime testTime -) { -} diff --git a/src/main/java/org/cotato/csquiz/common/schedule/SchedulerService.java b/src/main/java/org/cotato/csquiz/common/schedule/SchedulerService.java index d3851cee..e16d978e 100644 --- a/src/main/java/org/cotato/csquiz/common/schedule/SchedulerService.java +++ b/src/main/java/org/cotato/csquiz/common/schedule/SchedulerService.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.util.Date; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -62,9 +63,4 @@ public void scheduleSessionNotification(LocalDate sessionDate) { taskScheduler.schedule(() -> sseSender.sendNotification(notificationTime), zonedDateTime.toInstant()); } - - public void scheduleNotification(LocalDateTime testTime) { - ZonedDateTime zonedDateTime = testTime.atZone(ZoneId.of("Asia/Seoul")); - taskScheduler.schedule(sseSender::sendTestNotification, zonedDateTime.toInstant()); - } } diff --git a/src/main/java/org/cotato/csquiz/common/sse/SseSender.java b/src/main/java/org/cotato/csquiz/common/sse/SseSender.java index 3f1f72e4..b98fe1a3 100644 --- a/src/main/java/org/cotato/csquiz/common/sse/SseSender.java +++ b/src/main/java/org/cotato/csquiz/common/sse/SseSender.java @@ -67,21 +67,6 @@ public void sendNotification(LocalDateTime notificationDate) { } } - public void sendTestNotification() { - Set data = SseEmitter.event() - .name(ATTENDANCE_STATUS) - .data(AttendanceStatusInfo.builder() - .attendanceId(1L) - .openStatus(AttendanceOpenStatus.OPEN) - .build()) - .build(); - - List all = sseAttendanceRepository.findAll(); - for (SseEmitter sseEmitter : all) { - send(sseEmitter, data); - } - } - private void send(SseEmitter sseEmitter, Set data) { try { sseEmitter.send(data);