[Fixture] Agneda leaveTeamMate 와 TemaLeader 분리

42organization · Sep 2, 2024 · 852da37 · 852da37
1 parent 78453f3
commit 852da37
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/...enda-api/src/main/java/gg/agenda/api/user/agendateam/controller/AgendaTeamController.java b/...enda-api/src/main/java/gg/agenda/api/user/agendateam/controller/AgendaTeamController.java
@@ -106,23 +106,32 @@ public ResponseEntity<Void> confirmTeam(@Parameter(hidden = true) @Login UserDto
 	}
 
 	/**
-	 * 아젠다 팀 나가기
+	 * 아젠다 팀장 나가기
 	 * @param user 사용자 정보, teamKeyReqDto 팀 KEY 요청 정보, agendaId 아젠다 아이디
 	 */
 	@PatchMapping("/cancel")
 	public ResponseEntity<Void> leaveAgendaTeam(@Parameter(hidden = true) @Login UserDto user,
 		@ModelAttribute @Valid TeamKeyReqDto teamKeyReqDto) {
 		AgendaTeam agendaTeam = agendaTeamService.getAgendaTeam(teamKeyReqDto.getTeamKey());
 		agendaTeam.getAgenda().agendaStatusMustBeOpen();
-		if (agendaTeam.getLeaderIntraId().equals(user.getIntraId())) {
-			agendaTeam.agendaTeamStatusMustBeOpenAndConfirm();
-			agendaTeamService.leaveTeamAll(agendaTeam);
-			agendaSlackService.slackCancelAgendaTeam(agendaTeam.getAgenda(), agendaTeam);
-		} else {
-			agendaTeam.agendaTeamStatusMustBeOpen();
-			agendaTeamService.leaveTeamMate(agendaTeam, user);
-			agendaSlackService.slackLeaveTeamMate(agendaTeam.getAgenda(), agendaTeam, user.getIntraId());
-		}
+		agendaTeam.agendaTeamStatusMustBeOpenAndConfirm();
+		agendaTeamService.leaveTeamAll(agendaTeam);
+		agendaSlackService.slackCancelAgendaTeam(agendaTeam.getAgenda(), agendaTeam);
+		return ResponseEntity.noContent().build();
+	}
+
+	/**
+	 * 아젠다 팀원 나가기
+	 * @param user 사용자 정보, teamKeyReqDto 팀 KEY 요청 정보, agendaId 아젠다 아이디
+	 */
+	@PatchMapping("/drop")
+	public ResponseEntity<Void> dropAgendaTeamMate(@Parameter(hidden = true) @Login UserDto user,
+		@ModelAttribute @Valid TeamKeyReqDto teamKeyReqDto) {
+		AgendaTeam agendaTeam = agendaTeamService.getAgendaTeam(teamKeyReqDto.getTeamKey());
+		agendaTeam.getAgenda().agendaStatusMustBeOpen();
+		agendaTeam.agendaTeamStatusMustBeOpen();
+		agendaTeamService.leaveTeamMate(agendaTeam, user);
+		agendaSlackService.slackLeaveTeamMate(agendaTeam.getAgenda(), agendaTeam, user.getIntraId());
 		return ResponseEntity.noContent().build();
 	}