merge: (#770) 외출 조회 제약조건

team-aliens · Sep 27, 2024 · 93c2b35 · 93c2b35
2 parents 3879229 + 1098550
commit 93c2b35
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingService.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingService.kt
@@ -22,4 +22,6 @@ interface CheckOutingService {
         outingTime: LocalTime,
         arrivalTime: LocalTime
     )
+
+    fun checkOutingApplicationQueryAble() : Boolean
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingServiceImpl.kt
@@ -66,4 +66,10 @@ class CheckOutingServiceImpl(
             }
         }
     }
+
+    override fun checkOutingApplicationQueryAble(): Boolean {
+        val currentTime = LocalTime.now()
+
+        return currentTime.isBefore(LocalTime.of(20, 0))
+    }
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt
@@ -16,6 +16,7 @@ import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
 import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
 import java.time.DayOfWeek
 import java.time.LocalDate
+import java.time.LocalTime
 import java.util.UUID
 
 @Service
@@ -39,9 +40,10 @@ class GetOutingServiceImpl(
     override fun getAllOutingApplicationVOsBetweenStartAndEnd(start: LocalDate, end: LocalDate) =
         queryOutingApplicationPort.queryAllOutingApplicationVOsBetweenStartAndEnd(start, end)
 
-    override fun getCurrentOutingApplication(studentId: UUID): CurrentOutingApplicationVO =
-        queryOutingApplicationPort.queryCurrentOutingApplicationVO(studentId)
-            ?: throw OutingApplicationNotFoundException
+    override fun getCurrentOutingApplication(studentId: UUID): CurrentOutingApplicationVO {
+        return queryOutingApplicationPort.queryCurrentOutingApplicationVO(studentId)
+                ?: throw OutingApplicationNotFoundException
+    }
 
     override fun getOutingHistoriesByStudentNameAndDate(
         studentName: String?,
@@ -60,4 +62,5 @@ class GetOutingServiceImpl(
     override fun getOutingAvailableTimeById(outingAvailableTimeId: UUID): OutingAvailableTime =
         queryOutingAvailableTimePort.queryOutingAvailableTimeById(outingAvailableTimeId)
             ?: throw OutingAvailableTimeNotFoundException
+
 }
diff --git a/...c/main/kotlin/team/aliens/dms/domain/outing/usecase/GetCurrentOutingApplicationUseCase.kt b/...c/main/kotlin/team/aliens/dms/domain/outing/usecase/GetCurrentOutingApplicationUseCase.kt
@@ -14,6 +14,8 @@ class GetCurrentOutingApplicationUseCase(
     fun execute(): GetCurrentOutingApplicationResponse {
         val student = studentService.getCurrentStudent()
 
+        outingService.checkOutingApplicationQueryAble()
+
         val currentOutingApplicationVO = outingService.getCurrentOutingApplication(student.id)
 
         return GetCurrentOutingApplicationResponse.of(currentOutingApplicationVO, student.name)