🔀 :: (#22) 외출증 조회 오늘것만 가져오도록 수정

DSM-PICK · Apr 23, 2023 · f26709c · f26709c
2 parents 3d3ad63 + 25bc365
commit f26709c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 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
@@ -19,6 +19,8 @@ interface QueryStatusSpi {
 
     fun queryPicnicStudentByStudentId(studentId: UUID): Status?
 
+    fun queryPicnicStudentByStudentIdAndToday(studentId: UUID): Status?
+
     fun queryStatusByStudentIdAndStartPeriodAndEndPeriod(studentId: UUID, startPeriod: Int, endPeriod: Int): Status?
 
     fun queryMovementStudentByStudentId(studentId: UUID): Status?

diff --git a/...main/kotlin/com/pickdsm/pickserverspring/domain/application/usecase/ApplicationUseCase.kt b/...main/kotlin/com/pickdsm/pickserverspring/domain/application/usecase/ApplicationUseCase.kt
@@ -466,9 +466,8 @@ class ApplicationUseCase(
     }
 
     override fun getMyPicnicEndTime(): QueryMyPicnicEndTimeResponse {
-        val userId = userSpi.getCurrentUserId()
-        val userInfo = userSpi.queryUserInfoByUserId(userId)
-        val picnicUserStatus = queryStatusSpi.queryPicnicStudentByStudentId(userId)
+        val userInfo = userSpi.queryUserInfoByUserId(userSpi.getCurrentUserId())
+        val picnicUserStatus = queryStatusSpi.queryPicnicStudentByStudentIdAndToday(userInfo.id)
             ?: throw StatusNotFoundException
         val endTime = timeQueryTeacherSpi.queryTime(LocalDate.now())
             .timeList.find { time -> time.period == picnicUserStatus.endPeriod }?.endTime
@@ -482,9 +481,8 @@ class ApplicationUseCase(
     }
 
     override fun getMyPicnicInfo(): QueryMyPicnicInfoResponse {
-        val userId = userSpi.getCurrentUserId()
-        val userInfo = userSpi.queryUserInfoByUserId(userId)
-        val picnicUserStatus = queryStatusSpi.queryPicnicStudentByStudentId(userId)
+        val userInfo = userSpi.queryUserInfoByUserId(userSpi.getCurrentUserId())
+        val picnicUserStatus = queryStatusSpi.queryPicnicStudentByStudentIdAndToday(userInfo.id)
             ?: throw StatusNotFoundException
         val teacherName = userSpi.queryUserInfoByUserId(picnicUserStatus.teacherId).name
 

diff --git a/...ckdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt b/...ckdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt
@@ -92,6 +92,17 @@ class StatusPersistenceAdapter(
             .fetchFirst()
             ?.let(statusMapper::entityToDomain)
 
+    override fun queryPicnicStudentByStudentIdAndToday(studentId: UUID): Status? =
+        jpaQueryFactory
+            .selectFrom(statusEntity)
+            .where(
+                statusEntity.studentId.eq(studentId),
+                statusEntity.type.eq(StatusType.PICNIC),
+                statusEntity.date.eq(LocalDate.now()),
+            )
+            .fetchFirst()
+            ?.let(statusMapper::entityToDomain)
+
     override fun queryStatusByStudentIdAndStartPeriodAndEndPeriod(
         studentId: UUID,
         startPeriod: Int,