refactor: 스케줄러에서 레포를 통해 북토크들 조회하는 로직 리팩토링

SOPT-SOPHY · Aug 2, 2023 · 4433a9c · 4433a9c
1 parent d9bc043
commit 4433a9c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/org/sophy/sophy/controller/AuthController.java b/src/main/java/org/sophy/sophy/controller/AuthController.java
@@ -5,6 +5,8 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.security.SecurityRequirements;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.sophy.sophy.common.dto.ApiResponseDto;
 import org.sophy.sophy.controller.dto.request.DuplCheckDto;
@@ -19,10 +21,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/auth")
@@ -86,8 +90,10 @@ public ApiResponseDto<String> duplCheck(@RequestBody DuplCheckDto email) {
 
     @PostMapping("/email-confirm")
     @Operation(summary = "이메일 인증")
-    public ApiResponseDto<String> emailConfirm(@Parameter(example = "[email protected]") @RequestParam String email) throws Exception {
-        return ApiResponseDto.success(SuccessStatus.CREATE_AUTHCODE_SUCCESS, emailService.sendEmail(email));
+    public ApiResponseDto<String> emailConfirm(
+        @Parameter(example = "[email protected]") @RequestParam String email) throws Exception {
+        return ApiResponseDto.success(SuccessStatus.CREATE_AUTHCODE_SUCCESS,
+            emailService.sendEmail(email));
     }
 
     @PostMapping("/withdrawal")

diff --git a/src/main/java/org/sophy/sophy/infrastructure/BooktalkRepository.java b/src/main/java/org/sophy/sophy/infrastructure/BooktalkRepository.java
@@ -18,7 +18,7 @@ public interface BooktalkRepository extends JpaRepository<Booktalk, Long> {
 
     Integer countAllByCityAndCreateAtBetween(City city, LocalDateTime before, LocalDateTime now);
 
-    List<Booktalk> findAllByBooktalkStatus(BooktalkStatus booktalkStatus);
+    List<Booktalk> findAllByBooktalkStatusOrBooktalkStatus(BooktalkStatus recruting, BooktalkStatus recrutingClosed);
 
     default Booktalk getBooktalkById(Long booktalkId) {
         return this.findById(booktalkId)

diff --git a/src/main/java/org/sophy/sophy/service/SchedulerService.java b/src/main/java/org/sophy/sophy/service/SchedulerService.java
@@ -22,18 +22,12 @@ public class SchedulerService {
     @Scheduled(fixedDelay = 60000)
     @Transactional
     public void updateBooktalkStatus() { //1분마다 북토크 상태 측정
-        List<Booktalk> recrutingBooktalks = booktalkRepository.findAllByBooktalkStatus(
-            BooktalkStatus.RECRUITING);
-        List<Booktalk> closedBooktalks = booktalkRepository.findAllByBooktalkStatus(
-            BooktalkStatus.RECRUITING_CLOSED);
+        List<Booktalk> recrutingBooktalks = booktalkRepository.findAllByBooktalkStatusOrBooktalkStatus(
+            BooktalkStatus.RECRUITING, BooktalkStatus.RECRUITING_CLOSED);
 
         recrutingBooktalks.forEach(booktalk -> {
             booktalkToCompletedBooktalk(booktalk);
         });
-
-        closedBooktalks.forEach(booktalk -> {
-            booktalkToCompletedBooktalk(booktalk);
-        });
     }
 
     private void booktalkToCompletedBooktalk(