merge: (#785) volunteer content 삭제

team-aliens · Oct 9, 2024 · 67e65a7 · 67e65a7
2 parents 38fced8 + 7951b72
commit 67e65a7
Show file tree

Hide file tree

Showing 18 changed files with 3 additions and 33 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingService.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingService.kt
@@ -23,5 +23,5 @@ interface CheckOutingService {
         arrivalTime: LocalTime
     )
 
-    fun checkOutingApplicationQueryAble() : Boolean
+    fun checkOutingApplicationQueryAble(): Boolean
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt
@@ -16,7 +16,6 @@ import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
 import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
 import java.time.DayOfWeek
 import java.time.LocalDate
-import java.time.LocalTime
 import java.util.UUID
 
 @Service
@@ -42,7 +41,7 @@ class GetOutingServiceImpl(
 
     override fun getCurrentOutingApplication(studentId: UUID): CurrentOutingApplicationVO {
         return queryOutingApplicationPort.queryCurrentOutingApplicationVO(studentId)
-                ?: throw OutingApplicationNotFoundException
+            ?: throw OutingApplicationNotFoundException
     }
 
     override fun getOutingHistoriesByStudentNameAndDate(
@@ -62,5 +61,4 @@ class GetOutingServiceImpl(
     override fun getOutingAvailableTimeById(outingAvailableTimeId: UUID): OutingAvailableTime =
         queryOutingAvailableTimePort.queryOutingAvailableTimeById(outingAvailableTimeId)
             ?: throw OutingAvailableTimeNotFoundException
-
 }
diff --git a/...re/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/CreateVolunteerRequest.kt b/...re/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/CreateVolunteerRequest.kt
@@ -5,7 +5,6 @@ import team.aliens.dms.domain.volunteer.model.AvailableGrade
 
 data class CreateVolunteerRequest(
     val name: String,
-    val content: String,
     val availableSex: Sex,
     val availableGrade: AvailableGrade,
     val score: Int,

diff --git a/...re/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/UpdateVolunteerRequest.kt b/...re/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/UpdateVolunteerRequest.kt
@@ -6,7 +6,6 @@ import java.util.UUID
 
 data class UpdateVolunteerRequest(
     val name: String,
-    val content: String,
     val availableSex: Sex,
     val availableGrade: AvailableGrade,
     val score: Int,

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/response/VolunteerResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/response/VolunteerResponse.kt
@@ -51,7 +51,6 @@ data class VolunteerApplicationResponse(
 data class VolunteerResponse(
     val id: UUID,
     val name: String,
-    val content: String,
     val score: Int,
     val optionalScore: Int,
     val currentApplicants: Int,
@@ -64,7 +63,6 @@ data class VolunteerResponse(
             return VolunteerResponse(
                 id = volunteerWithCurrentApplicantVO.id,
                 name = volunteerWithCurrentApplicantVO.name,
-                content = volunteerWithCurrentApplicantVO.content,
                 score = volunteerWithCurrentApplicantVO.score,
                 optionalScore = volunteerWithCurrentApplicantVO.optionalScore,
                 currentApplicants = volunteerWithCurrentApplicantVO.currentApplicants,
@@ -128,7 +126,6 @@ data class CurrentVolunteerApplicantsResponse(
 data class AvailableVolunteerResponse(
     val id: UUID,
     val name: String,
-    val content: String,
     val score: Int,
     val optionalScore: Int,
     val currentApplicants: Int,
@@ -140,7 +137,6 @@ data class AvailableVolunteerResponse(
             return AvailableVolunteerResponse(
                 id = volunteerWithCurrentApplicantVO.id,
                 name = volunteerWithCurrentApplicantVO.name,
-                content = volunteerWithCurrentApplicantVO.content,
                 score = volunteerWithCurrentApplicantVO.score,
                 optionalScore = volunteerWithCurrentApplicantVO.optionalScore,
                 currentApplicants = volunteerWithCurrentApplicantVO.currentApplicants,

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/model/Volunteer.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/model/Volunteer.kt
@@ -14,8 +14,6 @@ data class Volunteer(
 
     val name: String,
 
-    val content: String,
-
     val score: Int,
 
     val optionalScore: Int = 0,

diff --git a/...rc/main/kotlin/team/aliens/dms/domain/volunteer/spi/vo/VolunteerWithCurrentApplicantVO.kt b/...rc/main/kotlin/team/aliens/dms/domain/volunteer/spi/vo/VolunteerWithCurrentApplicantVO.kt
@@ -9,7 +9,6 @@ import java.util.UUID
 open class VolunteerWithCurrentApplicantVO(
     val id: UUID,
     val name: String,
-    val content: String,
     val score: Int,
     val optionalScore: Int,
     val currentApplicants: Int,
@@ -23,7 +22,6 @@ open class VolunteerWithCurrentApplicantVO(
     fun toVolunteer() = Volunteer(
         id = id,
         name = name,
-        content = content,
         score = score,
         optionalScore = optionalScore,
         maxApplicants = maxApplicants,

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/usecase/CreateVolunteerUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/usecase/CreateVolunteerUseCase.kt
@@ -17,7 +17,6 @@ class CreateVolunteerUseCase(
 
         val volunteer = Volunteer(
             name = createVolunteerRequest.name,
-            content = createVolunteerRequest.content,
             availableSex = createVolunteerRequest.availableSex,
             availableGrade = createVolunteerRequest.availableGrade,
             score = createVolunteerRequest.score,

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/usecase/UpdateVolunteerUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/usecase/UpdateVolunteerUseCase.kt
@@ -15,7 +15,6 @@ class UpdateVolunteerUseCase(
         volunteerService.saveVolunteer(
             currentVolunteer.copy(
                 name = updateVolunteerRequest.name,
-                content = updateVolunteerRequest.content,
                 availableSex = updateVolunteerRequest.availableSex,
                 availableGrade = updateVolunteerRequest.availableGrade,
                 score = updateVolunteerRequest.score,

diff --git a/dms-core/src/test/kotlin/team/aliens/dms/domain/school/stub/SchoolStub.kt b/dms-core/src/test/kotlin/team/aliens/dms/domain/school/stub/SchoolStub.kt
@@ -2,7 +2,6 @@ package team.aliens.dms.domain.school.stub
 
 import team.aliens.dms.domain.school.model.AvailableFeature
 import team.aliens.dms.domain.school.model.School
-import team.aliens.dms.domain.volunteer.exception.VolunteerErrorCode
 import java.time.LocalDate
 import java.util.UUID
 

diff --git a/dms-infrastructure/src/main/resources/db/migration/V8__delete_column_in_tbl_volunteer.sql b/dms-infrastructure/src/main/resources/db/migration/V8__delete_column_in_tbl_volunteer.sql
@@ -0,0 +1 @@
+alter table tbl_volunteer drop column content;
diff --git a/...ence/src/main/kotlin/team/aliens/dms/persistence/volunteer/VolunteerPersistenceAdapter.kt b/...ence/src/main/kotlin/team/aliens/dms/persistence/volunteer/VolunteerPersistenceAdapter.kt
@@ -61,7 +61,6 @@ class VolunteerPersistenceAdapter(
                         QQueryVolunteerWithCurrentApplicantVO(
                             volunteerJpaEntity.id,
                             volunteerJpaEntity.name,
-                            volunteerJpaEntity.content,
                             volunteerJpaEntity.score,
                             volunteerJpaEntity.optionalScore,
                             list(volunteerApplicationJpaEntity.id),

diff --git a/...stence/src/main/kotlin/team/aliens/dms/persistence/volunteer/entity/VolunteerJpaEntity.kt b/...stence/src/main/kotlin/team/aliens/dms/persistence/volunteer/entity/VolunteerJpaEntity.kt
@@ -23,9 +23,6 @@ class VolunteerJpaEntity(
     @Column(columnDefinition = "VARCHAR(255)", nullable = false)
     val name: String,
 
-    @Column(columnDefinition = "VARCHAR(255)", nullable = false)
-    val content: String,
-
     @Column(columnDefinition = "INT", nullable = false)
     val score: Int,
 

diff --git a/...rsistence/src/main/kotlin/team/aliens/dms/persistence/volunteer/mapper/VolunteerMapper.kt b/...rsistence/src/main/kotlin/team/aliens/dms/persistence/volunteer/mapper/VolunteerMapper.kt
@@ -17,7 +17,6 @@ class VolunteerMapper(
             Volunteer(
                 id = it.id!!,
                 name = it.name,
-                content = it.content,
                 score = it.score,
                 optionalScore = it.optionalScore,
                 maxApplicants = it.maxApplicants,
@@ -33,7 +32,6 @@ class VolunteerMapper(
         return VolunteerJpaEntity(
             id = domain.id,
             name = domain.name,
-            content = domain.content,
             score = domain.score,
             optionalScore = domain.optionalScore,
             maxApplicants = domain.maxApplicants,

diff --git a/...am/aliens/dms/persistence/volunteer/repository/vo/QueryVolunteerWithCurrentApplicantVO.kt b/...am/aliens/dms/persistence/volunteer/repository/vo/QueryVolunteerWithCurrentApplicantVO.kt
@@ -10,7 +10,6 @@ import java.util.UUID
 class QueryVolunteerWithCurrentApplicantVO @QueryProjection constructor(
     id: UUID,
     name: String,
-    content: String,
     score: Int,
     optionalScore: Int,
     currentApplicants: List<UUID>,
@@ -22,7 +21,6 @@ class QueryVolunteerWithCurrentApplicantVO @QueryProjection constructor(
 ) : VolunteerWithCurrentApplicantVO(
     id = id,
     name = name,
-    content = content,
     score = score,
     optionalScore = optionalScore,
     currentApplicants = currentApplicants.size,

diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/volunteer/VolunteerWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/volunteer/VolunteerWebAdapter.kt
@@ -86,7 +86,6 @@ class VolunteerWebAdapter(
         createVolunteerUseCase.execute(
             CreateVolunteerRequest(
                 name = createVolunteerWebRequest.name,
-                content = createVolunteerWebRequest.content,
                 availableGrade = createVolunteerWebRequest.availableGrade,
                 availableSex = createVolunteerWebRequest.availableSex,
                 score = createVolunteerWebRequest.score!!,
@@ -105,7 +104,6 @@ class VolunteerWebAdapter(
         updateVolunteerUseCase.execute(
             UpdateVolunteerRequest(
                 name = updateVolunteerWebRequest.name,
-                content = updateVolunteerWebRequest.content,
                 availableGrade = updateVolunteerWebRequest.availableGrade,
                 availableSex = updateVolunteerWebRequest.availableSex,
                 score = updateVolunteerWebRequest.score!!,

diff --git a/...src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/CreateVolunteerWebRequest.kt b/...src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/CreateVolunteerWebRequest.kt
@@ -10,9 +10,6 @@ data class CreateVolunteerWebRequest(
     @field:NotBlank
     val name: String,
 
-    @field:NotBlank
-    val content: String,
-
     @field:NotNull
     val availableSex: Sex,
 

diff --git a/...src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/UpdateVolunteerWebRequest.kt b/...src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/UpdateVolunteerWebRequest.kt
@@ -10,9 +10,6 @@ data class UpdateVolunteerWebRequest(
     @field:NotBlank
     val name: String,
 
-    @field:NotBlank
-    val content: String,
-
     @field:NotNull
     val availableSex: Sex,