feat: (#563) 외출 사유, 장소 삭제

team-aliens · Feb 24, 2024 · e0e32f6 · e0e32f6
1 parent 5d47fd3
commit e0e32f6
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 28 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/dto/ApplyOutingRequest.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/dto/ApplyOutingRequest.kt
@@ -8,8 +8,6 @@ data class ApplyOutingRequest(
     val outAt: LocalDate,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,
-    val destination: String,
     val outingTypeTitle: String,
-    val reason: String,
     val companionIds: List<UUID>?
 )
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/model/OutingApplication.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/model/OutingApplication.kt
@@ -25,10 +25,6 @@ data class OutingApplication(
 
     val status: OutingStatus,
 
-    val reason: String,
-
-    val destination: String,
-
     val outingTypeTitle: String,
 
     override val schoolId: UUID,

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/ApplyOutingUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/ApplyOutingUseCase.kt
@@ -35,8 +35,6 @@ class ApplyOutingUseCase(
                 outingTime = request.outingTime,
                 arrivalTime = request.arrivalTime,
                 status = OutingStatus.REQUESTED,
-                reason = request.reason,
-                destination = request.destination,
                 outingTypeTitle = request.outingTypeTitle,
                 schoolId = securityService.getCurrentSchoolId(),
                 companionIds = request.companionIds

diff --git a/...src/main/resources/db/migration/V1__drop_reason_destination_in_tbl_outing_application.sql b/...src/main/resources/db/migration/V1__drop_reason_destination_in_tbl_outing_application.sql
@@ -0,0 +1 @@
+alter table tbl_outing_application drop reason, drop destination;
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
@@ -42,12 +42,6 @@ class OutingApplicationJpaEntity(
     @Column(columnDefinition = "VARCHAR(9)", nullable = false)
     val status: OutingStatus,
 
-    @Column(columnDefinition = "VARCHAR(100)", nullable = false)
-    val reason: String,
-
-    @Column(columnDefinition = "VARCHAR(15)", nullable = false)
-    val destination: String,
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumns(
         JoinColumn(name = "outing_type_title", referencedColumnName = "title", nullable = false),

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
@@ -25,8 +25,6 @@ class OutingApplicationMapper(
                 outingTime = it.outingTime,
                 arrivalTime = it.arrivalTime,
                 status = it.status,
-                reason = it.reason,
-                destination = it.destination,
                 outingTypeTitle = it.outingType!!.id.title,
                 schoolId = it.outingType!!.id.schoolId
             )
@@ -49,8 +47,6 @@ class OutingApplicationMapper(
             outingTime = domain.outingTime,
             arrivalTime = domain.arrivalTime,
             status = domain.status,
-            reason = domain.reason,
-            destination = domain.destination,
             outingType = outingType
         )
     }

diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/OutingWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/OutingWebAdapter.kt
@@ -55,9 +55,7 @@ class OutingWebAdapter(
                 outAt = webRequest.outAt,
                 outingTime = webRequest.outingTime,
                 arrivalTime = webRequest.arrivalTime,
-                destination = webRequest.destination,
                 outingTypeTitle = webRequest.outingTypeTitle,
-                reason = webRequest.reason,
                 companionIds = webRequest.companionIds
             )
         )

diff --git a/...tation/src/main/kotlin/team/aliens/dms/domain/outing/dto/request/ApplyOutingWebRequest.kt b/...tation/src/main/kotlin/team/aliens/dms/domain/outing/dto/request/ApplyOutingWebRequest.kt
@@ -18,18 +18,10 @@ data class ApplyOutingWebRequest(
     @field:NotNull
     val arrivalTime: LocalTime,
 
-    @field:Size(max = 15)
-    @field:NotBlank
-    val destination: String,
-
     @field:Size(max = 20)
     @field:NotBlank
     val outingTypeTitle: String,
 
-    @field:Size(max = 100)
-    @field:NotBlank
-    val reason: String,
-
     @field:NotNullElements
     val companionIds: List<UUID>?
 )