chore: (#733) 메서드, 로직 수정

team-aliens · Sep 19, 2024 · bd5743d · bd5743d
1 parent 0cdc882
commit bd5743d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/model/VolunteerApplication.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/model/VolunteerApplication.kt
@@ -16,13 +16,13 @@ data class VolunteerApplication(
 
     val approved: Boolean,
 ) {
-    fun checkCancelable(approved: Boolean) {
+    fun checkIsNotApproved() {
         if (approved) {
             throw VolunteerApplicationAlreadyAssigned
         }
     }
 
-    fun checkExcludable(approved: Boolean) {
+    fun checkIsApproved() {
         if (!approved) {
             throw VolunteerApplicationNotAssigned
         }

diff --git a/...ain/kotlin/team/aliens/dms/domain/volunteer/usecase/ApproveVolunteerApplicationUseCase.kt b/...ain/kotlin/team/aliens/dms/domain/volunteer/usecase/ApproveVolunteerApplicationUseCase.kt
@@ -13,6 +13,8 @@ class ApproveVolunteerApplicationUseCase(
 
         val currentVolunteerApplication = volunteerService.getVolunteerApplicationById(volunteerApplicationId)
 
+        currentVolunteerApplication.checkIsNotApproved()
+
         volunteerService.saveVolunteerApplication(
             currentVolunteerApplication.copy(
                 approved = true

diff --git a/...ain/kotlin/team/aliens/dms/domain/volunteer/usecase/ExcludeVolunteerApplicationUseCase.kt b/...ain/kotlin/team/aliens/dms/domain/volunteer/usecase/ExcludeVolunteerApplicationUseCase.kt
@@ -12,9 +12,7 @@ class ExcludeVolunteerApplicationUseCase(
     fun execute(volunteerApplicationId: UUID) {
         val currentVolunteerApplication = volunteerService.getVolunteerApplicationById(volunteerApplicationId)
 
-        currentVolunteerApplication.apply {
-            checkExcludable(currentVolunteerApplication.approved)
-        }
+        currentVolunteerApplication.checkIsApproved()
 
         volunteerService.deleteVolunteerApplication(currentVolunteerApplication)
     }

diff --git a/...main/kotlin/team/aliens/dms/domain/volunteer/usecase/RejectVolunteerApplicationUseCase.kt b/...main/kotlin/team/aliens/dms/domain/volunteer/usecase/RejectVolunteerApplicationUseCase.kt
@@ -12,9 +12,7 @@ class RejectVolunteerApplicationUseCase(
     fun execute(volunteerApplicationId: UUID) {
         val currentVolunteerApplication = volunteerService.getVolunteerApplicationById(volunteerApplicationId)
 
-        currentVolunteerApplication.apply {
-            checkCancelable(currentVolunteerApplication.approved)
-        }
+        currentVolunteerApplication.checkIsNotApproved()
 
         volunteerService.deleteVolunteerApplication(currentVolunteerApplication)
     }

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/usecase/UnapplyVolunteerUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/usecase/UnapplyVolunteerUseCase.kt
@@ -12,10 +12,7 @@ class UnapplyVolunteerUseCase(
     fun execute(volunteerApplicationId: UUID) {
         val volunteer = volunteerService.getVolunteerApplicationById(volunteerApplicationId)
 
-        volunteerService.getVolunteerApplicationById(volunteerApplicationId)
-            .apply {
-                checkCancelable(volunteer.approved)
-            }
+        volunteer.checkIsNotApproved()
 
         volunteerService.deleteVolunteerApplication(volunteer)
     }