feat: (#788) 외출 신청 컬럼 수정

team-aliens · Oct 13, 2024 · a83107e · a83107e
1 parent 67e65a7
commit a83107e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/...ucture/src/main/resources/db/migration/V9__change_column_in_table_outinga_application.sql b/...ucture/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/...e/src/main/kotlin/team/aliens/dms/persistence/outing/entity/OutingApplicationJpaEntity.kt b/...e/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/...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
@@ -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
         )