chore: (#791) 쿼리에 날짜 조건 추가

team-aliens · Oct 18, 2024 · 1ca2f3c · 1ca2f3c
1 parent 59b98cd
commit 1ca2f3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
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
@@ -39,8 +39,10 @@ class GetOutingServiceImpl(
         queryOutingApplicationPort.queryAllOutingApplicationVOsBetweenStartAndEnd(name, start, end)
 
     override fun getCurrentOutingApplication(studentId: UUID): CurrentOutingApplicationVO {
-        return queryOutingApplicationPort.queryCurrentOutingApplicationVO(studentId)
-            ?: throw OutingApplicationNotFoundException
+        return queryOutingApplicationPort.queryCurrentOutingApplicationVO(
+            studentId = studentId,
+            date = LocalDate.now()
+        ) ?: throw OutingApplicationNotFoundException
     }
 
     override fun getOutingAvailableTimesByDayOfWeek(

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/QueryOutingApplicationPort.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/QueryOutingApplicationPort.kt
@@ -14,7 +14,7 @@ interface QueryOutingApplicationPort {
 
     fun queryAllOutingApplicationVOsBetweenStartAndEnd(name: String?, start: LocalDate, end: LocalDate): List<OutingApplicationVO>
 
-    fun queryCurrentOutingApplicationVO(studentId: UUID): CurrentOutingApplicationVO?
+    fun queryCurrentOutingApplicationVO(studentId: UUID, date: LocalDate): CurrentOutingApplicationVO?
 
     fun isApplicant(studentId: UUID): Boolean
 }
diff --git a/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
@@ -87,7 +87,7 @@ class OutingApplicationPersistenceAdapter(
             )
     }
 
-    override fun queryCurrentOutingApplicationVO(studentId: UUID): CurrentOutingApplicationVO? {
+    override fun queryCurrentOutingApplicationVO(studentId: UUID, date: LocalDate): CurrentOutingApplicationVO? {
         val studentJpaEntity = QStudentJpaEntity("studentJpaEntity")
         val outingCompanionStudentJpaEntity = QStudentJpaEntity("outingCompanionStudentJpaEntity")
 
@@ -107,11 +107,13 @@ class OutingApplicationPersistenceAdapter(
                             .where(
                                 outingCompanionJpaEntity.student.id.eq(studentId),
                                 outingApplicationJpaEntity.student.id.eq(studentJpaEntity.id),
-                                outingApplicationJpaEntity.isReturned.eq(false)
+                                outingApplicationJpaEntity.isReturned.eq(false),
+                                outingApplicationJpaEntity.outingDate.eq(date)
                             )
                             .exists()
                     ),
-                outingApplicationJpaEntity.isReturned.eq(false)
+                outingApplicationJpaEntity.isReturned.eq(false),
+                outingApplicationJpaEntity.outingDate.eq(date)
             )
             .transform(
                 groupBy(outingApplicationJpaEntity.id)