From 73b66a7840863c14462c55a28c66967e8dee4c14 Mon Sep 17 00:00:00 2001 From: yhames Date: Mon, 12 Aug 2024 12:26:42 +0900 Subject: [PATCH] test: fix json to query paramter --- .../controller/AgendaTeamAdminController.java | 6 ++--- .../request/AgendaTeamKeyReqDto.java | 23 ------------------- .../AgendaTeamAdminControllerTest.java | 3 --- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamKeyReqDto.java diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminController.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminController.java index 94dd659d6..833cbd02d 100644 --- a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminController.java +++ b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminController.java @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import gg.agenda.api.admin.agendateam.controller.request.AgendaTeamKeyReqDto; import gg.agenda.api.admin.agendateam.controller.request.AgendaTeamUpdateDto; import gg.agenda.api.admin.agendateam.controller.response.AgendaTeamDetailResDto; import gg.agenda.api.admin.agendateam.controller.response.AgendaTeamResDto; @@ -50,9 +49,8 @@ public ResponseEntity> agendaTeamList(@RequestParam("agen } @GetMapping - public ResponseEntity agendaTeamDetail( - @ModelAttribute @Valid AgendaTeamKeyReqDto agendaTeamKeyReqDto) { - AgendaTeam agendaTeam = agendaTeamAdminService.getAgendaTeamByTeamKey(agendaTeamKeyReqDto.getTeamKey()); + public ResponseEntity agendaTeamDetail(@RequestParam("team_key") UUID agendaTeamKey) { + AgendaTeam agendaTeam = agendaTeamAdminService.getAgendaTeamByTeamKey(agendaTeamKey); List participants = agendaTeamAdminService.getAgendaProfileListByAgendaTeam(agendaTeam); AgendaTeamDetailResDto agendaTeamDetailResDto = AgendaTeamDetailResDto.MapStruct.INSTANCE .toDto(agendaTeam, participants); diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamKeyReqDto.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamKeyReqDto.java deleted file mode 100644 index 937611b77..000000000 --- a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamKeyReqDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package gg.agenda.api.admin.agendateam.controller.request; - -import java.util.UUID; - -import javax.validation.constraints.NotNull; - -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class AgendaTeamKeyReqDto { - - @NotNull - private UUID teamKey; - - @Builder - public AgendaTeamKeyReqDto(UUID teamKey) { - this.teamKey = teamKey; - } -} diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminControllerTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminControllerTest.java index 6813109ab..34f87f7bc 100644 --- a/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminControllerTest.java +++ b/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminControllerTest.java @@ -27,7 +27,6 @@ import gg.admin.repo.agenda.AgendaAdminRepository; import gg.admin.repo.agenda.AgendaTeamAdminRepository; import gg.admin.repo.agenda.AgendaTeamProfileAdminRepository; -import gg.agenda.api.admin.agendateam.controller.request.AgendaTeamKeyReqDto; import gg.agenda.api.admin.agendateam.controller.request.AgendaTeamMateReqDto; import gg.agenda.api.admin.agendateam.controller.request.AgendaTeamUpdateDto; import gg.agenda.api.admin.agendateam.controller.response.AgendaTeamDetailResDto; @@ -163,7 +162,6 @@ void getAgendaTeamDetailAdminSuccess() throws Exception { List profiles = agendaProfileFixture.createAgendaProfileList(5); profiles.forEach(profile -> agendaTeamProfileFixture .createAgendaTeamProfile(agenda, team, profile)); - AgendaTeamKeyReqDto agendaTeamKeyReqDto = new AgendaTeamKeyReqDto(team.getTeamKey()); // when String response = mockMvc.perform(get("/agenda/admin/team") @@ -210,7 +208,6 @@ void getAgendaTeamDetailAdminSuccessWithNoTeamMates() throws Exception { // given Agenda agenda = agendaFixture.createAgenda(); AgendaTeam team = agendaTeamFixture.createAgendaTeam(agenda); - AgendaTeamKeyReqDto agendaTeamKeyReqDto = new AgendaTeamKeyReqDto(team.getTeamKey()); // when String response = mockMvc.perform(get("/agenda/admin/team")