fix: (#788) 빌드 에러 수정

team-aliens · Oct 16, 2024 · 8d44feb · 8d44feb
1 parent 7f283c0
commit 8d44feb
Show file tree

Hide file tree

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

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/ApplyOutingUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/ApplyOutingUseCase.kt
@@ -34,7 +34,7 @@ class ApplyOutingUseCase(
                 outingTime = request.outingTime,
                 arrivalTime = request.arrivalTime,
                 isApproved = false,
-                isComeback = false,
+                isReturned = false,
                 reason = request.reason,
                 outingTypeTitle = request.outingTypeTitle,
                 schoolId = securityService.getCurrentSchoolId(),

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(null, start, end)
+        val outingApplicationExcelVOs = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(name = null, start = start, end = end)
 
         val file = fileService.writeOutingApplicationExcelFile(outingApplicationExcelVOs)
 

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/UpdateOutingStatusUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/UpdateOutingStatusUseCase.kt
@@ -13,7 +13,7 @@ class UpdateOutingStatusUseCase(
         val outingApplication = outingService.getOutingApplicationById(outingApplicationId)
 
         outingService.saveOutingApplication(
-            outingApplication.copy(isApproved = isApproved, isComeback = isReturned)
+            outingApplication.copy(isApproved = isApproved, isReturned = isReturned)
         )
     }
 }
diff --git a/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
@@ -73,7 +73,7 @@ class OutingApplicationPersistenceAdapter(
                             outingApplicationJpaEntity.outingTime,
                             outingApplicationJpaEntity.arrivalTime,
                             outingApplicationJpaEntity.isApproved,
-                            outingApplicationJpaEntity.isComeback,
+                            outingApplicationJpaEntity.isReturned,
                             list(
                                 QQueryOutingCompanionVO(
                                     outingCompanionStudentJpaEntity.name,
@@ -107,11 +107,11 @@ class OutingApplicationPersistenceAdapter(
                             .where(
                                 outingCompanionJpaEntity.student.id.eq(studentId),
                                 outingApplicationJpaEntity.student.id.eq(studentJpaEntity.id),
-                                outingApplicationJpaEntity.isComeback.eq(false)
+                                outingApplicationJpaEntity.isReturned.eq(false)
                             )
                             .exists()
                     ),
-                outingApplicationJpaEntity.isComeback.eq(false)
+                outingApplicationJpaEntity.isReturned.eq(false)
             )
             .transform(
                 groupBy(outingApplicationJpaEntity.id)
@@ -156,7 +156,7 @@ class OutingApplicationPersistenceAdapter(
             .join(outingApplicationJpaEntity.student, studentJpaEntity)
             .where(
                 studentJpaEntity.id.eq(studentId),
-                outingApplicationJpaEntity.isComeback.eq(false)
+                outingApplicationJpaEntity.isReturned.eq(false)
             )
             .fetchOne()
 

diff --git a/...ence/src/main/kotlin/team/aliens/dms/persistence/outing/mapper/OutingApplicationMapper.kt b/...ence/src/main/kotlin/team/aliens/dms/persistence/outing/mapper/OutingApplicationMapper.kt
@@ -25,7 +25,7 @@ class OutingApplicationMapper(
                 outingTime = it.outingTime,
                 arrivalTime = it.arrivalTime,
                 isApproved = it.isApproved,
-                isComeback = it.isComeback,
+                isReturned = it.isReturned,
                 reason = it.reason,
                 outingTypeTitle = it.outingType!!.id.title,
                 schoolId = it.outingType!!.id.schoolId
@@ -49,7 +49,7 @@ class OutingApplicationMapper(
             outingTime = domain.outingTime,
             arrivalTime = domain.arrivalTime,
             isApproved = domain.isApproved,
-            isComeback = domain.isComeback,
+            isReturned = domain.isReturned,
             reason = domain.reason,
             outingType = outingType
         )