🔨 [Refactoring] Agenda Admin 조회 Query Parameter 변경 #948 (#949)

42organization · Aug 12, 2024 · 2fd2968 · 2fd2968
1 parent 1f65e80
commit 2fd2968
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 67 deletions.
diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agenda/controller/AgendaAdminController.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agenda/controller/AgendaAdminController.java
@@ -17,7 +17,6 @@
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -41,7 +40,7 @@ public class AgendaAdminController {
 
 	@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Agenda 요청 리스트 조회 성공")})
 	@GetMapping("/request/list")
-	public ResponseEntity<List<AgendaAdminResDto>> agendaList(@RequestBody @Valid PageRequestDto pageDto) {
+	public ResponseEntity<List<AgendaAdminResDto>> agendaList(@ModelAttribute @Valid PageRequestDto pageDto) {
 		int page = pageDto.getPage();
 		int size = pageDto.getSize();
 		Pageable pageable = PageRequest.of(page - 1, size, Sort.by("id").descending());

diff --git a/.../gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminController.java b/.../gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminController.java
@@ -11,6 +11,7 @@
 import org.springframework.data.domain.Sort;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +34,7 @@ public class AgendaAnnouncementAdminController {
 
 	@GetMapping()
 	public ResponseEntity<List<AgendaAnnouncementAdminResDto>> agendaAnnouncementList(
-		@RequestParam("agenda_key") UUID agendaKey, @RequestBody @Valid PageRequestDto pageRequest) {
+		@RequestParam("agenda_key") UUID agendaKey, @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/...pi/src/main/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminController.java b/...pi/src/main/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminController.java
@@ -12,13 +12,13 @@
 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 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;
@@ -37,7 +37,7 @@ public class AgendaTeamAdminController {
 
 	@GetMapping("/list")
 	public ResponseEntity<List<AgendaTeamResDto>> agendaTeamList(@RequestParam("agenda_key") UUID agendaKey,
-		@RequestBody @Valid PageRequestDto pageRequestDto) {
+		@ModelAttribute @Valid PageRequestDto pageRequestDto) {
 		int page = pageRequestDto.getPage();
 		int size = pageRequestDto.getSize();
 		Pageable pageable = PageRequest.of(page - 1, size, Sort.by("id").descending());
@@ -49,9 +49,8 @@ public ResponseEntity<List<AgendaTeamResDto>> agendaTeamList(@RequestParam("agen
 	}
 
 	@GetMapping
-	public ResponseEntity<AgendaTeamDetailResDto> agendaTeamDetail(
-		@RequestBody @Valid AgendaTeamKeyReqDto agendaTeamKeyReqDto) {
-		AgendaTeam agendaTeam = agendaTeamAdminService.getAgendaTeamByTeamKey(agendaTeamKeyReqDto.getTeamKey());
+	public ResponseEntity<AgendaTeamDetailResDto> agendaTeamDetail(@RequestParam("team_key") UUID agendaTeamKey) {
+		AgendaTeam agendaTeam = agendaTeamAdminService.getAgendaTeamByTeamKey(agendaTeamKey);
 		List<AgendaProfile> participants = agendaTeamAdminService.getAgendaProfileListByAgendaTeam(agendaTeam);
 		AgendaTeamDetailResDto agendaTeamDetailResDto = AgendaTeamDetailResDto.MapStruct.INSTANCE
 			.toDto(agendaTeam, participants);

diff --git a/.../src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamKeyReqDto.java b/.../src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamKeyReqDto.java
diff --git a/...da-api/src/test/java/gg/agenda/api/admin/agenda/controller/AgendaAdminControllerTest.java b/...da-api/src/test/java/gg/agenda/api/admin/agenda/controller/AgendaAdminControllerTest.java
@@ -105,13 +105,12 @@ void findAgendaByAgendaKeySuccessAdmin(int page) throws Exception {
 			agendas.addAll(agendaMockData.createNonOfficialAgendaList(5, AgendaStatus.OPEN));
 			agendas.addAll(agendaMockData.createNonOfficialAgendaList(5, AgendaStatus.FINISH));
 			agendas.addAll(agendaMockData.createNonOfficialAgendaList(5, AgendaStatus.CANCEL));
-			PageRequestDto pageRequestDto = new PageRequestDto(page, size);
-			String request = objectMapper.writeValueAsString(pageRequestDto);
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/request/list")
 					.header("Authorization", "Bearer " + accessToken)
-					.contentType(MediaType.APPLICATION_JSON).content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaAdminResDto[] result = objectMapper.readValue(response, AgendaAdminResDto[].class);
 
@@ -131,12 +130,12 @@ void findAgendaByAgendaKeySuccessAdminWithNoContent() throws Exception {
 			int page = 1;
 			int size = 10;
 			PageRequestDto pageRequestDto = new PageRequestDto(page, size);
-			String request = objectMapper.writeValueAsString(pageRequestDto);
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/request/list")
 					.header("Authorization", "Bearer " + accessToken)
-					.contentType(MediaType.APPLICATION_JSON).content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaAdminResDto[] result = objectMapper.readValue(response, AgendaAdminResDto[].class);
 

diff --git a/...agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminControllerTest.java b/...agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminControllerTest.java
@@ -92,15 +92,13 @@ void getAgendaAnnouncementAdminSuccess(int page) throws Exception {
 			Agenda agenda = agendaFixture.createAgenda();
 			List<AgendaAnnouncement> announcements =
 				agendaAnnouncementFixture.createAgendaAnnouncementList(agenda, 37);
-			PageRequestDto pageDto = new PageRequestDto(page, size);
-			String request = objectMapper.writeValueAsString(pageDto);
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/announcement")
 					.header("Authorization", "Bearer " + accessToken)
 					.param("agenda_key", agenda.getAgendaKey().toString())
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaAnnouncementResDto[] result =
 				objectMapper.readValue(response, AgendaAnnouncementResDto[].class);
@@ -121,15 +119,13 @@ void getAgendaAnnouncementAdminSuccessWithNoContent() throws Exception {
 			int page = 1;
 			int size = 10;
 			Agenda agenda = agendaFixture.createAgenda();
-			PageRequestDto pageDto = new PageRequestDto(page, size);
-			String request = objectMapper.writeValueAsString(pageDto);
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/announcement")
 					.header("Authorization", "Bearer " + accessToken)
 					.param("agenda_key", agenda.getAgendaKey().toString())
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaAnnouncementResDto[] result =
 				objectMapper.readValue(response, AgendaAnnouncementResDto[].class);
@@ -144,15 +140,13 @@ void getAgendaAnnouncementAdminFailedWithNoAgenda() throws Exception {
 			// given
 			int page = 1;
 			int size = 10;
-			PageRequestDto pageDto = new PageRequestDto(page, size);
-			String request = objectMapper.writeValueAsString(pageDto);
 
 			// expected
 			mockMvc.perform(get("/agenda/admin/announcement")
 					.header("Authorization", "Bearer " + accessToken)
 					.param("agenda_key", UUID.randomUUID().toString())
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isNotFound());
 		}
 	}

diff --git a/...rc/test/java/gg/agenda/api/admin/agendateam/controller/AgendaTeamAdminControllerTest.java b/...rc/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;
@@ -114,15 +113,13 @@ void getAgendaTeamListAdminSuccess(int page) throws Exception {
 			Agenda agenda = agendaFixture.createAgenda(2, 50, 1, 10);
 			List<AgendaTeam> teams = agendaTeamFixture
 				.createAgendaTeamList(agenda, AgendaTeamStatus.CONFIRM, total);
-			PageRequestDto pageRequestDto = new PageRequestDto(page, size);
-			String request = objectMapper.writeValueAsString(pageRequestDto);
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/team/list")
 					.header("Authorization", "Bearer " + accessToken)
 					.param("agenda_key", agenda.getAgendaKey().toString())
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaTeamResDto[] result = objectMapper.readValue(response, AgendaTeamResDto[].class);
 
@@ -140,15 +137,15 @@ void getAgendaTeamListAdminSuccess(int page) throws Exception {
 		@DisplayName("Admin AgendaTeam 전체 조회 실패 - Agenda 없음")
 		void getAgendaTeamListAdminFailedWithNoAgenda() throws Exception {
 			// given
-			PageRequestDto pageRequestDto = new PageRequestDto(1, 10);
-			String request = objectMapper.writeValueAsString(pageRequestDto);
+			int page = 1;
+			int size = 10;
 
 			// expected
 			mockMvc.perform(get("/agenda/admin/team/list")
 					.header("Authorization", "Bearer " + accessToken)
 					.param("agenda_key", UUID.randomUUID().toString())
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("page", String.valueOf(page))
+					.param("size", String.valueOf(size)))
 				.andExpect(status().isNotFound());
 		}
 	}
@@ -165,13 +162,11 @@ void getAgendaTeamDetailAdminSuccess() throws Exception {
 			List<AgendaProfile> profiles = agendaProfileFixture.createAgendaProfileList(5);
 			profiles.forEach(profile -> agendaTeamProfileFixture
 				.createAgendaTeamProfile(agenda, team, profile));
-			String request = objectMapper.writeValueAsString(new AgendaTeamKeyReqDto(team.getTeamKey()));
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/team")
 					.header("Authorization", "Bearer " + accessToken)
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("team_key", team.getTeamKey().toString()))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaTeamDetailResDto result = objectMapper.readValue(response, AgendaTeamDetailResDto.class);
 
@@ -200,13 +195,10 @@ void getAgendaTeamDetailAdminFailedWithNoTeamKey() throws Exception {
 		@DisplayName("Admin AgendaTeam 상세 조회 실패 - 존재하지 않는 Team")
 		void getAgendaTeamDetailAdminFailedWithNotFoundTeam() throws Exception {
 			// given
-			String request = objectMapper.writeValueAsString(new AgendaTeamKeyReqDto(UUID.randomUUID()));
-
 			// expected
 			mockMvc.perform(get("/agenda/admin/team")
 					.header("Authorization", "Bearer " + accessToken)
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("team_key", UUID.randomUUID().toString()))
 				.andExpect(status().isNotFound());
 		}
 
@@ -216,13 +208,11 @@ void getAgendaTeamDetailAdminSuccessWithNoTeamMates() throws Exception {
 			// given
 			Agenda agenda = agendaFixture.createAgenda();
 			AgendaTeam team = agendaTeamFixture.createAgendaTeam(agenda);
-			String request = objectMapper.writeValueAsString(new AgendaTeamKeyReqDto(team.getTeamKey()));
 
 			// when
 			String response = mockMvc.perform(get("/agenda/admin/team")
 					.header("Authorization", "Bearer " + accessToken)
-					.contentType(MediaType.APPLICATION_JSON)
-					.content(request))
+					.param("team_key", team.getTeamKey().toString()))
 				.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
 			AgendaTeamDetailResDto result = objectMapper.readValue(response, AgendaTeamDetailResDto.class);