chore: (#767) reason 삭제

team-aliens · Sep 22, 2024 · 332ecc9 · 332ecc9
1 parent 9cbbfc7
commit 332ecc9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 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
@@ -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
@@ -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/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/...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/.../main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt b/.../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,