✨ 강퇴시 재가입 불가

YAPP-Github · Feb 23, 2023 · 6f747ba · 6f747ba
1 parent 6080331
commit 6f747ba
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/yapp/allround3/participant/controller/ParticipantController.java b/src/main/java/yapp/allround3/participant/controller/ParticipantController.java
@@ -93,6 +93,6 @@ public void dropParticipant(
 			throw new CustomException("팀원 내보내기는 팀장만 가능해요.");
 		}
 
-		participantService.withdrawProject(participantId);
+		participantService.dropProject(participantId);
 	}
 }
diff --git a/src/main/java/yapp/allround3/participant/domain/Participant.java b/src/main/java/yapp/allround3/participant/domain/Participant.java
@@ -71,6 +71,10 @@ public void join() {
         participantStatus = ParticipantStatus.NORMAL;
     }
 
+    public void drop() {
+        participantStatus = ParticipantStatus.DROPPED;
+    }
+
     @Override
     public String toString() {
         return "Participant{" +

diff --git a/src/main/java/yapp/allround3/participant/domain/ParticipantStatus.java b/src/main/java/yapp/allround3/participant/domain/ParticipantStatus.java
@@ -3,5 +3,6 @@
 public enum ParticipantStatus {
 	NORMAL,
 	WITHDRAWAL,
+	DROPPED,
 	TEMP
 }
diff --git a/src/main/java/yapp/allround3/participant/service/ParticipantService.java b/src/main/java/yapp/allround3/participant/service/ParticipantService.java
@@ -99,6 +99,10 @@ public void joinProject(Long projectId, Long memberId) {
             throw new CustomException("이미 가입된 참여자에요");
         }
 
+        if (participant.getParticipantStatus() == ParticipantStatus.DROPPED) {
+            throw new CustomException("퇴장 당한 프로젝트에 참여할 수 없어요.");
+        }
+
         participant.join();
 
         // 피드백 필요 인원 증가
@@ -131,6 +135,16 @@ public void withdrawProject(Long participantId) {
             .forEach(Task::subtractFeedbackRequiredPersonnel);
     }
 
+    @Transactional
+    public void dropProject(Long participantId) {
+        Participant participant = findParticipantById(participantId);
+        participant.drop();
+
+        // 피드백 필요 인원 감축
+        taskRepository.findTasksByProjectId(participant.getProject().getId())
+            .forEach(Task::subtractFeedbackRequiredPersonnel);
+    }
+
     @Transactional
     public void withdrawAllProjects(Long memberId) {
         Member member = memberService.findMemberById(memberId);