update : 기존 운영/발행예정 QSet 쿼리 조회 변경

mash-up-kr · Aug 9, 2024 · fb568a1 · fb568a1
1 parent 2835d1c
commit fb568a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/entity/src/main/kotlin/com/mashup/dojo/QuestionSetRepository.kt b/entity/src/main/kotlin/com/mashup/dojo/QuestionSetRepository.kt
@@ -14,10 +14,16 @@ import java.time.LocalDateTime
 
 interface QuestionSetRepository : JpaRepository<QuestionSetEntity, String> {
     // publishedYn : True && publishedAt > now -> 현재 운영중인 QuestionSet
-    fun findFirstByPublishedYnTrueAndPublishedAtAfterOrderByPublishedAt(compareTime: LocalDateTime = LocalDateTime.now()): QuestionSetEntity?
+    fun findByPublishedAtAfterAndEndAtBefore(
+        publishedCompareTime: LocalDateTime = LocalDateTime.now(),
+        endTimeCompareTime: LocalDateTime = LocalDateTime.now(),
+    ): QuestionSetEntity?
 
     // publishedYn : True && publishedAt < now -> 발행 직전(예정) QuestionSet
-    fun findFirstByPublishedYnTrueAndPublishedAtBeforeOrderByPublishedAt(compareTime: LocalDateTime = LocalDateTime.now()): QuestionSetEntity?
+    fun findByStatusAndPublishedAtAfter(
+        status: Status,
+        compareTime: LocalDateTime = LocalDateTime.now(),
+    ): QuestionSetEntity?
 
     fun findTopByOrderByPublishedAtDesc(): QuestionSetEntity?
 }

diff --git a/service/src/main/kotlin/com/mashup/dojo/service/QuestionService.kt b/service/src/main/kotlin/com/mashup/dojo/service/QuestionService.kt
@@ -110,7 +110,7 @@ class DefaultQuestionService(
 
     // 현재 운영중인 QuestionSet
     override fun getOperatingQuestionSet(): QuestionSet? {
-        return questionSetRepository.findFirstByPublishedYnTrueAndPublishedAtAfterOrderByPublishedAt()
+        return questionSetRepository.findByPublishedAtAfterAndEndAtBefore(LocalDateTime.now(), LocalDateTime.now())
             ?.toQuestionSet() ?: run {
             log.error { "Published And Operating QuestionSet Entity not found" }
             null
@@ -119,7 +119,7 @@ class DefaultQuestionService(
 
     // 발행 출격 준비 완료 QuestionSet
     override fun getNextOperatingQuestionSet(): QuestionSet? {
-        return questionSetRepository.findFirstByPublishedYnTrueAndPublishedAtBeforeOrderByPublishedAt()
+        return questionSetRepository.findByStatusAndPublishedAtAfter(Status.UPCOMING, LocalDateTime.now())
             ?.toQuestionSet() ?: run {
             log.error { "Published And Prepared for sortie QuestionSet Entity not found" }
             null