merge: (#827) 모범 학생 후보 제외 학생 제거 api 생성

kkm06100 · web-flow · commit 06c16934a407 · 2025-03-26T16:13:00.000+09:00
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/exception/VoteExceptions.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/exception/VoteExceptions.kt
@@ -46,3 +46,7 @@ object ExcludedStudentAlreadyExistsException : DmsException(
 object IsNotAuthorizedVoteDeletionException : DmsException(
     VoteErrorCode.UNAUTHORIZED_VOTE_DELETION
 )
+
+object ExcludedStudentNotFoundException : DmsException(
+    VoteErrorCode.EXCLUDED_STUDENT_NOT_FOUND
+)
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/exception/error/VoteErrorCode.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/exception/error/VoteErrorCode.kt
@@ -20,6 +20,7 @@ enum class VoteErrorCode(
     VOTING_TOPIC_NOT_FOUND(ErrorStatus.NOT_FOUND, "Voting topic not found", 3),
     VOTING_OPTION_NOT_FOUND(ErrorStatus.NOT_FOUND, "Voting option not found", 4),
     VOTE_NOT_FOUND(ErrorStatus.NOT_FOUND, "Vote not found", 5),
+    EXCLUDED_STUDENT_NOT_FOUND(ErrorStatus.NOT_FOUND, "Execluded student not found", 6),
     ALREADY_VOTED(ErrorStatus.CONFLICT, "Already voted", 1),
     VOTING_TOPIC_NAME_ALREADY_EXIST(ErrorStatus.CONFLICT, "Voting Topic Already Exist", 2),
     EXCLUDED_STUDENT_ALREADY_EXISTS(ErrorStatus.CONFLICT, "Excluded Student Already Exist", 3)
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/CommandVoteService.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/CommandVoteService.kt
@@ -27,4 +27,6 @@ interface CommandVoteService {
     fun checkVotingTopic(name: String): Boolean
 
     fun saveExcludedStudent(excludedStudent: ExcludedStudent): ExcludedStudent
+
+    fun deleteExcludedStudentById(excludedStudentId: UUID)
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/CommandVoteServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/CommandVoteServiceImpl.kt
@@ -10,13 +10,11 @@ import team.aliens.dms.domain.vote.spi.CommandExcludedStudentPort
 import team.aliens.dms.domain.vote.spi.CommandVotePort
 import team.aliens.dms.domain.vote.spi.CommandVotingOptionPort
 import team.aliens.dms.domain.vote.spi.CommandVotingTopicPort
-import team.aliens.dms.domain.vote.spi.QueryVotePort
 import team.aliens.dms.domain.vote.spi.QueryVotingTopicPort
 import java.util.UUID
 
 @Service
 class CommandVoteServiceImpl(
-    val queryVotePort: QueryVotePort,
     val commandVotePort: CommandVotePort,
     val commandVotingTopicPort: CommandVotingTopicPort,
     val queryVotingTopicPort: QueryVotingTopicPort,
@@ -58,4 +56,8 @@ class CommandVoteServiceImpl(
     override fun saveExcludedStudent(excludedStudent: ExcludedStudent): ExcludedStudent {
         return commandExcludedStudentPort.saveExcludedStudent(excludedStudent)
     }
+
+    override fun deleteExcludedStudentById(excludedStudentId: UUID) {
+        commandExcludedStudentPort.deleteExcludedStudentById(excludedStudentId)
+    }
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/GetVoteService.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/GetVoteService.kt
@@ -25,4 +25,6 @@ interface GetVoteService {
     fun getVoteById(voteId: UUID): Vote
 
     fun getAllExcludedStudents(): List<ExcludedStudent>
+
+    fun getExcludedStudentById(excludedStudentId: UUID): ExcludedStudent
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/GetVoteServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/service/GetVoteServiceImpl.kt
@@ -1,6 +1,7 @@
 package team.aliens.dms.domain.vote.service
 
 import team.aliens.dms.common.annotation.Service
+import team.aliens.dms.domain.vote.exception.ExcludedStudentNotFoundException
 import team.aliens.dms.domain.vote.exception.VoteNotFoundException
 import team.aliens.dms.domain.vote.exception.VotingOptionNotFoundException
 import team.aliens.dms.domain.vote.exception.VotingTopicNotFoundException
@@ -53,4 +54,8 @@ class GetVoteServiceImpl(
     override fun getAllExcludedStudents(): List<ExcludedStudent> {
         return queryExcludedStudentPort.queryAllExcludedStudents()
     }
+
+    override fun getExcludedStudentById(excludedStudentId: UUID): ExcludedStudent {
+        return queryExcludedStudentPort.queryExcludedStudentById(excludedStudentId) ?: throw ExcludedStudentNotFoundException
+    }
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/spi/CommandExcludedStudentPort.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/spi/CommandExcludedStudentPort.kt
@@ -1,8 +1,11 @@
 package team.aliens.dms.domain.vote.spi
 
 import team.aliens.dms.domain.vote.model.ExcludedStudent
+import java.util.UUID
 
 interface CommandExcludedStudentPort {
 
     fun saveExcludedStudent(excludedStudent: ExcludedStudent): ExcludedStudent
+
+    fun deleteExcludedStudentById(excludedStudentId: UUID)
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/spi/QueryExcludedStudentPort.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/spi/QueryExcludedStudentPort.kt
@@ -8,4 +8,6 @@ interface QueryExcludedStudentPort {
     fun existExcludedStudentById(excludedStudentId: UUID): Boolean
 
     fun queryAllExcludedStudents(): List<ExcludedStudent>
+
+    fun queryExcludedStudentById(excludedStudentId: UUID): ExcludedStudent?
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/usecase/DeleteExcludedStudentUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/vote/usecase/DeleteExcludedStudentUseCase.kt
@@ -0,0 +1,17 @@
+package team.aliens.dms.domain.vote.usecase
+
+import team.aliens.dms.common.annotation.UseCase
+import team.aliens.dms.domain.vote.model.ExcludedStudent
+import team.aliens.dms.domain.vote.service.VoteService
+import java.util.UUID
+
+@UseCase
+class DeleteExcludedStudentUseCase(
+    private val voteService: VoteService
+) {
+
+    fun execute(excludedStudentId: UUID) {
+        val excludedStudent: ExcludedStudent = voteService.getExcludedStudentById(excludedStudentId)
+        voteService.deleteExcludedStudentById(excludedStudent.studentId)
+    }
+}
diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityConfig.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityConfig.kt
@@ -234,7 +234,7 @@ class SecurityConfig(
                     .requestMatchers(HttpMethod.POST,"/votes/excluded-student").hasAuthority(MANAGER.name)
                     .requestMatchers(HttpMethod.GET,"/votes").hasAnyAuthority(MANAGER.name, STUDENT.name)
                     .requestMatchers(HttpMethod.GET,"/votes/excluded-student").hasAuthority(MANAGER.name)
-
+                    .requestMatchers(HttpMethod.DELETE, "/votes/excluded-student/{excluded-student-id}").hasAuthority(MANAGER.name)
                 .anyRequest().denyAll()
             }
         http
diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/vote/ExcludedStudentPersistenceAdapter.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/vote/ExcludedStudentPersistenceAdapter.kt
@@ -1,6 +1,7 @@
 package team.aliens.dms.persistence.vote
 
 import com.querydsl.jpa.impl.JPAQueryFactory
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
 import team.aliens.dms.domain.vote.model.ExcludedStudent
 import team.aliens.dms.domain.vote.spi.ExcludedStudentPort
@@ -21,10 +22,17 @@ class ExcludedStudentPersistenceAdapter(
         )
     )!!
 
+    override fun deleteExcludedStudentById(excludedStudentId: UUID) {
+        excludedStudentJpaRepository.deleteById(excludedStudentId)
+    }
+
     override fun existExcludedStudentById(excludedStudentId: UUID): Boolean =
         excludedStudentJpaRepository.existsById(excludedStudentId)
 
     override fun queryAllExcludedStudents() = excludedStudentJpaRepository.findAll().map {
         excludedStudentMapper.toDomain(it)!!
     }
+
+    override fun queryExcludedStudentById(excludedStudentId: UUID): ExcludedStudent? =
+            excludedStudentMapper.toDomain(excludedStudentJpaRepository.findByIdOrNull(excludedStudentId))
 }
diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/vote/VoteWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/vote/VoteWebAdapter.kt
@@ -29,6 +29,7 @@ import team.aliens.dms.domain.vote.usecase.CreateExcludedStudentUseCase
 import team.aliens.dms.domain.vote.usecase.CreateVoteUseCase
 import team.aliens.dms.domain.vote.usecase.CreateVotingOptionUseCase
 import team.aliens.dms.domain.vote.usecase.CreateVotingTopicUseCase
+import team.aliens.dms.domain.vote.usecase.DeleteExcludedStudentUseCase
 import team.aliens.dms.domain.vote.usecase.DeleteVoteUseCase
 import team.aliens.dms.domain.vote.usecase.DeleteVotingTopicUseCase
 import team.aliens.dms.domain.vote.usecase.QueryAllExcludedStudentUseCase
@@ -52,7 +53,8 @@ class VoteWebAdapter(
     private val queryVotesUseCase: QueryVotesUseCase,
     private val queryVotingOptionsUseCase: QueryVotingOptionsUseCase,
     private val deleteVoteUseCase: DeleteVoteUseCase,
-    private val removeVotingOptionsUseCase: QueryVotingOptionsUseCase
+    private val removeVotingOptionsUseCase: QueryVotingOptionsUseCase,
+    private val deleteExcludedStudentUseCase: DeleteExcludedStudentUseCase
 ) {
 
     @PostMapping
@@ -150,4 +152,10 @@ class VoteWebAdapter(
     fun getVoteResults(@PathVariable("voting-topic-id") votingTopicId: UUID): VotesResponse {
         return queryVotesUseCase.execute(votingTopicId)
     }
+
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @DeleteMapping("/excluded-student/{excluded-student-id}")
+    fun deleteExcludedStudent(@PathVariable("excluded-student-id") excludedStudentId: UUID) {
+        deleteExcludedStudentUseCase.execute(excludedStudentId)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,3 +46,7 @@ object ExcludedStudentAlreadyExistsException : DmsException(`
`46`	`46`	`object IsNotAuthorizedVoteDeletionException : DmsException(`
`47`	`47`	`VoteErrorCode.UNAUTHORIZED_VOTE_DELETION`
`48`	`48`	`)`
	`49`	`+`
	`50`	`+object ExcludedStudentNotFoundException : DmsException(`
	`51`	`+ VoteErrorCode.EXCLUDED_STUDENT_NOT_FOUND`
	`52`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ interface CommandVoteService {`
`27`	`27`	`fun checkVotingTopic(name: String): Boolean`
`28`	`28`
`29`	`29`	`fun saveExcludedStudent(excludedStudent: ExcludedStudent): ExcludedStudent`
	`30`	`+`
	`31`	`+ fun deleteExcludedStudentById(excludedStudentId: UUID)`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,6 @@ interface GetVoteService {`
`25`	`25`	`fun getVoteById(voteId: UUID): Vote`
`26`	`26`
`27`	`27`	`fun getAllExcludedStudents(): List<ExcludedStudent>`
	`28`	`+`
	`29`	`+ fun getExcludedStudentById(excludedStudentId: UUID): ExcludedStudent`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`	`1`	`package team.aliens.dms.domain.vote.spi`
`2`	`2`
`3`	`3`	`import team.aliens.dms.domain.vote.model.ExcludedStudent`
	`4`	`+import java.util.UUID`
`4`	`5`
`5`	`6`	`interface CommandExcludedStudentPort {`
`6`	`7`
`7`	`8`	`fun saveExcludedStudent(excludedStudent: ExcludedStudent): ExcludedStudent`
	`9`	`+`
	`10`	`+ fun deleteExcludedStudentById(excludedStudentId: UUID)`
`8`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@ interface QueryExcludedStudentPort {`
`8`	`8`	`fun existExcludedStudentById(excludedStudentId: UUID): Boolean`
`9`	`9`
`10`	`10`	`fun queryAllExcludedStudents(): List<ExcludedStudent>`
	`11`	`+`
	`12`	`+ fun queryExcludedStudentById(excludedStudentId: UUID): ExcludedStudent?`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ class SecurityConfig(`
`234`	`234`	`.requestMatchers(HttpMethod.POST,"/votes/excluded-student").hasAuthority(MANAGER.name)`
`235`	`235`	`.requestMatchers(HttpMethod.GET,"/votes").hasAnyAuthority(MANAGER.name, STUDENT.name)`
`236`	`236`	`.requestMatchers(HttpMethod.GET,"/votes/excluded-student").hasAuthority(MANAGER.name)`
`237`		`-`
	`237`	`+ .requestMatchers(HttpMethod.DELETE, "/votes/excluded-student/{excluded-student-id}").hasAuthority(MANAGER.name)`
`238`	`238`	`.anyRequest().denyAll()`
`239`	`239`	`}`
`240`	`240`	`http`