From a83107eb3dff0b3d42e0e8bbbc01d745f2fae4cd Mon Sep 17 00:00:00 2001
From: "tae.y" <0211ilyoil@gmail.com>
Date: Sun, 13 Oct 2024 09:58:09 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20(#788)=20=EC=99=B8=EC=B6=9C=20=EC=8B=A0?=
 =?UTF-8?q?=EC=B2=AD=20=EC=BB=AC=EB=9F=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._change_column_in_table_outinga_application.sql |  3 +++
 .../outing/entity/OutingApplicationJpaEntity.kt    | 14 ++++++++------
 .../outing/mapper/OutingApplicationMapper.kt       |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 dms-infrastructure/src/main/resources/db/migration/V9__change_column_in_table_outinga_application.sql

diff --git a/dms-infrastructure/src/main/resources/db/migration/V9__change_column_in_table_outinga_application.sql b/dms-infrastructure/src/main/resources/db/migration/V9__change_column_in_table_outinga_application.sql
new file mode 100644
index 000000000..55299f8cc
--- /dev/null
+++ b/dms-infrastructure/src/main/resources/db/migration/V9__change_column_in_table_outinga_application.sql
@@ -0,0 +1,3 @@
+alter table tbl_outing_application
+    add column is_approved bit(1) default false not null,
+    add column is_comeback bit(1) default false not null;
diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/entity/OutingApplicationJpaEntity.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/entity/OutingApplicationJpaEntity.kt
index 9f678e12d..e384ed4ad 100644
--- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/entity/OutingApplicationJpaEntity.kt
+++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/entity/OutingApplicationJpaEntity.kt
@@ -2,14 +2,12 @@ package team.aliens.dms.persistence.outing.entity
 
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
-import jakarta.persistence.EnumType
-import jakarta.persistence.Enumerated
 import jakarta.persistence.FetchType
 import jakarta.persistence.JoinColumn
 import jakarta.persistence.JoinColumns
 import jakarta.persistence.ManyToOne
 import jakarta.persistence.Table
-import team.aliens.dms.domain.outing.model.OutingStatus
+import org.hibernate.annotations.ColumnDefault
 import team.aliens.dms.persistence.BaseEntity
 import team.aliens.dms.persistence.student.entity.StudentJpaEntity
 import java.time.LocalDate
@@ -38,9 +36,13 @@ class OutingApplicationJpaEntity(
     @Column(columnDefinition = "TIME", nullable = false)
     val arrivalTime: LocalTime,
 
-    @Enumerated(EnumType.STRING)
-    @Column(columnDefinition = "VARCHAR(9)", nullable = false)
-    val status: OutingStatus,
+    @Column(columnDefinition = "BIT(1)", nullable = false)
+    @ColumnDefault("false")
+    val isApproved: Boolean,
+
+    @Column(columnDefinition = "BIT(1)", nullable = false)
+    @ColumnDefault("false")
+    val isComeback: Boolean,
 
     @Column(columnDefinition = "VARCHAR(100)", nullable = true)
     val reason: String?,
diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/mapper/OutingApplicationMapper.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/mapper/OutingApplicationMapper.kt
index 4eef0fe4a..46b35aab2 100644
--- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/mapper/OutingApplicationMapper.kt
+++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/mapper/OutingApplicationMapper.kt
@@ -24,7 +24,8 @@ class OutingApplicationMapper(
                 outingDate = it.outingDate,
                 outingTime = it.outingTime,
                 arrivalTime = it.arrivalTime,
-                status = it.status,
+                isApproved = it.isApproved,
+                isComeback = it.isComeback,
                 reason = it.reason,
                 outingTypeTitle = it.outingType!!.id.title,
                 schoolId = it.outingType!!.id.schoolId
@@ -47,7 +48,8 @@ class OutingApplicationMapper(
             outingDate = domain.outingDate,
             outingTime = domain.outingTime,
             arrivalTime = domain.arrivalTime,
-            status = domain.status,
+            isApproved = domain.isApproved,
+            isComeback = domain.isComeback,
             reason = domain.reason,
             outingType = outingType
         )