From 332ecc9ff15e671adad9fb5f488c41da104443bd Mon Sep 17 00:00:00 2001
From: "tae.y" <0211ilyoil@gmail.com>
Date: Sun, 22 Sep 2024 22:04:13 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20(#767)=20reason=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt    | 3 +--
 .../kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt  | 4 ++--
 .../persistence/outing/OutingApplicationPersistenceAdapter.kt | 3 +--
 .../outing/repository/vo/QueryOutingApplicationVO.kt          | 4 +---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt
index 15c54cb47..33bdf2dd8 100644
--- a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt
+++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt
@@ -9,8 +9,7 @@ open class OutingApplicationVO(
     val studentGrade: Int,
     val studentClassRoom: Int,
     val studentNumber: Int,
-    val reason: String?,
-    val outingType: String?,
+    val outingType: String,
     val outingDate: LocalDate,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,
diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt
index 1bde11e64..4247afa31 100644
--- a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt
+++ b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt
@@ -248,14 +248,14 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() {
     }
 
     override fun writeOutingApplicationExcelFile(outingApplicationExcelVos: List<OutingApplicationVO>): ByteArray {
-        val attributes = mutableListOf("ㅤ학번ㅤ", "ㅤ이름ㅤ", "외출 사유", "외출 시간", "도착 시간", "외출 확인", "복귀 확인")
+        val attributes = mutableListOf("ㅤ학번ㅤ", "ㅤ이름ㅤ", "외출 유형", "외출 시간", "도착 시간", "외출 확인", "복귀 확인")
 
         val outingApplicationInfoSet = outingApplicationExcelVos.map { outingApplication ->
             val outingApplicationInfoList = mutableListOf(
                 listOf(
                     outingApplication.studentGcn,
                     outingApplication.studentName,
-                    outingApplication.reason ?: "",
+                    outingApplication.outingType,
                     outingApplication.outingTime.toString(),
                     outingApplication.arrivalTime.toString(),
                     null,
diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
index cd371ec5e..257a588eb 100644
--- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
+++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
@@ -65,8 +65,7 @@ class OutingApplicationPersistenceAdapter(
                             studentJpaEntity.grade,
                             studentJpaEntity.classRoom,
                             studentJpaEntity.number,
-                            outingApplicationJpaEntity.reason,
-                            outingApplicationJpaEntity.reason,
+                            outingApplicationJpaEntity.outingType.id.title,
                             outingApplicationJpaEntity.outingDate,
                             outingApplicationJpaEntity.outingTime,
                             outingApplicationJpaEntity.arrivalTime,
diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt
index d0f8a3ff5..1120ff6cf 100644
--- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt
+++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt
@@ -11,8 +11,7 @@ class QueryOutingApplicationVO @QueryProjection constructor(
     studentGrade: Int,
     studentClassRoom: Int,
     studentNumber: Int,
-    reason: String?,
-    outingType: String?,
+    outingType: String,
     outingDate: LocalDate,
     outingTime: LocalTime,
     arrivalTime: LocalTime,
@@ -22,7 +21,6 @@ class QueryOutingApplicationVO @QueryProjection constructor(
     studentGrade = studentGrade,
     studentClassRoom = studentClassRoom,
     studentNumber = studentNumber,
-    reason = reason,
     outingType = outingType,
     outingDate = outingDate,
     outingTime = outingTime,