merge: (#788) 외출 내역 조회 API 변경

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/dto/response/OutingResponse.kt

@@ -3,7 +3,6 @@ package team.aliens.dms.domain.outing.dto.response
 import com.fasterxml.jackson.annotation.JsonInclude
 import team.aliens.dms.domain.outing.model.OutingApplication
 import team.aliens.dms.domain.outing.model.OutingAvailableTime
-import team.aliens.dms.domain.outing.model.OutingStatus
 import team.aliens.dms.domain.outing.spi.vo.CurrentOutingApplicationVO
 import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
 import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
@@ -25,7 +24,6 @@ data class GetCurrentOutingApplicationResponse(
     val id: UUID,
     val outingDate: LocalDate,
     val outingTypeTitle: String,
-    val status: OutingStatus,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,
     @field:JsonInclude(JsonInclude.Include.ALWAYS)
@@ -39,7 +37,6 @@ data class GetCurrentOutingApplicationResponse(
                     id = id,
                     outingDate = outingDate,
                     outingTypeTitle = outingTypeTitle,
-                    status = status,
                     outingTime = outingTime,
                     arrivalTime = arrivalTime,
                     reason = reason,
@@ -63,7 +60,6 @@ data class OutingHistoryDetailsResponse(
     val studentRoomNumber: String,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,
-    val outingStatus: OutingStatus,
     @field:JsonInclude(JsonInclude.Include.ALWAYS)
     val reason: String?,
     val outingType: String,
@@ -81,7 +77,6 @@ data class OutingHistoryDetailsResponse(
                 studentRoomNumber = student.roomNumber,
                 outingTime = outingHistory.outingTime,
                 arrivalTime = outingHistory.arrivalTime,
-                outingStatus = outingHistory.status,
                 reason = outingHistory.reason,
                 outingType = outingHistory.outingTypeTitle,
                 students = outingCompanions.map {

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/model/OutingApplication.kt

@@ -23,7 +23,9 @@ data class OutingApplication(
 
     val arrivalTime: LocalTime,
 
-    val status: OutingStatus,
+    val isApproved: Boolean,
+
+    val isReturned: Boolean,
 
     val reason: String?,
 
@@ -35,8 +37,8 @@ data class OutingApplication(
 
 ) : SchoolIdDomain {
 
-    fun checkCancelable(status: OutingStatus) {
-        if (status != OutingStatus.APPROVED) {
+    fun checkCancelable(isApproved: Boolean) {
+        if (isApproved) {
             throw OutingTypeMismatchException
         }
     }

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingService.kt

@@ -6,7 +6,6 @@ import team.aliens.dms.domain.outing.model.OutingType
 import team.aliens.dms.domain.outing.spi.vo.CurrentOutingApplicationVO
 import team.aliens.dms.domain.outing.spi.vo.OutingApplicationVO
 import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
-import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.util.UUID
@@ -19,12 +18,10 @@ 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
 
-    fun getOutingHistoriesByStudentNameAndDate(studentName: String?, date: LocalDate): List<OutingHistoryVO>
-
     fun getOutingAvailableTimesByDayOfWeek(dayOfWeek: DayOfWeek): List<OutingAvailableTime>
 
     fun getOutingCompanionsByApplicationId(outingApplicationId: UUID): List<OutingCompanionDetailsVO>

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt

@@ -13,7 +13,6 @@ import team.aliens.dms.domain.outing.spi.QueryOutingCompanionPort
 import team.aliens.dms.domain.outing.spi.QueryOutingTypePort
 import team.aliens.dms.domain.outing.spi.vo.CurrentOutingApplicationVO
 import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
-import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.util.UUID
@@ -36,19 +35,14 @@ 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 {
         return queryOutingApplicationPort.queryCurrentOutingApplicationVO(studentId)
             ?: throw OutingApplicationNotFoundException
     }
 
-    override fun getOutingHistoriesByStudentNameAndDate(
-        studentName: String?,
-        date: LocalDate
-    ): List<OutingHistoryVO> = queryOutingApplicationPort.queryOutingHistoriesByStudentNameAndDate(studentName, date)
-
     override fun getOutingAvailableTimesByDayOfWeek(
         dayOfWeek: DayOfWeek
     ) = queryOutingAvailableTimePort.queryOutingAvailableTimesByDayOfWeek(

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/QueryOutingApplicationPort.kt

@@ -3,7 +3,6 @@ package team.aliens.dms.domain.outing.spi
 import team.aliens.dms.domain.outing.model.OutingApplication
 import team.aliens.dms.domain.outing.spi.vo.CurrentOutingApplicationVO
 import team.aliens.dms.domain.outing.spi.vo.OutingApplicationVO
-import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
 import java.time.LocalDate
 import java.util.UUID
 
@@ -13,11 +12,9 @@ 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?
 
-    fun queryOutingHistoriesByStudentNameAndDate(studentName: String?, date: LocalDate): List<OutingHistoryVO>
-
     fun isApplicant(studentId: UUID): Boolean
 }

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/CurrentOutingApplicationVO.kt

@@ -1,6 +1,5 @@
 package team.aliens.dms.domain.outing.spi.vo
 
-import team.aliens.dms.domain.outing.model.OutingStatus
 import java.time.LocalDate
 import java.time.LocalTime
 import java.util.UUID
@@ -9,7 +8,6 @@ open class CurrentOutingApplicationVO(
     val id: UUID,
     val outingDate: LocalDate,
     val outingTypeTitle: String,
-    val status: OutingStatus,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,
     val reason: String?,

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt

@@ -3,8 +3,10 @@ package team.aliens.dms.domain.outing.spi.vo
 import team.aliens.dms.domain.student.model.Student
 import java.time.LocalDate
 import java.time.LocalTime
+import java.util.UUID
 
 open class OutingApplicationVO(
+    val id: UUID,
     val studentName: String,
     val studentGrade: Int,
     val studentClassRoom: Int,
@@ -13,6 +15,8 @@ open class OutingApplicationVO(
     val outingDate: LocalDate,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,
+    val isApproved: Boolean,
+    val isComeback: Boolean,
     val outingCompanionVOs: List<OutingCompanionVO>
 ) {
     val studentGcn = Student.processGcn(studentGrade, studentClassRoom, studentNumber)

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingHistoryVO.kt

@@ -1,15 +1,15 @@
 package team.aliens.dms.domain.outing.spi.vo
 
-import team.aliens.dms.domain.outing.model.OutingStatus
 import java.time.LocalTime
 import java.util.UUID
 
 open class OutingHistoryVO(
-    val outingApplicationId: UUID,
+    val id: UUID,
+    val studentGcn: String,
     val studentName: String,
     val outingType: String,
-    val outingCompanionCount: Int,
-    val outingStatus: OutingStatus,
     val outingTime: LocalTime,
-    val arrivalTime: LocalTime
+    val arrivalTime: LocalTime,
+    val isApproved: Boolean,
+    val isReturned: Boolean
 )

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/ApplyOutingUseCase.kt

@@ -5,7 +5,6 @@ import team.aliens.dms.common.service.security.SecurityService
 import team.aliens.dms.domain.outing.dto.request.ApplyOutingRequest
 import team.aliens.dms.domain.outing.dto.response.ApplyOutingResponse
 import team.aliens.dms.domain.outing.model.OutingApplication
-import team.aliens.dms.domain.outing.model.OutingStatus
 import team.aliens.dms.domain.outing.service.OutingService
 import team.aliens.dms.domain.student.service.StudentService
 import java.time.LocalDateTime
@@ -34,7 +33,8 @@ class ApplyOutingUseCase(
                 outingDate = request.outingDate,
                 outingTime = request.outingTime,
                 arrivalTime = request.arrivalTime,
-                status = OutingStatus.APPROVED,
+                isApproved = false,
+                isComeback = false,
                 reason = request.reason,
                 outingTypeTitle = request.outingTypeTitle,
                 schoolId = securityService.getCurrentSchoolId(),

dms-core/src/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)
 

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/GetOutingApplicationHistoriesUseCase.kt

@@ -3,6 +3,7 @@ package team.aliens.dms.domain.outing.usecase
 import team.aliens.dms.common.annotation.ReadOnlyUseCase
 import team.aliens.dms.domain.outing.dto.response.OutingApplicationHistoriesResponse
 import team.aliens.dms.domain.outing.service.OutingService
+import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
 import java.time.LocalDate
 
 @ReadOnlyUseCase
@@ -12,8 +13,39 @@ class GetOutingApplicationHistoriesUseCase(
 
     fun execute(studentName: String?, date: LocalDate): OutingApplicationHistoriesResponse {
 
-        val outings = outingService.getOutingHistoriesByStudentNameAndDate(studentName = studentName, date = date)
+        val outingApplications = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(studentName, date, date)
 
-        return OutingApplicationHistoriesResponse(outings)
+        val outingApplicationInfoSet = outingApplications.flatMap { outingApplication ->
+            val outingApplicationInfoList = mutableListOf(
+                OutingHistoryVO(
+                    outingApplication.id,
+                    outingApplication.studentGcn,
+                    outingApplication.studentName,
+                    outingApplication.outingType,
+                    outingApplication.outingTime,
+                    outingApplication.arrivalTime,
+                    outingApplication.isApproved,
+                    outingApplication.isComeback
+                )
+            )
+
+            for (outingCompanions in outingApplication.outingCompanionVOs)
+                if (outingCompanions.studentGcn.isNotBlank())
+                    outingApplicationInfoList.add(
+                        OutingHistoryVO(
+                            outingApplication.id,
+                            outingCompanions.studentGcn,
+                            outingCompanions.studentName,
+                            outingApplication.outingType,
+                            outingApplication.outingTime,
+                            outingApplication.arrivalTime,
+                            outingApplication.isApproved,
+                            outingApplication.isComeback
+                        )
+                    )
+            outingApplicationInfoList
+        }
+
+        return OutingApplicationHistoriesResponse(outingApplicationInfoSet)
     }
 }

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/UnApplyOutingUseCase.kt

@@ -14,7 +14,7 @@ class UnApplyOutingUseCase(
 
         outingService.getOutingApplicationById(outingApplicationId)
             .apply {
-                checkCancelable(outing.status)
+                checkCancelable(outing.isApproved)
             }
 
         outingService.deleteOutingApplication(outing)

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/UpdateOutingStatusUseCase.kt

@@ -1,7 +1,6 @@
 package team.aliens.dms.domain.outing.usecase
 
 import team.aliens.dms.common.annotation.UseCase
-import team.aliens.dms.domain.outing.model.OutingStatus
 import team.aliens.dms.domain.outing.service.OutingService
 import java.util.UUID
 
@@ -10,11 +9,11 @@ class UpdateOutingStatusUseCase(
     private val outingService: OutingService
 ) {
 
-    fun execute(outingApplicationId: UUID, outingStatus: OutingStatus) {
+    fun execute(outingApplicationId: UUID, isApproved: Boolean, isReturned: Boolean) {
         val outingApplication = outingService.getOutingApplicationById(outingApplicationId)
 
         outingService.saveOutingApplication(
-            outingApplication.copy(status = outingStatus)
+            outingApplication.copy(isApproved = isApproved, isComeback = isReturned)
         )
     }
 }

dms-core/src/test/kotlin/team/aliens/dms/domain/outing/model/OutingApplicationTest.kt

@@ -10,21 +10,21 @@ class OutingApplicationTest : DescribeSpec({
 
     describe("checkCancelable") {
         context("외출 신청 상태가 REQUESTED이면") {
-            val outingApplication = createOutingApplicationStub(outingStatus = OutingStatus.APPROVED)
+            val outingApplication = createOutingApplicationStub(isApproved = false)
 
             it("외출 취소가 가능하다") {
                 shouldNotThrowAny {
-                    outingApplication.checkCancelable(OutingStatus.APPROVED)
+                    outingApplication.checkCancelable(false)
                 }
             }
         }
 
         context("외출 신청 상태가 REQUESTED가 아니면") {
-            val outingApplication = createOutingApplicationStub(outingStatus = OutingStatus.APPROVED)
+            val outingApplication = createOutingApplicationStub(isApproved = true)
 
             it("외출 취소가 불가능하다") {
                 shouldThrow<OutingTypeMismatchException> {
-                    outingApplication.checkCancelable(OutingStatus.DONE)
+                    outingApplication.checkCancelable(true)
                 }
             }
         }

dms-core/src/test/kotlin/team/aliens/dms/domain/outing/stub/OutingStub.kt

@@ -2,7 +2,6 @@ package team.aliens.dms.domain.outing.stub
 
 import team.aliens.dms.domain.outing.model.OutingApplication
 import team.aliens.dms.domain.outing.model.OutingAvailableTime
-import team.aliens.dms.domain.outing.model.OutingStatus
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -16,7 +15,8 @@ internal fun createOutingApplicationStub(
     outingDate: LocalDate = LocalDate.now(),
     outingTime: LocalTime = LocalTime.now(),
     arrivalTime: LocalTime = LocalTime.now(),
-    outingStatus: OutingStatus = OutingStatus.REQUESTED,
+    isApproved: Boolean = false,
+    isComeback: Boolean = false,
     reason: String? = null,
     outingTypeTitle: String = "식사 외출",
     schoolId: UUID = UUID.randomUUID(),
@@ -28,7 +28,8 @@ internal fun createOutingApplicationStub(
     outingDate = outingDate,
     outingTime = outingTime,
     arrivalTime = arrivalTime,
-    status = outingStatus,
+    isApproved = isApproved,
+    isComeback = isComeback,
     reason = reason,
     outingTypeTitle = outingTypeTitle,
     schoolId = schoolId

dms-infrastructure/src/main/resources/db/migration/V9__change_column_in_table_outinga_application.sql

@@ -0,0 +1,4 @@
+alter table tbl_outing_application
+drop column status,
+add column is_approved bit(1) not null default b'0',
+add column is_returned bit(1) not null default b'0';