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 index 52d939bd2..80cd17f43 100644 --- 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? ) 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 index 865a44123..d8305703d 100644 --- 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 index 0b711f6c0..308e91823 100644 --- 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/dms-infrastructure/src/main/resources/db/migration/V1__drop_reason_destination_in_tbl_outing_application.sql b/dms-infrastructure/src/main/resources/db/migration/V1__drop_reason_destination_in_tbl_outing_application.sql new file mode 100644 index 000000000..95dd9d21c --- /dev/null +++ b/dms-infrastructure/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; \ No newline at end of file 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 27da6ff11..4fb12996e 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 @@ -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/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 fcb3f66c2..e7d0f9988 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 @@ -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 index bfc969ec1..263ce169f 100644 --- 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/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/dto/request/ApplyOutingWebRequest.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/dto/request/ApplyOutingWebRequest.kt index 10d5fc8a0..db3830606 100644 --- a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/outing/dto/request/ApplyOutingWebRequest.kt +++ b/dms-presentation/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? )