feat: (#788) student name 필터링 추가

team-aliens · Oct 15, 2024 · 7f283c0 · 7f283c0
1 parent b77e030
commit 7f283c0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingService.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingService.kt
@@ -18,7 +18,7 @@ interface GetOutingService {
 
     fun getOutingApplicationById(outingApplicationId: UUID): OutingApplication
 
-    fun getAllOutingApplicationVOsBetweenStartAndEnd(start: LocalDate, end: LocalDate): List<OutingApplicationVO>
+    fun getAllOutingApplicationVOsBetweenStartAndEnd(name: String?, start: LocalDate, end: LocalDate): List<OutingApplicationVO>
 
     fun getCurrentOutingApplication(studentId: UUID): CurrentOutingApplicationVO
 

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
@@ -35,7 +35,7 @@ class GetOutingServiceImpl(
         queryOutingApplicationPort.queryOutingApplicationById(outingApplicationId)
             ?: throw OutingApplicationNotFoundException
 
-    override fun getAllOutingApplicationVOsBetweenStartAndEnd(start: LocalDate, end: LocalDate) =
+    override fun getAllOutingApplicationVOsBetweenStartAndEnd(name: String?, start: LocalDate, end: LocalDate) =
         queryOutingApplicationPort.queryAllOutingApplicationVOsBetweenStartAndEnd(start, end)
 
     override fun getCurrentOutingApplication(studentId: UUID): CurrentOutingApplicationVO {

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
@@ -12,7 +12,7 @@ interface QueryOutingApplicationPort {
 
     fun queryOutingApplicationById(outingApplicationId: UUID): OutingApplication?
 
-    fun queryAllOutingApplicationVOsBetweenStartAndEnd(start: LocalDate, end: LocalDate): List<OutingApplicationVO>
+    fun queryAllOutingApplicationVOsBetweenStartAndEnd(name: String?, start: LocalDate, end: LocalDate): List<OutingApplicationVO>
 
     fun queryCurrentOutingApplicationVO(studentId: UUID): CurrentOutingApplicationVO?
 

diff --git a/...c/main/kotlin/team/aliens/dms/domain/outing/usecase/ExportAllOutingApplicationsUseCase.kt b/...c/main/kotlin/team/aliens/dms/domain/outing/usecase/ExportAllOutingApplicationsUseCase.kt
@@ -20,7 +20,7 @@ class ExportAllOutingApplicationsUseCase(
 
     fun execute(start: LocalDate, end: LocalDate): ExportAllOutingApplicationsResponse {
 
-        val outingApplicationExcelVOs = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(start, end)
+        val outingApplicationExcelVOs = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(null, start, end)
 
         val file = fileService.writeOutingApplicationExcelFile(outingApplicationExcelVOs)
 

diff --git a/...main/kotlin/team/aliens/dms/domain/outing/usecase/GetOutingApplicationHistoriesUseCase.kt b/...main/kotlin/team/aliens/dms/domain/outing/usecase/GetOutingApplicationHistoriesUseCase.kt
@@ -13,7 +13,7 @@ class GetOutingApplicationHistoriesUseCase(
 
     fun execute(studentName: String?, date: LocalDate): OutingApplicationHistoriesResponse {
 
-        val outingApplications = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(date, date)
+        val outingApplications = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(studentName, date, date)
 
         val outingApplicationInfoSet = outingApplications.flatMap { outingApplication ->
             val outingApplicationInfoList = mutableListOf(

diff --git a/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
@@ -2,6 +2,7 @@ package team.aliens.dms.persistence.outing
 
 import com.querydsl.core.group.GroupBy.groupBy
 import com.querydsl.core.group.GroupBy.list
+import com.querydsl.core.types.dsl.BooleanExpression
 import com.querydsl.jpa.JPAExpressions.selectOne
 import com.querydsl.jpa.impl.JPAQueryFactory
 import org.springframework.data.repository.findByIdOrNull
@@ -40,6 +41,7 @@ class OutingApplicationPersistenceAdapter(
         )
 
     override fun queryAllOutingApplicationVOsBetweenStartAndEnd(
+        name: String?,
         start: LocalDate,
         end: LocalDate
     ): List<OutingApplicationVO> {
@@ -52,7 +54,10 @@ class OutingApplicationPersistenceAdapter(
             .leftJoin(outingCompanionJpaEntity)
             .on(outingApplicationJpaEntity.id.eq(outingCompanionJpaEntity.outingApplication.id))
             .leftJoin(outingCompanionJpaEntity.student, outingCompanionStudentJpaEntity)
-            .where(outingApplicationJpaEntity.outingDate.between(start, end))
+            .where(
+                containsName(name),
+                outingApplicationJpaEntity.outingDate.between(start, end)
+            )
             .orderBy(outingApplicationJpaEntity.outingDate.asc())
             .transform(
                 groupBy(outingApplicationJpaEntity.id)
@@ -157,4 +162,8 @@ class OutingApplicationPersistenceAdapter(
 
         return result != null
     }
+
+    private fun containsName(name: String?): BooleanExpression? {
+        return name?.let { outingApplicationJpaEntity.student.name.contains(it) }
+    }
 }
diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/OutingWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/OutingWebAdapter.kt
@@ -116,9 +116,9 @@ class OutingWebAdapter(
     fun updateOutingStatus(
         @PathVariable("outing-application-id") @NotNull outingApplicationId: UUID,
         @RequestParam("is_approved", required = false) isApproved: Boolean,
-        @RequestParam("is_comeback", required = false) isComeback: Boolean,
+        @RequestParam("is_returned", required = false) isReturned: Boolean,
     ) {
-        updateOutingStatusUseCase.execute(outingApplicationId, isApproved, isComeback)
+        updateOutingStatusUseCase.execute(outingApplicationId, isApproved, isReturned)
     }
 
     @GetMapping("/files")