🐛 [Bug][Refactoring] 명세와 다른 부분 수정 및 GetMapping에서 Body받는 부분 수정 #930 (#933

)
42organization · Aug 6, 2024 · 48703b8 · 48703b8
1 parent 942146f
commit 48703b8
Show file tree

Hide file tree

Showing 15 changed files with 222 additions and 268 deletions.
diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/controller/AgendaController.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/controller/AgendaController.java
@@ -12,6 +12,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,7 +48,7 @@ public ResponseEntity<AgendaResDto> agendaDetails(@RequestParam("agenda_key") UU
 		Agenda agenda = agendaService.findAgendaByAgendaKey(agendaKey);
 		String announcementTitle = agendaAnnouncementService
 			.findLatestAnnounceTitleByAgendaOrDefault(agenda, "");
-		AgendaResDto agendaResDto = AgendaResDto.MapStruct.INSTANCE.toDto(agenda,  announcementTitle);
+		AgendaResDto agendaResDto = AgendaResDto.MapStruct.INSTANCE.toDto(agenda, announcementTitle);
 		return ResponseEntity.ok(agendaResDto);
 	}
 
@@ -69,7 +70,8 @@ public ResponseEntity<AgendaKeyResDto> agendaAdd(@Login @Parameter(hidden = true
 	}
 
 	@GetMapping("/history")
-	public ResponseEntity<List<AgendaSimpleResDto>> agendaListHistory(@RequestBody @Valid PageRequestDto pageRequest) {
+	public ResponseEntity<List<AgendaSimpleResDto>> agendaListHistory(
+		@ModelAttribute @Valid PageRequestDto pageRequest) {
 		int page = pageRequest.getPage();
 		int size = pageRequest.getSize();
 		Pageable pageable = PageRequest.of(page - 1, size, Sort.by("startTime").descending());

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/service/AgendaService.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/service/AgendaService.java
@@ -11,16 +11,14 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 import gg.agenda.api.user.agenda.controller.request.AgendaAwardsReqDto;
 import gg.agenda.api.user.agenda.controller.request.AgendaCreateReqDto;
 import gg.agenda.api.user.agenda.controller.request.AgendaTeamAward;
+import gg.agenda.api.user.agendateam.service.AgendaTeamService;
 import gg.agenda.api.user.ticket.service.TicketService;
 import gg.auth.UserDto;
 import gg.data.agenda.Agenda;
-import gg.data.agenda.AgendaProfile;
 import gg.data.agenda.AgendaTeam;
-import gg.data.agenda.AgendaTeamProfile;
 import gg.data.agenda.type.AgendaStatus;
 import gg.data.agenda.type.AgendaTeamStatus;
 import gg.repo.agenda.AgendaRepository;
@@ -41,6 +39,8 @@ public class AgendaService {
 
 	private final TicketService ticketService;
 
+	private final AgendaTeamService agendaTeamService;
+
 	@Transactional(readOnly = true)
 	public Agenda findAgendaByAgendaKey(UUID agendaKey) {
 		return agendaRepository.findByAgendaKey(agendaKey)
@@ -91,13 +91,7 @@ public void awardAgenda(AgendaAwardsReqDto agendaAwardsReqDto, Agenda agenda) {
 	public void confirmAgendaAndRefundTicketForOpenTeam(Agenda agenda) {
 		List<AgendaTeam> openTeams = agendaTeamRepository.findAllByAgendaAndStatus(agenda, AgendaTeamStatus.OPEN);
 		for (AgendaTeam openTeam : openTeams) {
-			// TODO: AgendaTeamService의 cancelTeam 메서드를 호출하는 것이 더 좋을 수도 있음
-			List<AgendaProfile> participants = agendaTeamProfileRepository
-				.findAllByAgendaTeamWithFetchProfile(openTeam).stream()
-				.map(AgendaTeamProfile::getProfile)
-				.collect(Collectors.toList());
-			ticketService.refundTickets(participants, agenda.getAgendaKey());
-			openTeam.cancelTeam();
+			agendaTeamService.leaveTeamAll(openTeam);
 		}
 		agenda.confirmAgenda();
 	}

diff --git a/...n/java/gg/agenda/api/user/agendaannouncement/controller/AgendaAnnouncementController.java b/...n/java/gg/agenda/api/user/agendaannouncement/controller/AgendaAnnouncementController.java
@@ -12,6 +12,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,7 +49,7 @@ public ResponseEntity<Void> agendaAnnouncementAdd(@Login UserDto user, @RequestP
 
 	@GetMapping
 	public ResponseEntity<List<AgendaAnnouncementResDto>> agendaAnnouncementList(
-		@RequestParam("agenda_key") UUID agendaKey, @RequestBody @Valid PageRequestDto pageRequest) {
+		@RequestParam("agenda_key") UUID agendaKey, @ModelAttribute @Valid PageRequestDto pageRequest) {
 		Agenda agenda = agendaService.findAgendaByAgendaKey(agendaKey);
 		int page = pageRequest.getPage();
 		int size = pageRequest.getSize();

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
@@ -1,5 +1,6 @@
 package gg.agenda.api.user.agendateam.controller;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -12,6 +13,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +32,7 @@
 import gg.agenda.api.user.agendateam.service.AgendaTeamService;
 import gg.auth.UserDto;
 import gg.auth.argumentresolver.Login;
+import gg.data.agenda.AgendaTeam;
 import gg.utils.dto.PageRequestDto;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
@@ -47,8 +50,7 @@ public class AgendaTeamController {
 	 */
 	@GetMapping("/my")
 	public ResponseEntity<Optional<MyTeamSimpleResDto>> myTeamSimpleDetails(
-		@Parameter(hidden = true) @Login UserDto user,
-		@RequestParam("agenda_key") UUID agendaKey) {
+		@Parameter(hidden = true) @Login UserDto user, @RequestParam("agenda_key") UUID agendaKey) {
 		Optional<MyTeamSimpleResDto> myTeamSimpleResDto = agendaTeamService.detailsMyTeamSimple(user, agendaKey);
 		if (myTeamSimpleResDto.isEmpty()) {
 			return ResponseEntity.noContent().build();
@@ -98,16 +100,24 @@ public ResponseEntity<Void> confirmTeam(@Parameter(hidden = true) @Login UserDto
 	@PatchMapping("/cancel")
 	public ResponseEntity<Void> leaveAgendaTeam(@Parameter(hidden = true) @Login UserDto user,
 		@RequestBody @Valid TeamKeyReqDto teamKeyReqDto, @RequestParam("agenda_key") UUID agendaKey) {
-		agendaTeamService.agendaTeamLeave(user, agendaKey, teamKeyReqDto.getTeamKey());
+		UUID teamKey = teamKeyReqDto.getTeamKey();
+
+		AgendaTeam agendaTeam = agendaTeamService.getAgendaTeam(agendaKey, teamKey);
+		agendaTeam.getAgenda().leaveTeam(LocalDateTime.now());
+		if (agendaTeam.getLeaderIntraId().equals(user.getIntraId())) {
+			agendaTeamService.leaveTeamAll(agendaTeam);
+		} else {
+			agendaTeamService.leaveTeamMate(agendaTeam, user);
+		}
 		return ResponseEntity.noContent().build();
 	}
 
 	/**
 	 * 아젠다 팀 공개 모집인 팀 목록 조회
 	 * @param pageRequest 페이지네이션 요청 정보, agendaId 아젠다 아이디
 	 */
-	@GetMapping("/open")
-	public ResponseEntity<List<OpenTeamResDto>> openTeamList(@RequestBody @Valid PageRequestDto pageRequest,
+	@GetMapping("/open/list")
+	public ResponseEntity<List<OpenTeamResDto>> openTeamList(@ModelAttribute @Valid PageRequestDto pageRequest,
 		@RequestParam("agenda_key") UUID agendaKey) {
 		int page = pageRequest.getPage();
 		int size = pageRequest.getSize();
@@ -121,7 +131,7 @@ public ResponseEntity<List<OpenTeamResDto>> openTeamList(@RequestBody @Valid Pag
 	 * @param pageRequest 페이지네이션 요청 정보, agendaId 아젠다 아이디
 	 */
 	@GetMapping("/confirm/list")
-	public ResponseEntity<List<ConfirmTeamResDto>> confirmTeamList(@RequestBody @Valid PageRequestDto pageRequest,
+	public ResponseEntity<List<ConfirmTeamResDto>> confirmTeamList(@ModelAttribute @Valid PageRequestDto pageRequest,
 		@RequestParam("agenda_key") UUID agendaKey) {
 		int page = pageRequest.getPage();
 		int size = pageRequest.getSize();

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/agendateam/service/AgendaTeamService.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/agendateam/service/AgendaTeamService.java
@@ -11,6 +11,7 @@
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import gg.agenda.api.user.agendateam.controller.request.TeamCreateReqDto;
@@ -136,7 +137,8 @@ public TeamKeyResDto addAgendaTeam(UserDto user, TeamCreateReqDto teamCreateReqD
 			});
 
 		if (agenda.getIsOfficial()) {
-			Ticket ticket = ticketRepository.findByAgendaProfileAndIsApprovedTrueAndIsUsedFalse(agendaProfile)
+			Ticket ticket = ticketRepository.findFirstByAgendaProfileAndIsApprovedTrueAndIsUsedFalseOrderByCreatedAtAsc(
+					agendaProfile)
 				.orElseThrow(() -> new ForbiddenException(TICKET_NOT_EXIST));
 			ticket.useTicket(agenda.getAgendaKey());
 		}
@@ -179,42 +181,58 @@ public void confirmTeam(UserDto user, UUID agendaKey, UUID teamKey) {
 	}
 
 	/**
-	 * 아젠다 팀 나가기
-	 * @param user 사용자 정보, teamKeyReqDto 팀 KEY 요청 정보, agendaId 아젠다 아이디
-	 * 트랜잭션의 원자성을 보장하기 위해 팀 나가기와 티켓 환불을 한 메서드에서 처리
+	 * 아젠다 팀 찾기
+	 * @param agendaKey 아젠다 키, teamKey 팀 키
 	 */
-	@Transactional
-	public void agendaTeamLeave(UserDto user, UUID agendaKey, UUID teamKey) {
+	@Transactional(readOnly = true)
+	public AgendaTeam getAgendaTeam(UUID agendaKey, UUID teamKey) {
 		Agenda agenda = agendaRepository.findByAgendaKey(agendaKey)
 			.orElseThrow(() -> new NotExistException(AGENDA_NOT_FOUND));
-
-		AgendaTeam agendaTeam = agendaTeamRepository
+		return agendaTeamRepository
 			.findByAgendaAndTeamKeyAndStatus(agenda, teamKey, OPEN, CONFIRM)
 			.orElseThrow(() -> new NotExistException(AGENDA_TEAM_NOT_FOUND));
+	}
 
-		agenda.cancelTeam(LocalDateTime.now());
+	/**
+	 * 아젠다 팀원 나가기
+	 * @param agendaTeam 아젠다 팀, user 사용자 정보
+	 */
+	@Transactional
+	public void leaveTeamMate(AgendaTeam agendaTeam, UserDto user) {
+		AgendaProfile agendaProfile = agendaProfileRepository.findByUserId(user.getId())
+			.orElseThrow(() -> new NotExistException(AGENDA_PROFILE_NOT_FOUND));
+		AgendaTeamProfile agendaTeamProfile = agendaTeamProfileRepository
+			.findByAgendaAndProfileAndIsExistTrue(agendaTeam.getAgenda(), agendaProfile)
+			.orElseThrow(() -> new ForbiddenException(NOT_TEAM_MATE));
+		leaveTeam(agendaTeamProfile);
+	}
 
-		List<AgendaTeamProfile> profiles = agendaTeamProfileRepository.findByAgendaTeamAndIsExistTrue(agendaTeam);
+	/**
+	 * 팀원이 팀 나가기
+	 * @param agendaTeamProfile 팀 프로필
+	 */
+	@Transactional(propagation = Propagation.MANDATORY)
+	public void leaveTeam(AgendaTeamProfile agendaTeamProfile) {
+		AgendaTeam agendaTeam = agendaTeamProfile.getAgendaTeam();
+		agendaTeamProfile.leaveTeam();
+		agendaTeam.leaveTeamMate();
+		if (agendaTeamProfile.getAgenda().getIsOfficial()) {
+			ticketService.refundTicket(agendaTeamProfile);
+		}
+	}
 
-		List<AgendaProfile> changedProfiles;
+	/**
+	 * 팀장이 팀 나가기
+	 * @param agendaTeam 팀
+	 */
+	@Transactional(propagation = Propagation.MANDATORY)
+	public void leaveTeamAll(AgendaTeam agendaTeam) {
+		List<AgendaTeamProfile> teamProfiles = agendaTeamProfileRepository.findByAgendaTeamAndIsExistTrue(agendaTeam);
 
-		if (agendaTeam.getLeaderIntraId().equals(user.getIntraId())) {
-			changedProfiles = profiles
-				.stream()
-				.peek(AgendaTeamProfile::leaveTeam)
-				.map(AgendaTeamProfile::getProfile)
-				.collect(Collectors.toList());
-			agendaTeam.leaveTeamLeader();
-			ticketService.refundTickets(changedProfiles, agendaKey);
-			return;
+		for (AgendaTeamProfile teamProfile : teamProfiles) {
+			leaveTeam(teamProfile);
 		}
-		AgendaTeamProfile teamMateProfile = profiles.stream()
-			.filter(profile -> profile.getProfile().getUserId().equals(user.getId()))
-			.findFirst().orElseThrow(() -> new ForbiddenException(NOT_TEAM_MATE));
-		teamMateProfile.leaveTeam();
-		agendaTeam.leaveTeamMate();
-		changedProfiles = List.of(teamMateProfile.getProfile());
-		ticketService.refundTickets(changedProfiles, agendaKey);
+		agendaTeam.leaveTeamLeader();
 	}
 
 	/**
@@ -276,17 +294,19 @@ public void modifyAttendTeam(UserDto user, TeamKeyReqDto teamKeyReqDto, UUID age
 			.findByAgendaAndTeamKeyAndStatus(agenda, teamKeyReqDto.getTeamKey(), OPEN, CONFIRM)
 			.orElseThrow(() -> new NotExistException(AGENDA_TEAM_NOT_FOUND));
 
-		Ticket ticket = ticketRepository.findByAgendaProfileAndIsApprovedTrueAndIsUsedFalse(agendaProfile)
-			.orElseThrow(() -> new ForbiddenException(TICKET_NOT_EXIST));
-
 		agendaTeamProfileRepository.findByAgendaAndProfileAndIsExistTrue(agenda, agendaProfile)
 			.ifPresent(profile -> {
 				throw new ForbiddenException(AGENDA_TEAM_FORBIDDEN);
 			});
 
+		if (agenda.getIsOfficial()) {
+			Ticket ticket = ticketRepository
+				.findFirstByAgendaProfileAndIsApprovedTrueAndIsUsedFalseOrderByCreatedAtAsc(agendaProfile)
+				.orElseThrow(() -> new ForbiddenException(TICKET_NOT_EXIST));
+			ticket.useTicket(agenda.getAgendaKey());
+		}
 		agenda.attendTeam(agendaProfile.getLocation(), LocalDateTime.now());
 		agendaTeam.attendTeam(agenda);
-		ticket.useTicket(agenda.getAgendaKey());
 		agendaTeamProfileRepository.save(new AgendaTeamProfile(agendaTeam, agenda, agendaProfile));
 	}
 

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/controller/TicketController.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/controller/TicketController.java
@@ -10,8 +10,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -52,7 +52,7 @@ public ResponseEntity<TicketCountResDto> ticketCountFind(@Parameter(hidden = tru
 
 	@GetMapping("/history")
 	public ResponseEntity<List<TicketHistoryResDto>> ticketHistoryList(@Parameter(hidden = true) @Login UserDto user,
-		@RequestBody @Valid PageRequestDto pageRequest) {
+		@ModelAttribute @Valid PageRequestDto pageRequest) {
 		int page = pageRequest.getPage();
 		int size = pageRequest.getSize();
 		Pageable pageable = PageRequest.of(page - 1, size, Sort.by("id").descending());

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/service/TicketService.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/service/TicketService.java
@@ -2,10 +2,8 @@
 
 import static gg.utils.exception.ErrorCode.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
@@ -18,6 +16,7 @@
 import gg.auth.UserDto;
 import gg.data.agenda.Agenda;
 import gg.data.agenda.AgendaProfile;
+import gg.data.agenda.AgendaTeamProfile;
 import gg.data.agenda.Ticket;
 import gg.repo.agenda.AgendaProfileRepository;
 import gg.repo.agenda.AgendaRepository;
@@ -33,21 +32,9 @@ public class TicketService {
 	private final AgendaRepository agendaRepository;
 	private final AgendaProfileRepository agendaProfileRepository;
 
-	/**
-	 * 티켓 환불
-	 * @param changedProfiles 변경된 프로필 목록
-	 * @param agendaKey 아젠다 키
-	 * @Annotation 트랜잭션의 원자성을 보장하기 위해 부모 트랜잭션이 없을경우 예외를 발생시키는 Propagation.MANDATORY로 설정
-	 */
 	@Transactional(propagation = Propagation.MANDATORY)
-	public void refundTickets(List<AgendaProfile> changedProfiles, UUID agendaKey) {
-		List<Ticket> tickets = new ArrayList<>();
-		for (
-			AgendaProfile profile : changedProfiles) {
-			Ticket ticket = Ticket.createRefundedTicket(profile, agendaKey);
-			tickets.add(ticket);
-		}
-		ticketRepository.saveAll(tickets);
+	public void refundTicket(AgendaTeamProfile changedTeamProfile) {
+		Ticket.createRefundedTicket(changedTeamProfile);
 	}
 
 	/**