🔀 :: where절 날짜 추가

DSM-PICK · Sep 7, 2023 · eacbe85 · eacbe85
1 parent ebaa37f
commit eacbe85
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...ion/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/spi/QueryStatusSpi.kt b/...ion/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/spi/QueryStatusSpi.kt
@@ -25,7 +25,7 @@ interface QueryStatusSpi {
 
     fun queryMovementStudentStatusIdByStudentIdAndToday(studentId: UUID): UUID?
 
-    fun queryStatusTypesByStudentIdAndEndPeriod(studentId: UUID, period: Int): List<StatusType>
+    fun queryStatusTypesByStudentIdAndEndPeriodAndToday(studentId: UUID, period: Int): List<StatusType>
 
     fun queryMovementStatusListByTodayAndClassroomId(classroomId: UUID): List<Status>
 

diff --git a/.../kotlin/com/pickdsm/pickserverspring/domain/classroom/usecase/ClassroomMovementUseCase.kt b/.../kotlin/com/pickdsm/pickserverspring/domain/classroom/usecase/ClassroomMovementUseCase.kt
@@ -66,7 +66,7 @@ class ClassroomMovementUseCase(
         val time = timeList.timeList.find { time -> time.period == request.period }
             ?: throw TimeNotFoundException
 
-        val statusTypes = queryStatusSpi.queryStatusTypesByStudentIdAndEndPeriod(
+        val statusTypes = queryStatusSpi.queryStatusTypesByStudentIdAndEndPeriodAndToday(
             studentId = student.id,
             period = request.period,
         )

diff --git a/...ckdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt b/...ckdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt
@@ -148,13 +148,14 @@ class StatusPersistenceAdapter(
             )
             .fetchOne()
 
-    override fun queryStatusTypesByStudentIdAndEndPeriod(studentId: UUID, period: Int): List<StatusType> =
+    override fun queryStatusTypesByStudentIdAndEndPeriodAndToday(studentId: UUID, period: Int): List<StatusType> =
         jpaQueryFactory
             .select(statusEntity.type)
             .from(statusEntity)
             .where(
                 statusEntity.studentId.eq(studentId),
                 statusEntity.endPeriod.lt(period), // 상태의 endPeriod < period면
+                statusEntity.date.eq(LocalDate.now())
             )
             .fetch()